piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Mix sources shifted

Browse Source
This commit is contained in:
Bertrand Songis
2019-04-03 10:32:19 +02:00
parent 754572db31
commit 16cd0cffe0
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/lcd.cpp
-5
View File
@@ -723,11 +723,6 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx + 1, att);
}
}
#if defined(GYRO)
else if (idx <= MIXSRC_GYRO2) {
lcdDrawTextAtIndex(x, y, STR_GYROS, idx - MIXSRC_GYRO1, att);
}
#endif
else if (idx >= MIXSRC_FIRST_SWITCH && idx <= MIXSRC_LAST_SWITCH) {
idx = idx-MIXSRC_FIRST_SWITCH;
if (ZEXIST(g_eeGeneral.switchNames[idx])) {
radio/src/translations.cpp
-1
View File
@@ -112,7 +112,6 @@ const char STR_OPEN9X[] =
ISTR(BLUETOOTH_MODES)
#endif
ISTR(VANTENNATYPES)
ISTR(GYROS)
;
// The 0-terminated-strings
radio/src/translations.h
+1 -3
View File
@@ -213,8 +213,7 @@ extern const char STR_OPEN9X[];
#else
#define OFS_VANTENNATYPES (OFS_VCELLINDEX + sizeof(TR_VCELLINDEX))
#endif
#define OFS_GYROS (OFS_VANTENNATYPES + sizeof(TR_VANTENNATYPES))
#define OFS_MAVLINK_BAUDS (OFS_GYROS + sizeof(TR_GYROS))
#define OFS_MAVLINK_BAUDS (OFS_VANTENNATYPES + sizeof(TR_VANTENNATYPES))
#define OFS_SPARE (OFS_MAVLINK_BAUDS)
#define STR_OFFON (STR_OPEN9X + OFS_OFFON)
@@ -314,7 +313,6 @@ extern const char STR_OPEN9X[];
#define STR_VPREC (STR_OPEN9X + OFS_VPREC)
#define STR_VCELLINDEX (STR_OPEN9X + OFS_VCELLINDEX)
#define STR_VANTENNATYPES (STR_OPEN9X + OFS_VANTENNATYPES)
#define STR_GYROS (STR_OPEN9X + OFS_GYROS)
#if defined(BLUETOOTH)
extern const char STR_BLUETOOTH[];
radio/src/translations/en.h.txt
+7 -1
View File
@@ -468,6 +468,12 @@
#define TR_VSWITCHES "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES
#endif
#if defined(GYRO)
#define TR_GYR_VSRCRAW "GyrX""GyrY"
#else
#define TR_GYR_VSRCRAW
#endif
#if defined(HELI)
#define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3"
#else
@@ -477,7 +483,7 @@
#define TR_RESERVE_VSRCRAW "[--]"
#define TR_EXTRA_VSRCRAW "Batt""Time""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3"
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS TR_GYR_VSRCRAW "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ON\0""THs""TH%""THt"