Problem in Failsafe HOLD / NONE strings
This commit is contained in:
@@ -64,7 +64,7 @@ void menuModelFailsafe(event_t event)
|
||||
wbar -= 6;
|
||||
#endif
|
||||
|
||||
if (sub==k && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
|
||||
if (sub == k && !READ_ONLY() && event == EVT_KEY_LONG(KEY_ENTER)) {
|
||||
killEvents(event);
|
||||
POPUP_MENU_ADD_ITEM(STR_NONE);
|
||||
POPUP_MENU_ADD_ITEM(STR_HOLD);
|
||||
@@ -73,9 +73,6 @@ void menuModelFailsafe(event_t event)
|
||||
POPUP_MENU_START(onFailsafeMenu);
|
||||
}
|
||||
|
||||
const int32_t channelValue = channelOutputs[k];
|
||||
int32_t failsafeValue = g_model.failsafeChannels[k];
|
||||
|
||||
// Channel
|
||||
putsChn(0, y, k + 1, SMLSIZE);
|
||||
|
||||
@@ -85,20 +82,22 @@ void menuModelFailsafe(event_t event)
|
||||
flags |= INVERS;
|
||||
if (s_editMode > 0) {
|
||||
flags |= BLINK;
|
||||
CHECK_INCDEC_MODELVAR(event, g_model.failsafeChannels[k], -lim, +lim);
|
||||
if (g_model.failsafeChannels[k] > +lim && g_model.failsafeChannels[k] < FAILSAFE_CHANNEL_HOLD) {
|
||||
g_model.failsafeChannels[k] = 0; // switching from HOLD/NOPULSE to value edit
|
||||
}
|
||||
CHECK_INCDEC_MODELVAR(event, g_model.failsafeChannels[k], -lim, +lim);
|
||||
}
|
||||
}
|
||||
|
||||
const int32_t channelValue = channelOutputs[k];
|
||||
int32_t failsafeValue = g_model.failsafeChannels[k];
|
||||
const coord_t xValue = x+LCD_W-4-wbar;
|
||||
if (failsafeValue == FAILSAFE_CHANNEL_HOLD) {
|
||||
lcdDrawText(xValue, y, STR_HOLD, RIGHT|flags);
|
||||
lcdDrawText(xValue, y, STR_HOLD_UPPERCASE, RIGHT|flags);
|
||||
failsafeValue = 0;
|
||||
}
|
||||
else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) {
|
||||
lcdDrawText(xValue, y, STR_NONE, RIGHT|flags);
|
||||
lcdDrawText(xValue, y, STR_NONE_UPPERCASE, RIGHT|flags);
|
||||
failsafeValue = 0;
|
||||
}
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user