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

Introduce POPUP_INFORMATION window

Browse Source
This commit is contained in:
3djc
2019-02-07 10:17:19 +01:00
parent c5e8f18611
commit d01f1e8b3e
17 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/gui.h
+1
View File
@@ -266,6 +266,7 @@ uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint
#define WARNING_TYPE_ASTERISK 0
#define WARNING_TYPE_CONFIRM 1
#define WARNING_TYPE_INPUT 2
#define WARNING_TYPE_INFO 4
extern const char * warningText;
extern const char * warningInfoText;
radio/src/gui/128x64/popups.cpp
+6 -6
View File
@@ -2,7 +2,7 @@
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
@@ -65,7 +65,7 @@ void drawAlertBox(const char * title, const char * text, const char * action)
lcdDrawText(MESSAGE_LCD_OFFSET, 0, title, DBLSIZE);
lcdDrawText(MESSAGE_LCD_OFFSET, 2*FH, STR_WARNING, DBLSIZE);
#endif
lcdDrawSolidFilledRect(0, 0, LCD_W, 32);
if (text) {
lcdDrawTextAlignedLeft(5*FH, text);
@@ -73,16 +73,16 @@ void drawAlertBox(const char * title, const char * text, const char * action)
if (action) {
lcdDrawTextAlignedLeft(7*FH, action);
}
#undef MESSAGE_LCD_OFFSET
}
void showAlertBox(const char * title, const char * text, const char * action , uint8_t sound)
{
drawAlertBox(title, text, action);
AUDIO_ERROR_MESSAGE(sound);
lcdRefresh();
lcdSetContrast();
clearKeyEvents();
@@ -97,7 +97,7 @@ void runPopupWarning(event_t event)
if (warningInfoText) {
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS);
}
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS);
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS));
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
if (warningType == WARNING_TYPE_ASTERISK)
radio/src/gui/128x64/popups.h
+1
View File
@@ -51,6 +51,7 @@ extern uint8_t warningInfoFlags;
#define SET_WARNING_INFO(...)
#else
#define DISPLAY_WARNING (*popupFunc)
#define POPUP_INFORMATION(s) (warningText = s, warningType = WARNING_TYPE_INFO, warningInfoText = 0, popupFunc = runPopupWarning)
#define POPUP_WARNING(s) (warningText = s, warningInfoText = 0, popupFunc = runPopupWarning)
#define POPUP_CONFIRMATION(s) (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning)
#define POPUP_INPUT(s, func, start, min, max) (warningText = s, warningType = WARNING_TYPE_INPUT, popupFunc = func, warningInputValue = start, warningInputValueMin = min, warningInputValueMax = max)
radio/src/telemetry/telemetry.cpp
+2 -2
View File
@@ -86,7 +86,7 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
if (memcmp(&frame[4], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) {
reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_OK;
moduleSettings[module].mode = MODULE_MODE_NORMAL;
POPUP_WARNING(STR_REG_OK);
POPUP_INFORMATION(STR_REG_OK);
}
}
}
@@ -125,7 +125,7 @@ void processBindFrame(uint8_t module, uint8_t * frame)
if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], &frame[4], PXX2_LEN_RX_ID) == 0) {
reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_OK;
moduleSettings[module].mode = MODULE_MODE_NORMAL;
POPUP_WARNING(STR_BIND_OK);
POPUP_INFORMATION(STR_BIND_OK);
}
}
}
radio/src/translations.cpp
+1
View File
@@ -116,6 +116,7 @@ const char STR_OPEN9X[] =
// The 0-terminated-strings
const char STR_POPUPS[] = TR_POPUPS;
const char STR_OK[] = TR_OK;
#if !defined(OFS_EXIT)
const char STR_EXIT[] = TR_EXIT;
#endif
radio/src/translations.h
+1
View File
@@ -329,6 +329,7 @@ extern const char STR_BLUETOOTH_LOCAL_ADDR[];
#define NO_INDENT(x) (x)+LEN_INDENT
extern const char STR_POPUPS[];
extern const char STR_OK[];
#if defined(OFS_EXIT)
#define STR_EXIT (STR_POPUPS + OFS_EXIT)
radio/src/translations/cz.h.txt
+1
View File
@@ -534,6 +534,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/de.h.txt
+1
View File
@@ -540,6 +540,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/en.h.txt
+1
View File
@@ -538,6 +538,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
#define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/es.h.txt
+1
View File
@@ -538,6 +538,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/fi.h.txt
+1
View File
@@ -530,6 +530,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/fr.h.txt
+1
View File
@@ -551,6 +551,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/it.h.txt
+1
View File
@@ -540,6 +540,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/nl.h.txt
+1
View File
@@ -535,6 +535,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/pl.h.txt
+1
View File
@@ -541,6 +541,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/pt.h.txt
+1
View File
@@ -537,6 +537,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
radio/src/translations/se.h.txt
+1
View File
@@ -549,6 +549,7 @@
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
define TR_OK TR("\010" "\010" "\010" "[OK]", "\010" "\010" "\010" "\010" "\010" "[OK]")
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)