Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 11:29:51 +03:00
Code Issues Wiki Activity

[V10] Internal module fixed

Browse source
This commit is contained in:
Bertrand Songis 2025-02-10 09:37:43 +01:00
parent c561a9bd7d
commit fe18f5a17f
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
7 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,11 +84,11 @@ void check_intmodule_heartbeat()
} }
#endif #endif
#if defined(INTMODULE_HEARTBEAT) && !defined(INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER) #if defined(INTMODULE_HEARTBEAT) && !defined(INTMODULE_HEARTBEAT_REUSE_ROTARY_ENCODER_IRQ1) && !defined(INTMODULE_HEARTBEAT_REUSE_ROTARY_ENCODER_IRQ2)
extern "C" void INTMODULE_HEARTBEAT_EXTI_IRQHandler() extern "C" void INTMODULE_HEARTBEAT_EXTI_IRQHandler()
{ {
// Check as first because it is the most critical one // Check as first because it is the most critical one
#if defined(TELEMETRY_EXTI_REUSE_INTERRUPT_INTMODULE_HEARTBEAT) #if defined(TELEMETRY_EXTI_REUSE_INTMODULE_HEARTBEAT_IRQ)
check_telemetry_exti(); check_telemetry_exti();
#endif #endif

8
radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp
View file

@ -132,7 +132,7 @@ void rotaryEncoderStartDelay()
extern "C" void ROTARY_ENCODER_EXTI_IRQHandler1(void) extern "C" void ROTARY_ENCODER_EXTI_IRQHandler1(void)
{ {
// Check as first because it is the most critical one // Check as first because it is the most critical one
#if !defined(BOOT) && defined(TELEMETRY_EXTI_REUSE_INTERRUPT_ROTARY_ENCODER) #if !defined(BOOT) && defined(TELEMETRY_EXTI_REUSE_ROTARY_ENCODER_IRQ1)
check_telemetry_exti(); check_telemetry_exti();
#endif #endif
@ -148,7 +148,7 @@ extern "C" void ROTARY_ENCODER_EXTI_IRQHandler1(void)
} }
#endif #endif
#if !defined(BOOT) && defined(INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER) #if !defined(BOOT) && defined(INTMODULE_HEARTBEAT_REUSE_ROTARY_ENCODER_IRQ1)
check_intmodule_heartbeat(); check_intmodule_heartbeat();
#endif #endif
} }
@ -160,6 +160,10 @@ extern "C" void ROTARY_ENCODER_EXTI_IRQHandler2(void)
rotaryEncoderStartDelay(); rotaryEncoderStartDelay();
EXTI_ClearITPendingBit(ROTARY_ENCODER_EXTI_LINE2); EXTI_ClearITPendingBit(ROTARY_ENCODER_EXTI_LINE2);
} }
#if !defined(BOOT) && defined(INTMODULE_HEARTBEAT_REUSE_ROTARY_ENCODER_IRQ2)
check_intmodule_heartbeat();
#endif
} }
#endif #endif

2
radio/src/targets/horus/hal.h
View file

@ -879,7 +879,7 @@
#define INTMODULE_HEARTBEAT_EXTI_PinSource GPIO_PinSource12 #define INTMODULE_HEARTBEAT_EXTI_PinSource GPIO_PinSource12
#define INTMODULE_HEARTBEAT_EXTI_LINE EXTI_Line12 #define INTMODULE_HEARTBEAT_EXTI_LINE EXTI_Line12
#define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI15_10_IRQn #define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI15_10_IRQn
#define INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER #define INTMODULE_HEARTBEAT_REUSE_ROTARY_ENCODER_IRQ1
#if defined(INTERNAL_MODULE_PXX2) #if defined(INTERNAL_MODULE_PXX2)
#define INTMODULE_HEARTBEAT_TRIGGER EXTI_Trigger_Falling #define INTMODULE_HEARTBEAT_TRIGGER EXTI_Trigger_Falling
#else #else

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

@ -1891,11 +1891,11 @@
#define TELEMETRY_EXTI_TRIGGER EXTI_Trigger_Rising #define TELEMETRY_EXTI_TRIGGER EXTI_Trigger_Rising
#if defined(RADIO_X7) || defined(RADIO_X7ACCESS) || defined(RADIO_TX12) || defined(RADIO_ZORRO) || defined(RADIO_T8) || defined(RADIO_TPRO) #if defined(RADIO_X7) || defined(RADIO_X7ACCESS) || defined(RADIO_TX12) || defined(RADIO_ZORRO) || defined(RADIO_T8) || defined(RADIO_TPRO)
#define TELEMETRY_EXTI_REUSE_INTERRUPT_ROTARY_ENCODER #define TELEMETRY_EXTI_REUSE_ROTARY_ENCODER_IRQ1
#elif defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019) #elif defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019)
#define TELEMETRY_EXTI_IRQHandler EXTI9_5_IRQHandler #define TELEMETRY_EXTI_IRQHandler EXTI9_5_IRQHandler
#else #else
#define TELEMETRY_EXTI_REUSE_INTERRUPT_INTMODULE_HEARTBEAT #define TELEMETRY_EXTI_REUSE_INTMODULE_HEARTBEAT_IRQ
#endif #endif
#define TELEMETRY_TIMER TIM11 #define TELEMETRY_TIMER TIM11
@ -1991,7 +1991,7 @@
#define INTMODULE_HEARTBEAT_RCC_AHB1Periph 0 #define INTMODULE_HEARTBEAT_RCC_AHB1Periph 0
#elif defined(RADIO_X7ACCESS) #elif defined(RADIO_X7ACCESS)
#define INTMODULE_HEARTBEAT #define INTMODULE_HEARTBEAT
#define INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER #define INTMODULE_HEARTBEAT_REUSE_ROTARY_ENCODER_IRQ1
#define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOA #define INTMODULE_HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOA
#define INTMODULE_HEARTBEAT_GPIO GPIOA #define INTMODULE_HEARTBEAT_GPIO GPIOA
#define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_7 // PA.07 #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_7 // PA.07
@ -2001,7 +2001,7 @@
#define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI9_5_IRQn #define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI9_5_IRQn
#elif defined(RADIO_V10) #elif defined(RADIO_V10)
#define INTMODULE_HEARTBEAT #define INTMODULE_HEARTBEAT
#define INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER #define INTMODULE_HEARTBEAT_REUSE_ROTARY_ENCODER_IRQ2
#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_14 // PD.14 #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_14 // PD.14
@ -2023,7 +2023,7 @@
#define INTMODULE_HEARTBEAT_RCC_AHB1Periph 0 #define INTMODULE_HEARTBEAT_RCC_AHB1Periph 0
#elif defined(RADIO_X7) || defined(RADIO_TX12) || defined(RADIO_TPRO) #elif defined(RADIO_X7) || defined(RADIO_TX12) || defined(RADIO_TPRO)
#define INTMODULE_HEARTBEAT #define INTMODULE_HEARTBEAT
#define INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER #define INTMODULE_HEARTBEAT_REUSE_ROTARY_ENCODER_IRQ1
#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 // PC.07 #define INTMODULE_HEARTBEAT_GPIO_PIN GPIO_Pin_7 // PC.07

2
radio/src/targets/taranis/telemetry_driver.cpp
View file

@ -102,7 +102,7 @@ void telemetryPortInvertedInit(uint32_t baudrate)
//TODO: //TODO:
// - handle conflict with HEARTBEAT disabled for trainer input... // - handle conflict with HEARTBEAT disabled for trainer input...
// - probably need to stop trainer input/output and restore after this is closed // - probably need to stop trainer input/output and restore after this is closed
#if !defined(TELEMETRY_EXTI_REUSE_INTERRUPT_ROTARY_ENCODER) && !defined(TELEMETRY_EXTI_REUSE_INTERRUPT_INTMODULE_HEARTBEAT) #if !defined(TELEMETRY_EXTI_REUSE_ROTARY_ENCODER_IRQ1) && !defined(TELEMETRY_EXTI_REUSE_INTMODULE_HEARTBEAT_IRQ)
NVIC_DisableIRQ(TELEMETRY_EXTI_IRQn); NVIC_DisableIRQ(TELEMETRY_EXTI_IRQn);
#endif #endif
NVIC_DisableIRQ(TELEMETRY_TIMER_IRQn); NVIC_DisableIRQ(TELEMETRY_TIMER_IRQn);

2
radio/src/targets/tbs/hal.h
View file

@ -365,7 +365,7 @@
#endif #endif
#if defined(RADIO_TANGO) #if defined(RADIO_TANGO)
#define TELEMETRY_EXTI_REUSE_INTERRUPT_ROTARY_ENCODER #define TELEMETRY_EXTI_REUSE_ROTARY_ENCODER_IRQ1
#endif #endif
#define TELEMETRY_TIMER TIM11 #define TELEMETRY_TIMER TIM11
#define TELEMETRY_TIMER_IRQn TIM1_TRG_COM_TIM11_IRQn #define TELEMETRY_TIMER_IRQn TIM1_TRG_COM_TIM11_IRQn

4
radio/src/targets/tbs/telemetry_driver.cpp
View file

@ -112,7 +112,7 @@ void telemetryPortInvertedInit(uint32_t baudrate)
//TODO: //TODO:
// - handle conflict with HEARTBEAT disabled for trainer input... // - handle conflict with HEARTBEAT disabled for trainer input...
// - probably need to stop trainer input/output and restore after this is closed // - probably need to stop trainer input/output and restore after this is closed
#if !defined(TELEMETRY_EXTI_REUSE_INTERRUPT_ROTARY_ENCODER) && !defined(TELEMETRY_EXTI_REUSE_INTERRUPT_INTMODULE_HEARTBEAT) #if !defined(TELEMETRY_EXTI_REUSE_ROTARY_ENCODER_IRQ1) && !defined(TELEMETRY_EXTI_REUSE_INTMODULE_HEARTBEAT_IRQ)
NVIC_DisableIRQ(TELEMETRY_EXTI_IRQn); NVIC_DisableIRQ(TELEMETRY_EXTI_IRQn);
#endif #endif
NVIC_DisableIRQ(TELEMETRY_TIMER_IRQn); NVIC_DisableIRQ(TELEMETRY_TIMER_IRQn);
@ -166,7 +166,7 @@ void telemetryPortInvertedInit(uint32_t baudrate)
//TODO: //TODO:
// - handle conflict with HEARTBEAT disabled for trainer input... // - handle conflict with HEARTBEAT disabled for trainer input...
// - probably need to stop trainer input/output and restore after this is closed // - probably need to stop trainer input/output and restore after this is closed
#if !defined(TELEMETRY_EXTI_REUSE_INTERRUPT_ROTARY_ENCODER) && !defined(TELEMETRY_EXTI_REUSE_INTERRUPT_INTMODULE_HEARTBEAT) #if !defined(TELEMETRY_EXTI_REUSE_ROTARY_ENCODER_IRQ1) && !defined(TELEMETRY_EXTI_REUSE_INTMODULE_HEARTBEAT_IRQ)
NVIC_SetPriority(TELEMETRY_EXTI_IRQn, 0); NVIC_SetPriority(TELEMETRY_EXTI_IRQn, 0);
NVIC_EnableIRQ(TELEMETRY_EXTI_IRQn); NVIC_EnableIRQ(TELEMETRY_EXTI_IRQn);
#endif #endif