From 84387e7e0f99169fdf88247b4f819954505d29e6 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 5 Apr 2021 11:16:17 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/gui_common.h | 1 - .../taranis/intmodule_pulses_driver.cpp | 8 --- radio/src/tasks.cpp | 4 -- radio/src/telemetry/crossfire.cpp | 1 - radio/src/telemetry/crossfire.h | 2 +- radio/src/telemetry/multi.cpp | 3 -- radio/src/telemetry/telemetry.cpp | 4 -- tools/commit-tests.sh | 52 +++++++++---------- 8 files changed, 27 insertions(+), 48 deletions(-) diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h index b7d73d075..80b675b42 100644 --- a/radio/src/gui/gui_common.h +++ b/radio/src/gui/gui_common.h @@ -185,7 +185,6 @@ inline uint8_t MODULE_CHANNELS_ROWS(int moduleIdx) } #if defined(MULTIMODULE) - inline uint8_t MULTI_DISABLE_CHAN_MAP_ROW(uint8_t moduleIdx) { if (!isModuleMultimodule(moduleIdx)) diff --git a/radio/src/targets/taranis/intmodule_pulses_driver.cpp b/radio/src/targets/taranis/intmodule_pulses_driver.cpp index 588e1a448..5de2daa1b 100644 --- a/radio/src/targets/taranis/intmodule_pulses_driver.cpp +++ b/radio/src/targets/taranis/intmodule_pulses_driver.cpp @@ -42,14 +42,6 @@ void intmoduleSendNextFrame() #if defined(PXX1) case PROTOCOL_CHANNELS_PXX1_PULSES: { - // uint32_t last = intmodulePulsesData.pxx.getLast(); - // if (heartbeatCapture.valid) { - // if (getTmr2MHz() - heartbeatCapture.timestamp > HEARBEAT_OFFSET) - // last -= 21; - // else - // last += 19; - // intmodulePulsesData.pxx.setLast(last); - // } if (INTMODULE_DMA_STREAM->CR & DMA_SxCR_EN) return; diff --git a/radio/src/tasks.cpp b/radio/src/tasks.cpp index 97f78c972..e71d8829a 100644 --- a/radio/src/tasks.cpp +++ b/radio/src/tasks.cpp @@ -67,7 +67,6 @@ bool isForcePowerOffRequested() bool isModuleSynchronous(uint8_t moduleIdx) { switch(moduleState[moduleIdx].protocol) { - case PROTOCOL_CHANNELS_PXX2_HIGHSPEED: case PROTOCOL_CHANNELS_PXX2_LOWSPEED: case PROTOCOL_CHANNELS_CROSSFIRE: @@ -109,8 +108,6 @@ void sendSynchronousPulses(uint8_t runMask) } } -//#define DEBUG_MIXER_SCHEDULER - uint32_t nextMixerTime[NUM_MODULES]; TASK_FUNCTION(mixerTask) @@ -181,7 +178,6 @@ TASK_FUNCTION(mixerTask) RTOS_UNLOCK_MUTEX(mixerMutex); DEBUG_TIMER_STOP(debugTimerMixer); - #if defined(STM32) && !defined(SIMU) if (getSelectedUsbMode() == USB_JOYSTICK_MODE) { usbJoystickUpdate(); diff --git a/radio/src/telemetry/crossfire.cpp b/radio/src/telemetry/crossfire.cpp index 173ea38f4..64dba983d 100644 --- a/radio/src/telemetry/crossfire.cpp +++ b/radio/src/telemetry/crossfire.cpp @@ -203,7 +203,6 @@ void processCrossfireTelemetryFrame() } break; - #if defined(LUA) default: if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(telemetryRxBufferCount-2) ) { diff --git a/radio/src/telemetry/crossfire.h b/radio/src/telemetry/crossfire.h index fb68b8a1a..23d39947e 100644 --- a/radio/src/telemetry/crossfire.h +++ b/radio/src/telemetry/crossfire.h @@ -104,7 +104,7 @@ const uint8_t CROSSFIRE_PERIODS[] = { }; #if SPORT_MAX_BAUDRATE < 400000 || defined(DEBUG) #define CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate] -#define CROSSFIRE_PERIOD (CROSSFIRE_PERIODS[g_eeGeneral.telemetryBaudrate]*1000) +#define CROSSFIRE_PERIOD (CROSSFIRE_PERIODS[g_eeGeneral.telemetryBaudrate] * 1000) #else #define CROSSFIRE_BAUDRATE 400000 #define CROSSFIRE_PERIOD 4000 /* us; 250 Hz */ diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp index 624effbba..d71cdad34 100644 --- a/radio/src/telemetry/multi.cpp +++ b/radio/src/telemetry/multi.cpp @@ -248,9 +248,6 @@ static void processMultiSyncPacket(const uint8_t * data, uint8_t module) uint16_t refreshRate = data[0] << 8 | data[1]; int16_t inputLag = data[2] << 8 | data[3]; - // if (inputLag > refreshRate/2) - // inputLag -= refreshRate; - status.update(refreshRate, inputLag); #if defined(DEBUG) serialPrint("MP ADJ: R %d, L %04d", refreshRate, inputLag); diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 17777dc6a..700bf535a 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -378,23 +378,19 @@ Fifo * luaInputTelemetryFifo = NULL; #endif #if defined(HARDWARE_INTERNAL_MODULE) - static ModuleSyncStatus moduleSyncStatus[NUM_MODULES]; ModuleSyncStatus &getModuleSyncStatus(uint8_t moduleIdx) { return moduleSyncStatus[moduleIdx]; } - #else - static ModuleSyncStatus moduleSyncStatus; ModuleSyncStatus &getModuleSyncStatus(uint8_t moduleIdx) { return moduleSyncStatus; } - #endif ModuleSyncStatus::ModuleSyncStatus() diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh index 9ecd88769..be5940308 100755 --- a/tools/commit-tests.sh +++ b/tools/commit-tests.sh @@ -58,32 +58,32 @@ COMMON_OPTIONS+=${EXTRA_OPTIONS} mkdir build || true cd build -#if [[ " SKY9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then -# # OpenTX on Sky9x -# rm -rf ./* -# cmake "${COMMON_OPTIONS}" -DPCB=SKY9X -DHELI=YES DLUA=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES -DGVARS=YES "${SRCDIR}" -# make -j"${CORES}" ${FIRMARE_TARGET} -# make -j"${CORES}" libsimulator -# make -j"${CORES}" tests-radio -#fi -# -#if [[ " AR9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then -# # OpenTX on AR9X -# rm -rf ./* -# cmake "${COMMON_OPTIONS}" -DPCB=AR9X -DHELI=YES -DGVARS=YES "${SRCDIR}" -# make -j"${CORES}" ${FIRMARE_TARGET} -# make -j"${CORES}" libsimulator -# make -j"${CORES}" tests-radio -#fi -# -#if [[ " 9XRPRO ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then -# # OpenTX on Sky9x -# rm -rf ./* -# cmake "${COMMON_OPTIONS}" -DPCB=9XRPRO -DHELI=YES -DGVARS=YES "${SRCDIR}" -# make -j"${CORES}" ${FIRMARE_TARGET} -# make -j"${CORES}" libsimulator -# make -j"${CORES}" tests-radio -#fi +if [[ " SKY9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then + # OpenTX on Sky9x + rm -rf ./* + cmake "${COMMON_OPTIONS}" -DPCB=SKY9X -DHELI=YES DLUA=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES -DGVARS=YES "${SRCDIR}" + make -j"${CORES}" ${FIRMARE_TARGET} + make -j"${CORES}" libsimulator + make -j"${CORES}" tests-radio +fi + +if [[ " AR9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then + # OpenTX on AR9X + rm -rf ./* + cmake "${COMMON_OPTIONS}" -DPCB=AR9X -DHELI=YES -DGVARS=YES "${SRCDIR}" + make -j"${CORES}" ${FIRMARE_TARGET} + make -j"${CORES}" libsimulator + make -j"${CORES}" tests-radio +fi + +if [[ " 9XRPRO ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then + # OpenTX on Sky9x + rm -rf ./* + cmake "${COMMON_OPTIONS}" -DPCB=9XRPRO -DHELI=YES -DGVARS=YES "${SRCDIR}" + make -j"${CORES}" ${FIRMARE_TARGET} + make -j"${CORES}" libsimulator + make -j"${CORES}" tests-radio +fi if [[ " X9LITE ALL " =~ \ ${FLAVOR}\ ]] ; then # OpenTX on X9LITE