Updated timer driver to use 1ms loop to compatible with nv14.

This commit is contained in:
Richard Li
2021-07-07 10:39:16 +08:00
parent 2a55a286ed
commit 1d81db0113
7 changed files with 26 additions and 19 deletions
@@ -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);
}
+1 -1
View File
@@ -206,7 +206,7 @@ void boardInit()
#endif
init2MhzTimer();
init5msTimer();
init1msTimer();
usbInit();
hapticInit();
+1 -1
View File
@@ -75,7 +75,7 @@ void boardOff();
// Timers driver
void init2MhzTimer();
void init5msTimer();
void init1msTimer();
// PCBREV driver
enum {
+1 -1
View File
@@ -128,7 +128,7 @@ void boardInit()
flysky_hall_stick_init();
#endif
init2MhzTimer();
init5msTimer();
init1msTimer();
TouchInit();
uint32_t press_start = 0;
+1 -1
View File
@@ -69,7 +69,7 @@ void boardOff();
// Timers driver
void init2MhzTimer();
void init5msTimer();
void init1msTimer();
// CPU Unique ID
#define LEN_CPU_UID (3*8+2)
+1 -1
View File
@@ -163,7 +163,7 @@ void boardInit()
lcdInit(); // delaysInit() must be called before
audioInit();
init2MhzTimer();
init5msTimer();
init1msTimer();
__enable_irq();
i2cInit();
usbInit();
+1 -1
View File
@@ -62,7 +62,7 @@ void boardOff();
// Timers driver
void init2MhzTimer();
void init5msTimer();
void init1msTimer();
// PCBREV driver
enum {