Port of the popup addition
This commit is contained in:
@@ -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));
|
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) {
|
switch (event) {
|
||||||
case EVT_KEY_BREAK(KEY_ENTER):
|
case EVT_KEY_BREAK(KEY_ENTER):
|
||||||
if(warningType == WARNING_TYPE_INFO) {
|
|
||||||
warningText = NULL;
|
|
||||||
warningType = WARNING_TYPE_ASTERISK;
|
|
||||||
}
|
|
||||||
// no break
|
|
||||||
if (warningType == WARNING_TYPE_ASTERISK)
|
if (warningType == WARNING_TYPE_ASTERISK)
|
||||||
break;
|
break;
|
||||||
warningResult = true;
|
if (warningType != WARNING_TYPE_INFO)
|
||||||
|
warningResult = true;
|
||||||
// no break
|
// no break
|
||||||
case EVT_KEY_BREAK(KEY_EXIT):
|
case EVT_KEY_BREAK(KEY_EXIT):
|
||||||
warningText = NULL;
|
warningText = NULL;
|
||||||
|
|||||||
@@ -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));
|
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) {
|
switch (event) {
|
||||||
case EVT_KEY_BREAK(KEY_ENTER):
|
case EVT_KEY_BREAK(KEY_ENTER):
|
||||||
if(warningType == WARNING_TYPE_INFO) {
|
|
||||||
warningText = NULL;
|
|
||||||
warningType = WARNING_TYPE_ASTERISK;
|
|
||||||
}
|
|
||||||
// no break
|
|
||||||
if (warningType == WARNING_TYPE_ASTERISK)
|
if (warningType == WARNING_TYPE_ASTERISK)
|
||||||
break;
|
break;
|
||||||
warningResult = true;
|
if (warningType != WARNING_TYPE_INFO)
|
||||||
|
warningResult = true;
|
||||||
// no break
|
// no break
|
||||||
|
|
||||||
case EVT_KEY_BREAK(KEY_EXIT):
|
case EVT_KEY_BREAK(KEY_EXIT):
|
||||||
|
|||||||
@@ -81,14 +81,10 @@ void runPopupWarning(event_t event)
|
|||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
case EVT_KEY_BREAK(KEY_ENTER):
|
case EVT_KEY_BREAK(KEY_ENTER):
|
||||||
if(warningType == WARNING_TYPE_INFO) {
|
|
||||||
warningText = NULL;
|
|
||||||
warningType = WARNING_TYPE_ASTERISK;
|
|
||||||
}
|
|
||||||
// no break
|
|
||||||
if (warningType == WARNING_TYPE_ASTERISK)
|
if (warningType == WARNING_TYPE_ASTERISK)
|
||||||
break;
|
break;
|
||||||
warningResult = true;
|
if (warningType != WARNING_TYPE_INFO)
|
||||||
|
warningResult = true;
|
||||||
// no break
|
// no break
|
||||||
|
|
||||||
case EVT_KEY_BREAK(KEY_EXIT):
|
case EVT_KEY_BREAK(KEY_EXIT):
|
||||||
|
|||||||
@@ -298,6 +298,9 @@ void DeviceFirmwareUpdate::flashFile(const char * filename)
|
|||||||
POPUP_WARNING(STR_FIRMWARE_UPDATE_ERROR);
|
POPUP_WARNING(STR_FIRMWARE_UPDATE_ERROR);
|
||||||
SET_WARNING_INFO(result, strlen(result), 0);
|
SET_WARNING_INFO(result, strlen(result), 0);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
POPUP_INFORMATION(STR_FIRMWARE_UPDATE_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||||
INTERNAL_MODULE_OFF();
|
INTERNAL_MODULE_OFF();
|
||||||
|
|||||||
Reference in New Issue
Block a user