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

Register fix

Browse Source
This commit is contained in:
Bertrand Songis
2019-05-06 10:30:51 +02:00
parent a27c33ae0d
commit a3fe388399
13 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+1
View File
@@ -501,6 +501,7 @@ void startRegisterDialog(uint8_t module)
reusableBuffer.moduleSetup.pxx2.registerPopupVerticalPosition = ITEM_REGISTER_BUTTONS;
moduleState[module].mode = MODULE_MODE_REGISTER;
s_editMode = 0;
killAllEvents();
POPUP_INPUT("", runPopupRegister);
}
radio/src/gui/480x272/model_failsafe.cpp
+2 -2
View File
@@ -96,11 +96,11 @@ bool menuModelFailsafe(event_t event)
x += (LCD_W/2)-4-MENUS_MARGIN_LEFT-SLIDER_W;
if (failsafeValue == FAILSAFE_CHANNEL_HOLD) {
lcdDrawText(x, y+2, "HOLD", flags|SMLSIZE);
lcdDrawText(x, y+2, STR_HOLD, flags|SMLSIZE);
failsafeValue = 0;
}
else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) {
lcdDrawText(x, y+2, "NONE", flags|SMLSIZE);
lcdDrawText(x, y+2, STR_NONE, flags|SMLSIZE);
failsafeValue = 0;
}
else {
radio/src/gui/common/stdlcd/popups.h
-4
View File
@@ -91,7 +91,6 @@ enum
inline void POPUP_INFORMATION(const char * s)
{
killAllEvents();
warningText = s;
warningInfoText = nullptr;
warningType = WARNING_TYPE_INFO;
@@ -100,7 +99,6 @@ enum
inline void POPUP_WARNING(const char * s)
{
killAllEvents();
warningText = s;
warningInfoText = nullptr;
warningType = WARNING_TYPE_ASTERISK;
@@ -109,7 +107,6 @@ enum
inline void POPUP_CONFIRMATION(const char * s, PopupMenuHandler handler)
{
killAllEvents();
warningText = s;
warningInfoText = nullptr;
warningType = WARNING_TYPE_CONFIRM;
@@ -119,7 +116,6 @@ enum
inline void POPUP_INPUT(const char * s, PopupFunc func)
{
killAllEvents();
warningText = s;
warningInfoText = nullptr;
warningType = WARNING_TYPE_INPUT;
radio/src/translations/de.h.txt
+2 -2
View File
@@ -954,8 +954,8 @@
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "SENSOR"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"
radio/src/translations/en.h.txt
+2 -2
View File
@@ -944,8 +944,8 @@
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "SENSOR"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"
radio/src/translations/es.h.txt
+2 -2
View File
@@ -956,8 +956,8 @@
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "SENSOR"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"
radio/src/translations/fi.h.txt
+2 -2
View File
@@ -944,8 +944,8 @@
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "SENSOR"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"
radio/src/translations/fr.h.txt
+2 -2
View File
@@ -956,8 +956,8 @@
#define TR_REG_ID TR("ID Enr.", "ID Enregisrement")
#define TR_OWNER_ID "ID Radio"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "CAPTEUR"
#define TR_POWERMETER_PEAK "Pic"
#define TR_POWERMETER_POWER "Puiss"
radio/src/translations/it.h.txt
+2 -2
View File
@@ -950,8 +950,8 @@
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "SENSOR"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"
radio/src/translations/nl.h.txt
+2 -2
View File
@@ -951,8 +951,8 @@ TR_GYR_VSRCRAW
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "SENSOR"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"
radio/src/translations/pl.h.txt
+2 -2
View File
@@ -951,8 +951,8 @@
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "CZUJNIK"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"
radio/src/translations/pt.h.txt
+2 -2
View File
@@ -955,8 +955,8 @@
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "SENSOR"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"
radio/src/translations/se.h.txt
+2 -2
View File
@@ -964,8 +964,8 @@
#define TR_REG_ID TR("Reg. ID", "Registration ID")
#define TR_OWNER_ID "Owner ID"
#define TR_PINMAPSET "PINMAP"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_HOLD "Hold"
#define TR_NONE "None"
#define TR_MENUSENSOR "SENSOR"
#define TR_POWERMETER_PEAK "Peak"
#define TR_POWERMETER_POWER "Power"