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-04-05 11:16:17 +02:00
parent 78dd516069
commit 84387e7e0f
8 changed files with 27 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
radio/src/gui/gui_common.h
View file

@ -185,7 +185,6 @@ inline uint8_t MODULE_CHANNELS_ROWS(int moduleIdx)
} }
#if defined(MULTIMODULE) #if defined(MULTIMODULE)
inline uint8_t MULTI_DISABLE_CHAN_MAP_ROW(uint8_t moduleIdx) inline uint8_t MULTI_DISABLE_CHAN_MAP_ROW(uint8_t moduleIdx)
{ {
if (!isModuleMultimodule(moduleIdx)) if (!isModuleMultimodule(moduleIdx))

8
radio/src/targets/taranis/intmodule_pulses_driver.cpp
View file

@ -42,14 +42,6 @@ void intmoduleSendNextFrame()
#if defined(PXX1) #if defined(PXX1)
case PROTOCOL_CHANNELS_PXX1_PULSES: 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) if (INTMODULE_DMA_STREAM->CR & DMA_SxCR_EN)
return; return;

4
radio/src/tasks.cpp
View file

@ -67,7 +67,6 @@ bool isForcePowerOffRequested()
bool isModuleSynchronous(uint8_t moduleIdx) bool isModuleSynchronous(uint8_t moduleIdx)
{ {
switch(moduleState[moduleIdx].protocol) { switch(moduleState[moduleIdx].protocol) {
case PROTOCOL_CHANNELS_PXX2_HIGHSPEED: case PROTOCOL_CHANNELS_PXX2_HIGHSPEED:
case PROTOCOL_CHANNELS_PXX2_LOWSPEED: case PROTOCOL_CHANNELS_PXX2_LOWSPEED:
case PROTOCOL_CHANNELS_CROSSFIRE: case PROTOCOL_CHANNELS_CROSSFIRE:
@ -109,8 +108,6 @@ void sendSynchronousPulses(uint8_t runMask)
} }
} }
//#define DEBUG_MIXER_SCHEDULER
uint32_t nextMixerTime[NUM_MODULES]; uint32_t nextMixerTime[NUM_MODULES];
TASK_FUNCTION(mixerTask) TASK_FUNCTION(mixerTask)
@ -181,7 +178,6 @@ TASK_FUNCTION(mixerTask)
RTOS_UNLOCK_MUTEX(mixerMutex); RTOS_UNLOCK_MUTEX(mixerMutex);
DEBUG_TIMER_STOP(debugTimerMixer); DEBUG_TIMER_STOP(debugTimerMixer);
#if defined(STM32) && !defined(SIMU) #if defined(STM32) && !defined(SIMU)
if (getSelectedUsbMode() == USB_JOYSTICK_MODE) { if (getSelectedUsbMode() == USB_JOYSTICK_MODE) {
usbJoystickUpdate(); usbJoystickUpdate();

1
radio/src/telemetry/crossfire.cpp
View file

@ -203,7 +203,6 @@ void processCrossfireTelemetryFrame()
} }
break; break;
#if defined(LUA) #if defined(LUA)
default: default:
if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(telemetryRxBufferCount-2) ) { if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(telemetryRxBufferCount-2) ) {

3
radio/src/telemetry/multi.cpp
View file

@ -248,9 +248,6 @@ static void processMultiSyncPacket(const uint8_t * data, uint8_t module)
uint16_t refreshRate = data[0] << 8 | data[1]; uint16_t refreshRate = data[0] << 8 | data[1];
int16_t inputLag = data[2] << 8 | data[3]; int16_t inputLag = data[2] << 8 | data[3];
// if (inputLag > refreshRate/2)
// inputLag -= refreshRate;
status.update(refreshRate, inputLag); status.update(refreshRate, inputLag);
#if defined(DEBUG) #if defined(DEBUG)
serialPrint("MP ADJ: R %d, L %04d", refreshRate, inputLag); serialPrint("MP ADJ: R %d, L %04d", refreshRate, inputLag);

4
radio/src/telemetry/telemetry.cpp
View file

@ -378,23 +378,19 @@ Fifo<uint8_t, LUA_TELEMETRY_INPUT_FIFO_SIZE> * luaInputTelemetryFifo = NULL;
#endif #endif
#if defined(HARDWARE_INTERNAL_MODULE) #if defined(HARDWARE_INTERNAL_MODULE)
static ModuleSyncStatus moduleSyncStatus[NUM_MODULES]; static ModuleSyncStatus moduleSyncStatus[NUM_MODULES];
ModuleSyncStatus &getModuleSyncStatus(uint8_t moduleIdx) ModuleSyncStatus &getModuleSyncStatus(uint8_t moduleIdx)
{ {
return moduleSyncStatus[moduleIdx]; return moduleSyncStatus[moduleIdx];
} }
#else #else
static ModuleSyncStatus moduleSyncStatus; static ModuleSyncStatus moduleSyncStatus;
ModuleSyncStatus &getModuleSyncStatus(uint8_t moduleIdx) ModuleSyncStatus &getModuleSyncStatus(uint8_t moduleIdx)
{ {
return moduleSyncStatus; return moduleSyncStatus;
} }
#endif #endif
ModuleSyncStatus::ModuleSyncStatus() ModuleSyncStatus::ModuleSyncStatus()

52
tools/commit-tests.sh
View file

@ -58,32 +58,32 @@ COMMON_OPTIONS+=${EXTRA_OPTIONS}
mkdir build || true mkdir build || true
cd build cd build
#if [[ " SKY9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then if [[ " SKY9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then
# # OpenTX on Sky9x # OpenTX on Sky9x
# rm -rf ./* 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}" 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}" ${FIRMARE_TARGET}
# make -j"${CORES}" libsimulator make -j"${CORES}" libsimulator
# make -j"${CORES}" tests-radio make -j"${CORES}" tests-radio
#fi fi
#
#if [[ " AR9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then if [[ " AR9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then
# # OpenTX on AR9X # OpenTX on AR9X
# rm -rf ./* rm -rf ./*
# cmake "${COMMON_OPTIONS}" -DPCB=AR9X -DHELI=YES -DGVARS=YES "${SRCDIR}" cmake "${COMMON_OPTIONS}" -DPCB=AR9X -DHELI=YES -DGVARS=YES "${SRCDIR}"
# make -j"${CORES}" ${FIRMARE_TARGET} make -j"${CORES}" ${FIRMARE_TARGET}
# make -j"${CORES}" libsimulator make -j"${CORES}" libsimulator
# make -j"${CORES}" tests-radio make -j"${CORES}" tests-radio
#fi fi
#
#if [[ " 9XRPRO ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then if [[ " 9XRPRO ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then
# # OpenTX on Sky9x # OpenTX on Sky9x
# rm -rf ./* rm -rf ./*
# cmake "${COMMON_OPTIONS}" -DPCB=9XRPRO -DHELI=YES -DGVARS=YES "${SRCDIR}" cmake "${COMMON_OPTIONS}" -DPCB=9XRPRO -DHELI=YES -DGVARS=YES "${SRCDIR}"
# make -j"${CORES}" ${FIRMARE_TARGET} make -j"${CORES}" ${FIRMARE_TARGET}
# make -j"${CORES}" libsimulator make -j"${CORES}" libsimulator
# make -j"${CORES}" tests-radio make -j"${CORES}" tests-radio
#fi fi
if [[ " X9LITE ALL " =~ \ ${FLAVOR}\ ]] ; then if [[ " X9LITE ALL " =~ \ ${FLAVOR}\ ]] ; then
# OpenTX on X9LITE # OpenTX on X9LITE