diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp index 8c5dfbc94..23aaa1072 100755 --- a/radio/src/pulses/pulses.cpp +++ b/radio/src/pulses/pulses.cpp @@ -275,7 +275,7 @@ void setupPulsesInternalModule(uint8_t protocol) if (moduleState[INTERNAL_MODULE].mode == MODULE_MODE_SPECTRUM_ANALYSER || moduleState[INTERNAL_MODULE].mode == MODULE_MODE_POWER_METER) { scheduleNextMixerCalculation(INTERNAL_MODULE, PXX2_TOOLS_PERIOD); } -#if !defined(INTMDULE_HEARTBEAT) +#if !defined(INTMODULE_HEARTBEAT) else { scheduleNextMixerCalculation(INTERNAL_MODULE, PXX2_PERIOD); } diff --git a/radio/src/targets/common/arm/stm32/heartbeat_driver.cpp b/radio/src/targets/common/arm/stm32/heartbeat_driver.cpp index 5ab376736..2281fa866 100644 --- a/radio/src/targets/common/arm/stm32/heartbeat_driver.cpp +++ b/radio/src/targets/common/arm/stm32/heartbeat_driver.cpp @@ -75,7 +75,7 @@ void check_xjt_heartbeat() } #endif -#if defined(INTMDULE_HEARTBEAT) && !defined(INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER) +#if defined(INTMODULE_HEARTBEAT) && !defined(INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER) extern "C" void INTMODULE_HEARTBEAT_EXTI_IRQHandler() { check_xjt_heartbeat(); diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index fdd72ca59..8c0175408 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1172,6 +1172,7 @@ // Heartbeat for iXJT / ISRM synchro #if defined(PCBXLITE) + #define INTMODULE_HEARTBEAT #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOD #define INTMODULE_HEARTBEAT_GPIO GPIOD #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_15 @@ -1181,6 +1182,7 @@ #define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI15_10_IRQn #define INTMODULE_HEARTBEAT_EXTI_IRQHandler EXTI15_10_IRQHandler #elif defined(PCBX9LITE) + // #define INTMODULE_HEARTBEAT #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC // #define INTMODULE_HEARTBEAT_GPIO GPIOC // #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_9 @@ -1190,6 +1192,7 @@ #define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI9_5_IRQn #define INTMODULE_HEARTBEAT_EXTI_IRQHandler EXTI9_5_IRQHandler #elif defined(RADIO_X7) + #define INTMODULE_HEARTBEAT #define INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC #define INTMODULE_HEARTBEAT_GPIO GPIOC @@ -1199,6 +1202,7 @@ #define INTMODULE_HEARTBEAT_EXTI_LINE EXTI_Line7 #define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI9_5_IRQn #else + #define INTMODULE_HEARTBEAT #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC #define INTMODULE_HEARTBEAT_GPIO GPIOC #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_7 @@ -1630,4 +1634,4 @@ #define TIMER_2MHz_RCC_APB1Periph RCC_APB1Periph_TIM7 #define TIMER_2MHz_TIMER TIM7 -#endif // _HAL_H_ \ No newline at end of file +#endif // _HAL_H_ diff --git a/radio/src/tasks.cpp b/radio/src/tasks.cpp index e1a0f5e58..d0d02b9fe 100644 --- a/radio/src/tasks.cpp +++ b/radio/src/tasks.cpp @@ -140,7 +140,7 @@ TASK_FUNCTION(mixerTask) run = true; } -#if defined(PXX2) && defined(INTMDULE_HEARTBEAT) +#if defined(PXX2) && defined(INTMODULE_HEARTBEAT) if (moduleState[0].protocol == PROTOCOL_CHANNELS_PXX2 && heartbeatCapture.valid && heartbeatCapture.timestamp > lastRunTime) { run = true; }