Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Cosmetics

Browse source
This commit is contained in:
3djc 2021-06-22 17:21:34 +02:00
parent fbdb325f54
commit 7d25badd65
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -268,12 +268,12 @@ void enablePulsesExternalModule(uint8_t protocol)
#if defined(PXX2) && defined(EXTMODULE_USART) #if defined(PXX2) && defined(EXTMODULE_USART)
case PROTOCOL_CHANNELS_PXX2_HIGHSPEED: case PROTOCOL_CHANNELS_PXX2_HIGHSPEED:
extmoduleInvertedSerialStart(PXX2_HIGHSPEED_BAUDRATE); extmoduleInvertedSerialStart(PXX2_HIGHSPEED_BAUDRATE);
mixerSchedulerSetPeriod(EXTERNAL_MODULE, PXX2_PERIOD); mixerSchedulerSetPeriod(EXTERNAL_MODULE, PXX2_NO_HEARTBEAT_PERIOD);
break; break;
case PROTOCOL_CHANNELS_PXX2_LOWSPEED: case PROTOCOL_CHANNELS_PXX2_LOWSPEED:
extmoduleInvertedSerialStart(PXX2_LOWSPEED_BAUDRATE); extmoduleInvertedSerialStart(PXX2_LOWSPEED_BAUDRATE);
mixerSchedulerSetPeriod(EXTERNAL_MODULE, PXX2_PERIOD); mixerSchedulerSetPeriod(EXTERNAL_MODULE, PXX2_NO_HEARTBEAT_PERIOD);
break; break;
#endif #endif
@ -347,7 +347,7 @@ bool setupPulsesExternalModule(uint8_t protocol)
case PROTOCOL_CHANNELS_PXX2_LOWSPEED: case PROTOCOL_CHANNELS_PXX2_LOWSPEED:
extmodulePulsesData.pxx2.setupFrame(EXTERNAL_MODULE); extmodulePulsesData.pxx2.setupFrame(EXTERNAL_MODULE);
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
sheduleNextMixerCalculation(EXTERNAL_MODULE, PXX2_PERIOD); sheduleNextMixerCalculation(EXTERNAL_MODULE, PXX2_NO_HEARTBEAT_PERIOD);
#endif #endif
return true; return true;
#endif #endif
@ -487,9 +487,9 @@ static void enablePulsesInternalModule(uint8_t protocol)
#if defined(INTMODULE_HEARTBEAT) #if defined(INTMODULE_HEARTBEAT)
// use backup trigger (1 ms later) // use backup trigger (1 ms later)
init_intmodule_heartbeat(); init_intmodule_heartbeat();
mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_HEARTBEAT_PERIOD); mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_MAX_HEARTBEAT_PERIOD);
#else #else
mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_PERIOD); mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_NO_HEARTBEAT_PERIOD);
#endif #endif
break; break;
#endif #endif
@ -547,9 +547,9 @@ bool setupPulsesInternalModule(uint8_t protocol)
else { else {
#if defined(INTMODULE_HEARTBEAT) #if defined(INTMODULE_HEARTBEAT)
mixerSchedulerResetTimer(); mixerSchedulerResetTimer();
mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_HEARTBEAT_PERIOD); mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_MAX_HEARTBEAT_PERIOD);
#else #else
mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_PERIOD); mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_NO_HEARTBEAT_PERIOD);
#endif #endif
} }
return result; return result;

4
radio/src/pulses/pxx.h
View file

@ -29,8 +29,8 @@
#define PXX2_LOWSPEED_BAUDRATE 230400 #define PXX2_LOWSPEED_BAUDRATE 230400
#define PXX2_HIGHSPEED_BAUDRATE 450000 #define PXX2_HIGHSPEED_BAUDRATE 450000
#define PXX2_PERIOD 4000/*us*/ #define PXX2_NO_HEARTBEAT_PERIOD 4000/*us*/
#define PXX2_HEARTBEAT_PERIOD 8000/*us 7ms frame rate + 1ms heartbeat backup*/ #define PXX2_MAX_HEARTBEAT_PERIOD (7000 + 1000)/*us 7ms frame rate + 1ms heartbeat backup*/
#define PXX2_TOOLS_PERIOD 1000/*us*/ #define PXX2_TOOLS_PERIOD 1000/*us*/
#define PXX2_FRAME_MAXLENGTH 64 #define PXX2_FRAME_MAXLENGTH 64

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

@ -141,7 +141,7 @@ void intmoduleSendBuffer(const uint8_t * data, uint8_t size)
#if defined(INTMODULE_DMA_STREAM) #if defined(INTMODULE_DMA_STREAM)
if (!DMA_GetITStatus(INTMODULE_DMA_STREAM, INTMODULE_DMA_FLAG_TC)) if (!DMA_GetITStatus(INTMODULE_DMA_STREAM, INTMODULE_DMA_FLAG_TC))
return;; return;
DMA_InitTypeDef DMA_InitStructure; DMA_InitTypeDef DMA_InitStructure;
DMA_DeInit(INTMODULE_DMA_STREAM); DMA_DeInit(INTMODULE_DMA_STREAM);