dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-24 08:36:14 +01:00
Code Releases Activity

fixed timers, still only two tracks

Browse Source
This commit is contained in:
travis-farmer 2023-11-07 13:12:33 -05:00
parent 832ec44c67
commit 6b731d6f5d
No known key found for this signature in database
GPG Key ID: 0BC296791D14CB35
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DCCTimerGiga.cpp
View File

@ -45,8 +45,8 @@ INTERRUPT_CALLBACK interruptHandler=0;
//HardwareTimer* timer = NULL; //HardwareTimer* timer = NULL;
//HardwareTimer* timerAux = NULL; //HardwareTimer* timerAux = NULL;
HardwareTimer timer(TIM2); HardwareTimer timer(TIM3);
HardwareTimer timerAux(TIM3); HardwareTimer timerAux(TIM2);
static bool tim2ModeHA = false; static bool tim2ModeHA = false;
static bool tim3ModeHA = false; static bool tim3ModeHA = false;
@ -97,9 +97,9 @@ void DCCTimer::setPWM(byte pin, bool high) {
tim3ModeHA = true; tim3ModeHA = true;
} }
if (high) if (high)
TIM2->CCMR1 = (TIM2->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_0; TIM3->CCMR1 = (TIM3->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_0;
else else
TIM2->CCMR1 = (TIM2->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_1; TIM3->CCMR1 = (TIM3->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_1;
break; break;
case 13: case 13:
if (!tim2ModeHA) { if (!tim2ModeHA) {
@ -107,9 +107,9 @@ void DCCTimer::setPWM(byte pin, bool high) {
tim2ModeHA = true; tim2ModeHA = true;
} }
if (high) if (high)
TIM3->CCMR1 = (TIM3->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_0; TIM2->CCMR1 = (TIM2->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_0;
else else
TIM3->CCMR1 = (TIM3->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_1; TIM2->CCMR1 = (TIM2->CCMR1 & ~TIM_CCMR1_OC1M_Msk) | TIM_CCMR1_OC1M_1;
break; break;
} }
} }