Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 06:15:10 +03:00
Code Issues Wiki Activity

Typo

Browse source
This commit is contained in:
Bertrand Songis 2019-06-08 11:22:55 +02:00
parent cd6c599f43
commit d6a9af760d
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/pulses/pulses.cpp
View file

@ -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) { if (moduleState[INTERNAL_MODULE].mode == MODULE_MODE_SPECTRUM_ANALYSER || moduleState[INTERNAL_MODULE].mode == MODULE_MODE_POWER_METER) {
scheduleNextMixerCalculation(INTERNAL_MODULE, PXX2_TOOLS_PERIOD); scheduleNextMixerCalculation(INTERNAL_MODULE, PXX2_TOOLS_PERIOD);
} }
#if !defined(INTMDULE_HEARTBEAT) #if !defined(INTMODULE_HEARTBEAT)
else { else {
scheduleNextMixerCalculation(INTERNAL_MODULE, PXX2_PERIOD); scheduleNextMixerCalculation(INTERNAL_MODULE, PXX2_PERIOD);
} }

2
radio/src/targets/common/arm/stm32/heartbeat_driver.cpp
View file

@ -75,7 +75,7 @@ void check_xjt_heartbeat()
} }
#endif #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() extern "C" void INTMODULE_HEARTBEAT_EXTI_IRQHandler()
{ {
check_xjt_heartbeat(); check_xjt_heartbeat();

4
radio/src/targets/taranis/hal.h
View file

@ -1172,6 +1172,7 @@
// Heartbeat for iXJT / ISRM synchro // Heartbeat for iXJT / ISRM synchro
#if defined(PCBXLITE) #if defined(PCBXLITE)
#define INTMODULE_HEARTBEAT
#define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOD #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOD
#define INTMODULE_HEARTBEAT_GPIO GPIOD #define INTMODULE_HEARTBEAT_GPIO GPIOD
#define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_15 #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_15
@ -1181,6 +1182,7 @@
#define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI15_10_IRQn #define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI15_10_IRQn
#define INTMODULE_HEARTBEAT_EXTI_IRQHandler EXTI15_10_IRQHandler #define INTMODULE_HEARTBEAT_EXTI_IRQHandler EXTI15_10_IRQHandler
#elif defined(PCBX9LITE) #elif defined(PCBX9LITE)
// #define INTMODULE_HEARTBEAT
#define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC
// #define INTMODULE_HEARTBEAT_GPIO GPIOC // #define INTMODULE_HEARTBEAT_GPIO GPIOC
// #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_9 // #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_9
@ -1190,6 +1192,7 @@
#define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI9_5_IRQn #define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI9_5_IRQn
#define INTMODULE_HEARTBEAT_EXTI_IRQHandler EXTI9_5_IRQHandler #define INTMODULE_HEARTBEAT_EXTI_IRQHandler EXTI9_5_IRQHandler
#elif defined(RADIO_X7) #elif defined(RADIO_X7)
#define INTMODULE_HEARTBEAT
#define INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER #define INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER
#define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC
#define INTMODULE_HEARTBEAT_GPIO GPIOC #define INTMODULE_HEARTBEAT_GPIO GPIOC
@ -1199,6 +1202,7 @@
#define INTMODULE_HEARTBEAT_EXTI_LINE EXTI_Line7 #define INTMODULE_HEARTBEAT_EXTI_LINE EXTI_Line7
#define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI9_5_IRQn #define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI9_5_IRQn
#else #else
#define INTMODULE_HEARTBEAT
#define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOC
#define INTMODULE_HEARTBEAT_GPIO GPIOC #define INTMODULE_HEARTBEAT_GPIO GPIOC
#define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_7 #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_7

2
radio/src/tasks.cpp
View file

@ -140,7 +140,7 @@ TASK_FUNCTION(mixerTask)
run = true; 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) { if (moduleState[0].protocol == PROTOCOL_CHANNELS_PXX2 && heartbeatCapture.valid && heartbeatCapture.timestamp > lastRunTime) {
run = true; run = true;
} }