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

Cosmetics

Browse source
This commit is contained in:
bsongis 2014-05-16 21:17:54 +02:00
parent 92e7182740
commit 4f0e4feadd
7 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/Makefile
View file

@ -573,7 +573,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
SDCARD = YES SDCARD = YES
BUZZER = NO BUZZER = NO
THR_TRACE = YES THR_TRACE = YES
CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DDSM2 -DDSM2_PPM
ifeq ($(PCB), SKY9X) ifeq ($(PCB), SKY9X)
CPPDEFS += -DROTARY_ENCODERS=1 CPPDEFS += -DROTARY_ENCODERS=1
CPPSRC += targets/sky9x/rotenc_driver.cpp CPPSRC += targets/sky9x/rotenc_driver.cpp
@ -928,7 +928,7 @@ endif
ifeq ($(EXT), $(filter $(EXT), FRSKY TELEMETREZ)) ifeq ($(EXT), $(filter $(EXT), FRSKY TELEMETREZ))
CPPDEFS += -DFRSKY CPPDEFS += -DFRSKY
ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO TARANIS)) ifeq ($(PCB), $(filter $(PCB), TARANIS))
CPPSRC += telemetry/frsky.cpp telemetry/frsky_sport.cpp telemetry/frsky_d.cpp CPPSRC += telemetry/frsky.cpp telemetry/frsky_sport.cpp telemetry/frsky_d.cpp
CPPDEFS += -DFRSKY_SPORT CPPDEFS += -DFRSKY_SPORT
else else

6
radio/src/gui/menu_model.cpp
View file

@ -1038,7 +1038,7 @@ void menuModelSetup(uint8_t event)
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
pxxFlag[INTERNAL_MODULE] = 0; pxxFlag[INTERNAL_MODULE] = 0;
#endif #endif
#if defined(CPUARM) #if defined(CPUARM) && defined(PXX)
pxxFlag[EXTERNAL_MODULE] = 0; pxxFlag[EXTERNAL_MODULE] = 0;
#endif #endif
return; return;
@ -1519,6 +1519,7 @@ void menuModelSetup(uint8_t event)
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, l_posHorz==1 ? attr : 0); lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, l_posHorz==1 ? attr : 0);
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, l_posHorz==2 ? attr : 0); lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, l_posHorz==2 ? attr : 0);
if (IS_MODULE_XJT(moduleIdx)) { if (IS_MODULE_XJT(moduleIdx)) {
#if defined(PXX)
uint8_t newFlag = 0; uint8_t newFlag = 0;
if (attr && l_posHorz>0 && s_editMode>0) { if (attr && l_posHorz>0 && s_editMode>0) {
if (l_posHorz == 1) if (l_posHorz == 1)
@ -1528,6 +1529,7 @@ void menuModelSetup(uint8_t event)
} }
} }
pxxFlag[moduleIdx] = newFlag; pxxFlag[moduleIdx] = newFlag;
#endif
} }
#if defined(DSM2) #if defined(DSM2)
else { else {
@ -1712,7 +1714,7 @@ void menuModelSetup(uint8_t event)
} }
} }
#if defined(CPUARM) && defined(FRSKY) #if defined(CPUARM) && defined(PXX)
if (IS_PXX_RANGE_CHECK_ENABLE()) { if (IS_PXX_RANGE_CHECK_ENABLE()) {
displayPopup("RSSI: "); displayPopup("RSSI: ");
lcd_outdezAtt(16+4*FW, 5*FH, frskyData.rssi[0].value, BOLD); lcd_outdezAtt(16+4*FW, 5*FH, frskyData.rssi[0].value, BOLD);

2
radio/src/opentx.cpp
View file

@ -397,7 +397,7 @@ void applyDefaultTemplate()
} }
#endif #endif
#if defined(PXX) && defined(CPUARM) #if defined(CPUARM)
void checkModelIdUnique(uint8_t id) void checkModelIdUnique(uint8_t id)
{ {
for (uint8_t i=0; i<MAX_MODELS; i++) { for (uint8_t i=0; i<MAX_MODELS; i++) {

2
radio/src/opentx.h
View file

@ -987,7 +987,7 @@ void saveTimers();
void generalDefault(); void generalDefault();
void modelDefault(uint8_t id); void modelDefault(uint8_t id);
#if defined(PXX) && defined(CPUARM) #if defined(CPUARM)
void checkModelIdUnique(uint8_t id); void checkModelIdUnique(uint8_t id);
#endif #endif

2
radio/src/telemetry/frsky.cpp
View file

@ -241,10 +241,12 @@ NOINLINE void processSerialData(uint8_t data)
#endif #endif
} // switch } // switch
#if defined(FRSKY_SPORT)
if (IS_FRSKY_SPORT_PROTOCOL() && frskyRxBufferCount >= FRSKY_SPORT_PACKET_SIZE) { if (IS_FRSKY_SPORT_PROTOCOL() && frskyRxBufferCount >= FRSKY_SPORT_PACKET_SIZE) {
frskySportProcessPacket(frskyRxBuffer); frskySportProcessPacket(frskyRxBuffer);
dataState = STATE_DATA_IDLE; dataState = STATE_DATA_IDLE;
} }
#endif
} }
void telemetryWakeup() void telemetryWakeup()

4
radio/src/translations.cpp
View file

@ -106,7 +106,7 @@ const pm_char STR_OPEN9X[] PROGMEM =
ISTR(VUNITSSYSTEM) ISTR(VUNITSSYSTEM)
ISTR(VBEEPCOUNTDOWN) ISTR(VBEEPCOUNTDOWN)
#endif #endif
#if defined(PXX) #if defined(PXX) || defined(CPUARM)
ISTR(COUNTRYCODES) ISTR(COUNTRYCODES)
ISTR(VFAILSAFE) ISTR(VFAILSAFE)
#endif #endif
@ -329,7 +329,7 @@ const pm_char STR_MENUGLOBALVARS[] PROGMEM = TR_MENUGLOBALVARS;
const pm_char STR_RXNUM[] PROGMEM = TR_RXNUM; const pm_char STR_RXNUM[] PROGMEM = TR_RXNUM;
#endif #endif
#if defined(PXX) #if defined(PXX) || defined(CPUARM)
const pm_char STR_SYNCMENU[] PROGMEM = TR_SYNCMENU; const pm_char STR_SYNCMENU[] PROGMEM = TR_SYNCMENU;
const pm_char STR_INTERNALRF[] PROGMEM = TR_INTERNALRF; const pm_char STR_INTERNALRF[] PROGMEM = TR_INTERNALRF;
const pm_char STR_EXTERNALRF[] PROGMEM = TR_EXTERNALRF; const pm_char STR_EXTERNALRF[] PROGMEM = TR_EXTERNALRF;

11
radio/src/translations.h
View file

@ -167,14 +167,11 @@ extern const pm_char STR_OPEN9X[];
#else #else
#define OFS_COUNTRYCODES (OFS_VLCD) #define OFS_COUNTRYCODES (OFS_VLCD)
#endif #endif
#if defined(PXX) #if defined(PXX) || defined(CPUARM)
#define OFS_VFAILSAFE (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES)) #define OFS_VFAILSAFE (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
#else
#define OFS_VFAILSAFE (OFS_COUNTRYCODES)
#endif
#if defined(PXX)
#define OFS_VTRAINERMODES (OFS_VFAILSAFE + sizeof(TR_VFAILSAFE)) #define OFS_VTRAINERMODES (OFS_VFAILSAFE + sizeof(TR_VFAILSAFE))
#else #else
#define OFS_VFAILSAFE (OFS_COUNTRYCODES)
#define OFS_VTRAINERMODES (OFS_VFAILSAFE) #define OFS_VTRAINERMODES (OFS_VFAILSAFE)
#endif #endif
#if defined(CPUARM) #if defined(CPUARM)
@ -269,7 +266,7 @@ extern const pm_char STR_OPEN9X[];
#define STR_VBEEPCOUNTDOWN (STR_OPEN9X + OFS_VBEEPCOUNTDOWN) #define STR_VBEEPCOUNTDOWN (STR_OPEN9X + OFS_VBEEPCOUNTDOWN)
#endif #endif
#if defined(PXX) #if defined(PXX) || defined(CPUARM)
#define STR_COUNTRYCODES (STR_OPEN9X + OFS_COUNTRYCODES) #define STR_COUNTRYCODES (STR_OPEN9X + OFS_COUNTRYCODES)
#define STR_VFAILSAFE (STR_OPEN9X + OFS_VFAILSAFE) #define STR_VFAILSAFE (STR_OPEN9X + OFS_VFAILSAFE)
#endif #endif
@ -476,7 +473,7 @@ extern const pm_char STR_FAS_OFFSET[];
extern const pm_char STR_RXNUM[]; extern const pm_char STR_RXNUM[];
#endif #endif
#if defined(PXX) #if defined(PXX) || defined(CPUARM)
extern const pm_char STR_SYNCMENU[]; extern const pm_char STR_SYNCMENU[];
extern const pm_char STR_INTERNALRF[]; extern const pm_char STR_INTERNALRF[];
extern const pm_char STR_EXTERNALRF[]; extern const pm_char STR_EXTERNALRF[];