diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-03-22 16:59:29 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-03-24 07:25:14 -0400 |
| commit | 61db54f52f32e63c895d775982fbcdcb67f2dde6 (patch) | |
| tree | b0513c712b5888ab0a4e6613fdee3db606b61aaf /wirish/wirish_digital.cpp | |
| parent | 6bc8cb7c1181e8005019e4ce1f2bea956c44e044 (diff) | |
| download | librambutan-61db54f52f32e63c895d775982fbcdcb67f2dde6.tar.gz librambutan-61db54f52f32e63c895d775982fbcdcb67f2dde6.zip | |
Initial timer refactor.
Basic PWM works. Had some problems in testing that might be due to
USART bugs.
HardwareTimer has been removed from the build for now; I will
re-implement it in terms of the new libmaple API, but consider it
deprecated. Let's come up with something better.
Servo is implemented in terms of HardwareTimer, so it also has been
temporarily removed from the build.
pwmWrite() likely got a little bit less inefficient due to
indirection, but the PIN_MAPs shrank by a pointer per PinMapping.
Diffstat (limited to 'wirish/wirish_digital.cpp')
| -rw-r--r-- | wirish/wirish_digital.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wirish/wirish_digital.cpp b/wirish/wirish_digital.cpp index 0c0bd85..4b68861 100644 --- a/wirish/wirish_digital.cpp +++ b/wirish/wirish_digital.cpp @@ -72,15 +72,15 @@ void pinMode(uint8 pin, WiringPinMode mode) { gpio_set_mode(PIN_MAP[pin].gpio_device, PIN_MAP[pin].pin, outputMode); - if (PIN_MAP[pin].timer_num != TIMER_INVALID) { + if (PIN_MAP[pin].timer_device != NULL) { /* enable/disable timer channels if we're switching into or out of pwm */ if (pwm) { - timer_set_mode(PIN_MAP[pin].timer_num, + timer_set_mode(PIN_MAP[pin].timer_device, PIN_MAP[pin].timer_chan, TIMER_PWM); } else { - timer_set_mode(PIN_MAP[pin].timer_num, + timer_set_mode(PIN_MAP[pin].timer_device, PIN_MAP[pin].timer_chan, TIMER_DISABLED); } |