diff --git a/radio/src/targets/common/arm/stm32/timers_driver.cpp b/radio/src/targets/common/arm/stm32/timers_driver.cpp index b44d0b051..7ac4881e3 100644 --- a/radio/src/targets/common/arm/stm32/timers_driver.cpp +++ b/radio/src/targets/common/arm/stm32/timers_driver.cpp @@ -31,10 +31,10 @@ void init2MhzTimer() TIMER_2MHz_TIMER->CR1 = TIM_CR1_CEN; } -// Start TIMER at 200Hz -void init5msTimer() +// Start TIMER at 1000Hz +void init1msTimer() { - INTERRUPT_xMS_TIMER->ARR = 4999; // 5mS in uS + INTERRUPT_xMS_TIMER->ARR = 999; // 1mS in uS INTERRUPT_xMS_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 1000000 - 1; // 1uS INTERRUPT_xMS_TIMER->CCER = 0; INTERRUPT_xMS_TIMER->CCMR1 = 0; @@ -45,30 +45,37 @@ void init5msTimer() NVIC_SetPriority(INTERRUPT_xMS_IRQn, 7); } -void stop5msTimer() +void stop1msTimer() { INTERRUPT_xMS_TIMER->CR1 = 0; // stop timer NVIC_DisableIRQ(INTERRUPT_xMS_IRQn); } // TODO use the same than board_sky9x.cpp -void interrupt5ms() +void interrupt1ms() { static uint8_t pre_scale; // Used to get 10 Hz counter ++pre_scale; -#if defined(HAPTIC) - DEBUG_TIMER_START(debugTimerHaptic); - HAPTIC_HEARTBEAT(); - DEBUG_TIMER_STOP(debugTimerHaptic); -#endif - + // 1 ms loop #if defined(FLYSKY_HALL_STICKS) flysky_hall_stick_loop(); // TODO: need to put in 1ms timer loop for best performance #endif - if (pre_scale == 2) { + // 5ms loop + if (pre_scale == 5 || pre_scale == 10) + { +#if defined(HAPTIC) + DEBUG_TIMER_START(debugTimerHaptic); + HAPTIC_HEARTBEAT(); + DEBUG_TIMER_STOP(debugTimerHaptic); +#endif + } + + // 10ms loop + if (pre_scale == 10) + { pre_scale = 0; DEBUG_TIMER_START(debugTimerPer10ms); DEBUG_TIMER_SAMPLE(debugTimerPer10msPeriod); @@ -80,6 +87,6 @@ void interrupt5ms() extern "C" void INTERRUPT_xMS_IRQHandler() { INTERRUPT_xMS_TIMER->SR &= ~TIM_SR_UIF; - interrupt5ms(); + interrupt1ms(); DEBUG_INTERRUPT(INT_1MS); } diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp index f5a9d0978..f24f8f1bf 100644 --- a/radio/src/targets/horus/board.cpp +++ b/radio/src/targets/horus/board.cpp @@ -206,7 +206,7 @@ void boardInit() #endif init2MhzTimer(); - init5msTimer(); + init1msTimer(); usbInit(); hapticInit(); diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index bc1be0d09..504a4d216 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -75,7 +75,7 @@ void boardOff(); // Timers driver void init2MhzTimer(); -void init5msTimer(); +void init1msTimer(); // PCBREV driver enum { diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp index 15fc3ab5a..627b175a2 100644 --- a/radio/src/targets/nv14/board.cpp +++ b/radio/src/targets/nv14/board.cpp @@ -128,7 +128,7 @@ void boardInit() flysky_hall_stick_init(); #endif init2MhzTimer(); - init5msTimer(); + init1msTimer(); TouchInit(); uint32_t press_start = 0; diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h index b1901434a..d33bba5a9 100644 --- a/radio/src/targets/nv14/board.h +++ b/radio/src/targets/nv14/board.h @@ -69,7 +69,7 @@ void boardOff(); // Timers driver void init2MhzTimer(); -void init5msTimer(); +void init1msTimer(); // CPU Unique ID #define LEN_CPU_UID (3*8+2) diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp index 69e36d5e8..03b6c4c84 100644 --- a/radio/src/targets/taranis/board.cpp +++ b/radio/src/targets/taranis/board.cpp @@ -163,7 +163,7 @@ void boardInit() lcdInit(); // delaysInit() must be called before audioInit(); init2MhzTimer(); - init5msTimer(); + init1msTimer(); __enable_irq(); i2cInit(); usbInit(); diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 8e583be73..c01c83046 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -62,7 +62,7 @@ void boardOff(); // Timers driver void init2MhzTimer(); -void init5msTimer(); +void init1msTimer(); // PCBREV driver enum {