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

Mods taken from X10_new_UI

Browse Source
This commit is contained in:
Bertrand Songis
2019-07-16 14:29:32 +02:00
parent 03b8af0b34
commit be850371bb
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+1 -1
View File
@@ -1310,7 +1310,7 @@ void menuModelSetup(event_t event)
else {
lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM);
}
if (isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx)) {
if (isModuleBindRangeAvailable(moduleIdx)) {
if (xOffsetBind)
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
if (attr && l_posHorz == 0) {
radio/src/gui/212x64/model_setup.cpp
+1 -1
View File
@@ -1038,7 +1038,7 @@ void menuModelSetup(event_t event)
else {
lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM);
}
if (isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx)) {
if (isModuleBindRangeAvailable(moduleIdx)) {
if (xOffsetBind)
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
if (attr && l_posHorz==0) {
radio/src/pulses/modules_helpers.h
+5
View File
@@ -454,6 +454,11 @@ inline bool isModuleFailsafeAvailable(uint8_t idx)
return false;
}
inline bool isModuleBindRangeAvailable(uint8_t moduleIdx)
{
return isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx);
}
inline uint8_t getMaxRxNum(uint8_t idx)
{
if (isModuleDSM2(idx))
radio/src/translations.cpp
+2 -4
View File
@@ -89,12 +89,10 @@ ISTR(VANTENNATYPES);
ISTR(VBEEPLEN);
#endif
#if defined(PCBTARANIS) || defined(PCBHORUS)
ISTR(AUX_SERIAL_MODES);
ISTR(SWTYPES);
ISTR(POTTYPES);
ISTR(SLIDERTYPES);
#endif
#if defined(PCBSKY9X) && defined(REVX)
ISTR(VOUTPUT_TYPE);
@@ -589,7 +587,7 @@ const char STR_RECEIVER_OPTIONS[] = TR_RECEIVER_OPTIONS;
const char STR_ASSIGN_SPLASH[] = TR_ASSIGN_SPLASH;
#endif
#if !defined(PCBHORUS)
#if !defined(COLORLCD)
const char STR_MENUWHENDONE[] = TR_MENUWHENDONE;
#endif
@@ -623,7 +621,7 @@ const char STR_GYRO_OFFSET[] = TR_GYRO_OFFSET;
const char STR_GYRO_MAX[] = TR_GYRO_MAX;
#endif
#if defined(PWM_BACKLIGHT) || defined(PCBHORUS)
#if defined(PWM_BACKLIGHT) || defined(COLORLCD)
const char STR_BLONBRIGHTNESS[] = TR_BLONBRIGHTNESS;
const char STR_BLOFFBRIGHTNESS[] = TR_BLOFFBRIGHTNESS;
#endif
radio/src/translations.h
+1 -1
View File
@@ -290,7 +290,7 @@ extern const char STR_PERSISTENT[];
extern const char STR_BACKLIGHT_LABEL[];
extern const char STR_BLDELAY[];
#if defined(PWM_BACKLIGHT) || defined(PCBHORUS)
#if defined(PWM_BACKLIGHT) || defined(COLORLCD)
extern const char STR_BLONBRIGHTNESS[];
extern const char STR_BLOFFBRIGHTNESS[];
#endif