Fix softserial/pwm timer clash caused by typo in preprocessor defines.

See 91c7407806

Fixes #143.
This commit is contained in:
Dominic Clifton 2014-11-05 21:05:57 +00:00
parent db36cfe12e
commit 2d119cba78
1 changed files with 4 additions and 4 deletions

View File

@ -283,12 +283,12 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
continue;
#endif
#ifdef SOFTSERIAL1_TIMER
if (init->useSoftSerial && timerHardwarePtr->tim == SOFTSERIAL1_TIMER)
#ifdef SOFTSERIAL_1_TIMER
if (init->useSoftSerial && timerHardwarePtr->tim == SOFTSERIAL_1_TIMER)
continue;
#endif
#ifdef SOFTSERIAL2_TIMER
if (init->useSoftSerial && timerHardwarePtr->tim == SOFTSERIAL2_TIMER)
#ifdef SOFTSERIAL_2_TIMER
if (init->useSoftSerial && timerHardwarePtr->tim == SOFTSERIAL_2_TIMER)
continue;
#endif