Compilation fix
This commit is contained in:
@@ -483,7 +483,6 @@ extern uint8_t warningInfoFlags;
|
|||||||
|
|
||||||
#define POPUP_INFORMATION(s) (warningText = s, warningType = WARNING_TYPE_INFO, warningInfoText = 0, popupFunc = runPopupWarning)
|
#define POPUP_INFORMATION(s) (warningText = s, warningType = WARNING_TYPE_INFO, warningInfoText = 0, popupFunc = runPopupWarning)
|
||||||
#define POPUP_WARNING(s) (warningType = WARNING_TYPE_ASTERISK, warningText = s, warningInfoText = 0, popupFunc = runPopupWarning)
|
#define POPUP_WARNING(s) (warningType = WARNING_TYPE_ASTERISK, warningText = s, warningInfoText = 0, popupFunc = runPopupWarning)
|
||||||
#define POPUP_CONFIRMATION(s, func) (warningText = s, warningType = WARNING_TYPE_CONFIRM, warningInfoText = 0, popupFunc = runPopupWarning)
|
|
||||||
#define POPUP_INPUT(s, func) (warningText = s, popupFunc = func)
|
#define POPUP_INPUT(s, func) (warningText = s, popupFunc = func)
|
||||||
#define WARNING_INFO_FLAGS warningInfoFlags
|
#define WARNING_INFO_FLAGS warningInfoFlags
|
||||||
#define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
|
#define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
|
||||||
@@ -507,6 +506,15 @@ extern uint8_t s_menu_item;
|
|||||||
const char * runPopupMenu(event_t event);
|
const char * runPopupMenu(event_t event);
|
||||||
extern void (*popupMenuHandler)(const char * result);
|
extern void (*popupMenuHandler)(const char * result);
|
||||||
|
|
||||||
|
inline void POPUP_CONFIRMATION(const char *s, void (* confirmHandler)(const char *) = nullptr)
|
||||||
|
{
|
||||||
|
warningText = s;
|
||||||
|
warningType = WARNING_TYPE_CONFIRM;
|
||||||
|
warningInfoText = nullptr;
|
||||||
|
popupFunc = runPopupWarning;
|
||||||
|
popupMenuHandler = confirmHandler;
|
||||||
|
}
|
||||||
|
|
||||||
#define TEXT_FILENAME_MAXLEN 40
|
#define TEXT_FILENAME_MAXLEN 40
|
||||||
extern char s_text_file[TEXT_FILENAME_MAXLEN];
|
extern char s_text_file[TEXT_FILENAME_MAXLEN];
|
||||||
void pushMenuTextView(const char * filename);
|
void pushMenuTextView(const char * filename);
|
||||||
|
|||||||
Reference in New Issue
Block a user