Mods taken from X10_new_UI
This commit is contained in:
@@ -1310,7 +1310,7 @@ void menuModelSetup(event_t event)
|
|||||||
else {
|
else {
|
||||||
lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM);
|
lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM);
|
||||||
}
|
}
|
||||||
if (isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx)) {
|
if (isModuleBindRangeAvailable(moduleIdx)) {
|
||||||
if (xOffsetBind)
|
if (xOffsetBind)
|
||||||
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
|
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
|
||||||
if (attr && l_posHorz == 0) {
|
if (attr && l_posHorz == 0) {
|
||||||
|
|||||||
@@ -1038,7 +1038,7 @@ void menuModelSetup(event_t event)
|
|||||||
else {
|
else {
|
||||||
lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM);
|
lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM);
|
||||||
}
|
}
|
||||||
if (isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx)) {
|
if (isModuleBindRangeAvailable(moduleIdx)) {
|
||||||
if (xOffsetBind)
|
if (xOffsetBind)
|
||||||
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
|
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
|
||||||
if (attr && l_posHorz==0) {
|
if (attr && l_posHorz==0) {
|
||||||
|
|||||||
@@ -454,6 +454,11 @@ inline bool isModuleFailsafeAvailable(uint8_t idx)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline bool isModuleBindRangeAvailable(uint8_t moduleIdx)
|
||||||
|
{
|
||||||
|
return isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx);
|
||||||
|
}
|
||||||
|
|
||||||
inline uint8_t getMaxRxNum(uint8_t idx)
|
inline uint8_t getMaxRxNum(uint8_t idx)
|
||||||
{
|
{
|
||||||
if (isModuleDSM2(idx))
|
if (isModuleDSM2(idx))
|
||||||
|
|||||||
@@ -89,12 +89,10 @@ ISTR(VANTENNATYPES);
|
|||||||
ISTR(VBEEPLEN);
|
ISTR(VBEEPLEN);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
|
||||||
ISTR(AUX_SERIAL_MODES);
|
ISTR(AUX_SERIAL_MODES);
|
||||||
ISTR(SWTYPES);
|
ISTR(SWTYPES);
|
||||||
ISTR(POTTYPES);
|
ISTR(POTTYPES);
|
||||||
ISTR(SLIDERTYPES);
|
ISTR(SLIDERTYPES);
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(PCBSKY9X) && defined(REVX)
|
#if defined(PCBSKY9X) && defined(REVX)
|
||||||
ISTR(VOUTPUT_TYPE);
|
ISTR(VOUTPUT_TYPE);
|
||||||
@@ -589,7 +587,7 @@ const char STR_RECEIVER_OPTIONS[] = TR_RECEIVER_OPTIONS;
|
|||||||
const char STR_ASSIGN_SPLASH[] = TR_ASSIGN_SPLASH;
|
const char STR_ASSIGN_SPLASH[] = TR_ASSIGN_SPLASH;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(PCBHORUS)
|
#if !defined(COLORLCD)
|
||||||
const char STR_MENUWHENDONE[] = TR_MENUWHENDONE;
|
const char STR_MENUWHENDONE[] = TR_MENUWHENDONE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -623,7 +621,7 @@ const char STR_GYRO_OFFSET[] = TR_GYRO_OFFSET;
|
|||||||
const char STR_GYRO_MAX[] = TR_GYRO_MAX;
|
const char STR_GYRO_MAX[] = TR_GYRO_MAX;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PWM_BACKLIGHT) || defined(PCBHORUS)
|
#if defined(PWM_BACKLIGHT) || defined(COLORLCD)
|
||||||
const char STR_BLONBRIGHTNESS[] = TR_BLONBRIGHTNESS;
|
const char STR_BLONBRIGHTNESS[] = TR_BLONBRIGHTNESS;
|
||||||
const char STR_BLOFFBRIGHTNESS[] = TR_BLOFFBRIGHTNESS;
|
const char STR_BLOFFBRIGHTNESS[] = TR_BLOFFBRIGHTNESS;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -290,7 +290,7 @@ extern const char STR_PERSISTENT[];
|
|||||||
extern const char STR_BACKLIGHT_LABEL[];
|
extern const char STR_BACKLIGHT_LABEL[];
|
||||||
extern const char STR_BLDELAY[];
|
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_BLONBRIGHTNESS[];
|
||||||
extern const char STR_BLOFFBRIGHTNESS[];
|
extern const char STR_BLOFFBRIGHTNESS[];
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user