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

Port of the popup addition

Browse Source
This commit is contained in:
Bertrand Songis
2019-02-20 16:20:55 +01:00
parent 64ac59dfce
commit 1cef3ccf90
4 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/popups.cpp
+2 -6
View File
@@ -97,14 +97,10 @@ void runPopupWarning(event_t event)
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT));
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
if(warningType == WARNING_TYPE_INFO) {
warningText = NULL;
warningType = WARNING_TYPE_ASTERISK;
}
// no break
if (warningType == WARNING_TYPE_ASTERISK)
break;
warningResult = true;
if (warningType != WARNING_TYPE_INFO)
warningResult = true;
// no break
case EVT_KEY_BREAK(KEY_EXIT):
warningText = NULL;
radio/src/gui/212x64/popups.cpp
+2 -6
View File
@@ -94,14 +94,10 @@ void runPopupWarning(event_t event)
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT));
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
if(warningType == WARNING_TYPE_INFO) {
warningText = NULL;
warningType = WARNING_TYPE_ASTERISK;
}
// no break
if (warningType == WARNING_TYPE_ASTERISK)
break;
warningResult = true;
if (warningType != WARNING_TYPE_INFO)
warningResult = true;
// no break
case EVT_KEY_BREAK(KEY_EXIT):
radio/src/gui/480x272/popups.cpp
+2 -6
View File
@@ -81,14 +81,10 @@ void runPopupWarning(event_t event)
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
if(warningType == WARNING_TYPE_INFO) {
warningText = NULL;
warningType = WARNING_TYPE_ASTERISK;
}
// no break
if (warningType == WARNING_TYPE_ASTERISK)
break;
warningResult = true;
if (warningType != WARNING_TYPE_INFO)
warningResult = true;
// no break
case EVT_KEY_BREAK(KEY_EXIT):
radio/src/io/frsky_device_firmware_update.cpp
+3
View File
@@ -298,6 +298,9 @@ void DeviceFirmwareUpdate::flashFile(const char * filename)
POPUP_WARNING(STR_FIRMWARE_UPDATE_ERROR);
SET_WARNING_INFO(result, strlen(result), 0);
}
else {
POPUP_INFORMATION(STR_FIRMWARE_UPDATE_SUCCESS);
}
#if defined(PCBTARANIS) || defined(PCBHORUS)
INTERNAL_MODULE_OFF();