From c278598f09fecd4dd4aa3a8c803ac9643c61ab84 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 21 Mar 2019 21:51:10 +0100 Subject: [PATCH] Macros simplification --- radio/src/gui/128x64/gui.h | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index beecabb63..8c32bb172 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -218,32 +218,21 @@ int8_t editSwitch(coord_t x, coord_t y, int8_t value, LcdFlags attr, event_t eve #define ON_OFF_MENU_ITEM(value, x, y, label, attr, event) value = editCheckBox(value, x, y, label, attr, event) #if defined(GVARS) - #define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, editflags, event) -#else - #define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, event) -#endif - -#if defined(GVARS) +#define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, editflags, event) int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t editflags, event_t event); void drawGVarName(coord_t x, coord_t y, int8_t index, LcdFlags flags=0); void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags=0); void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags); -#elif defined(GVARS) -int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, event_t event); +#define displayGVar(x, y, v, min, max) GVAR_MENU_ITEM(x, y, v, min, max, 0, 0, 0) #else int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, event_t event); +#define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, event) +#define displayGVar(x, y, v, min, max) lcdDraw8bitsNumber(x, y, v) #endif void gvarWeightItem(coord_t x, coord_t y, MixData * md, LcdFlags attr, event_t event); -#if defined(GVARS) -#define displayGVar(x, y, v, min, max) GVAR_MENU_ITEM(x, y, v, min, max, 0, 0, 0) -#else -#define displayGVar(x, y, v, min, max) lcdDraw8bitsNumber(x, y, v) -#endif - void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, uint8_t active, LcdFlags attr=ZCHAR); - void editSingleName(coord_t x, coord_t y, const char * label, char * name, uint8_t size, event_t event, uint8_t active); uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint8_t delay); @@ -343,8 +332,6 @@ void onSourceLongEnterPress(const char *result); uint8_t switchToMix(uint8_t source); -void deleteExpoMix(uint8_t expo, uint8_t idx); - void drawCheckBox(coord_t x, coord_t y, uint8_t value, LcdFlags attr); extern const unsigned char sticks[] ;