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

Fixes #7027

Browse source
This commit is contained in:
Bertrand Songis 2019-11-07 13:39:38 +01:00
parent 9b05060a1a
commit 3f0ce109ad
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/212x64/menus.h
View file

@ -54,7 +54,7 @@ void menuTraceBuffer(event_t event);
enum MenuRadioIndexes { enum MenuRadioIndexes {
MENU_RADIO_SETUP, MENU_RADIO_SETUP,
MENU_RADIO_SD_MANAGER, MENU_RADIO_SD_MANAGER,
#if defined(LUA) || defined(PXX2) #if defined(LUA) || defined(PXX2) || defined(MULTIMODULE)
MENU_RADIO_TOOLS, MENU_RADIO_TOOLS,
#endif #endif
MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_SPECIAL_FUNCTIONS,

3
radio/src/gui/gui_common.cpp
View file

@ -727,6 +727,9 @@ bool isTrainerModeAvailable(int mode)
#if defined(PCBTARANIS) && !defined(TRAINER_BATTERY_COMPARTMENT) #if defined(PCBTARANIS) && !defined(TRAINER_BATTERY_COMPARTMENT)
if (mode == TRAINER_MODE_MASTER_BATTERY_COMPARTMENT) if (mode == TRAINER_MODE_MASTER_BATTERY_COMPARTMENT)
return false; return false;
#elif defined(PCBTARANIS)
if (mode == TRAINER_MODE_MASTER_BATTERY_COMPARTMENT)
return g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER;
#endif #endif
#if defined(PCBX9E) #if defined(PCBX9E)

2
radio/src/myeeprom.h
View file

@ -38,7 +38,7 @@
#define HAS_WIRELESS_TRAINER_HARDWARE() (g_eeGeneral.auxSerialMode==UART_MODE_SBUS_TRAINER) #define HAS_WIRELESS_TRAINER_HARDWARE() (g_eeGeneral.auxSerialMode==UART_MODE_SBUS_TRAINER)
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define IS_TRAINER_EXTERNAL_MODULE() (g_model.trainerData.mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || g_model.trainerData.mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE) #define IS_TRAINER_EXTERNAL_MODULE() (g_model.trainerData.mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || g_model.trainerData.mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE)
#define HAS_WIRELESS_TRAINER_HARDWARE() (g_eeGeneral.auxSerialMode==UART_MODE_SBUS_TRAINER) #define HAS_WIRELESS_TRAINER_HARDWARE() (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER)
#else #else
#define IS_TRAINER_EXTERNAL_MODULE() false #define IS_TRAINER_EXTERNAL_MODULE() false
#endif #endif

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

@ -257,9 +257,8 @@ static void processMultiRxChannels(const uint8_t * data, uint8_t len)
uint8_t bitsavailable = 0; uint8_t bitsavailable = 0;
uint8_t byteIdx = 4; uint8_t byteIdx = 4;
while(ch < maxCh) { while (ch < maxCh) {
while (bitsavailable < MULTI_CHAN_BITS && byteIdx < len) {
while((bitsavailable < MULTI_CHAN_BITS) && byteIdx < len) {
bits |= (uint32_t)(data[byteIdx++]) << (uint32_t)bitsavailable; bits |= (uint32_t)(data[byteIdx++]) << (uint32_t)bitsavailable;
bitsavailable += 8; bitsavailable += 8;
} }

11
radio/src/trainer.cpp
View file

@ -115,15 +115,14 @@ void checkTrainerSettings()
#if defined(TRAINER_BATTERY_COMPARTMENT) #if defined(TRAINER_BATTERY_COMPARTMENT)
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT: case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER) { if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER)
auxSerialSbusInit(); auxSerialSbusInit();
break; else
} init_trainer_capture();
// no break break;
#endif #endif
default: case TRAINER_MODE_MASTER_TRAINER_JACK:
// master is default
init_trainer_capture(); init_trainer_capture();
break; break;
} }