diff options
| author | bnewbold <bnewbold@robocracy.org> | 2010-07-02 00:57:35 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2010-07-20 15:37:09 -0400 |
| commit | dd52d66d034c943380d4a95d7677cff7772109df (patch) | |
| tree | b650943b1921f229496c08ab1199039442f61c42 /wirish | |
| parent | 480dad829fe7870883d51cb641ce05aa62074424 (diff) | |
| download | librambutan-dd52d66d034c943380d4a95d7677cff7772109df.tar.gz librambutan-dd52d66d034c943380d4a95d7677cff7772109df.zip | |
timers progress
examples code cleanup, more descriptive comments, more notes
Diffstat (limited to 'wirish')
| -rw-r--r-- | wirish/rules.mk | 1 | ||||
| -rw-r--r-- | wirish/wirish.c | 6 | ||||
| -rw-r--r-- | wirish/wirish.h | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/wirish/rules.mk b/wirish/rules.mk index e74d15d..b2110bd 100644 --- a/wirish/rules.mk +++ b/wirish/rules.mk @@ -24,6 +24,7 @@ cppSRCS_$(d) := wirish_math.cpp \ comm/HardwareSerial.cpp \ comm/HardwareSPI.cpp \ usb_serial.cpp \ + HardwareTimer.cpp \ cxxabi-compat.cpp cFILES_$(d) := $(cSRCS_$(d):%=$(d)/%) diff --git a/wirish/wirish.c b/wirish/wirish.c index 520079c..e21f792 100644 --- a/wirish/wirish.c +++ b/wirish/wirish.c @@ -31,17 +31,17 @@ #include "systick.h" #include "gpio.h" #include "nvic.h" -//#include "usb.h" +#include "usb.h" void init(void) { rcc_init(); nvic_init(); -// systick_init(); + systick_init(); gpio_init(); adc_init(); timer_init(1, 1); timer_init(2, 1); timer_init(3, 1); timer_init(4, 1); - //setupUSB(); + setupUSB(); } diff --git a/wirish/wirish.h b/wirish/wirish.h index 34464a2..13ff313 100644 --- a/wirish/wirish.h +++ b/wirish/wirish.h @@ -43,7 +43,8 @@ #ifdef __cplusplus #include "HardwareSPI.h" #include "HardwareSerial.h" -//#include "usb_serial.h" +#include "usb_serial.h" +#include "HardwareTimer.h" #endif #ifdef __cplusplus |