From 296d207cfa11f0242cf3b559e63f89ae55fa5d99 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 16 Apr 2016 16:40:05 +0400 Subject: [PATCH] [Horus] Switch selection fixes --- radio/src/gui/horus/lcd.cpp | 2 +- radio/src/gui/horus/menus.h | 1 - radio/src/gui/horus/widgets.cpp | 2 +- radio/src/gui/horus/widgets.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/horus/lcd.cpp b/radio/src/gui/horus/lcd.cpp index e28c5ea79..851e0c5f9 100644 --- a/radio/src/gui/horus/lcd.cpp +++ b/radio/src/gui/horus/lcd.cpp @@ -335,7 +335,7 @@ char * getSwitchString(char * dest, swsrc_t idx) getStringWithIndex(s, "L", idx-SWSRC_FIRST_LOGICAL_SWITCH+1); } else if (idx <= SWSRC_ONE) { - getStringAtIndex(s, STR_VSWITCHES, idx-SWSRC_ON+1+(2*NUM_STICKS)); + getStringAtIndex(s, STR_VSWITCHES, idx-SWSRC_ON+2+(SWSRC_LAST_TRIM-SWSRC_FIRST_TRIM)); } else if (idx <= SWSRC_LAST_FLIGHT_MODE) { getStringWithIndex(s, STR_FP, idx-SWSRC_FIRST_FLIGHT_MODE); diff --git a/radio/src/gui/horus/menus.h b/radio/src/gui/horus/menus.h index cad46982d..2fd037d4e 100644 --- a/radio/src/gui/horus/menus.h +++ b/radio/src/gui/horus/menus.h @@ -408,7 +408,6 @@ typedef int select_menu_value_t; select_menu_value_t selectMenuItem(coord_t x, coord_t y, const pm_char * values, select_menu_value_t value, select_menu_value_t min, select_menu_value_t max, LcdFlags attr, evt_t event); uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, LcdFlags attr, evt_t event); -int8_t switchMenuItem(coord_t x, coord_t y, int8_t value, LcdFlags attr, evt_t event); #if defined(GVARS) #define GVAR_MENU_ITEM(x, y, v, min, max, lcdattr, editflags, event) editGVarFieldValue(x, y, v, min, max, lcdattr, editflags, event) diff --git a/radio/src/gui/horus/widgets.cpp b/radio/src/gui/horus/widgets.cpp index 79debce31..8a3f85da0 100644 --- a/radio/src/gui/horus/widgets.cpp +++ b/radio/src/gui/horus/widgets.cpp @@ -192,7 +192,7 @@ uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, LcdFlags attr, evt_t e return selectMenuItem(x, y, NULL, value, 0, 1, attr, event); } -int8_t switchMenuItem(coord_t x, coord_t y, int8_t value, LcdFlags attr, evt_t event) +swsrc_t switchMenuItem(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, evt_t event) { if (attr) CHECK_INCDEC_MODELSWITCH(event, value, SWSRC_FIRST_IN_MIXES, SWSRC_LAST_IN_MIXES, isSwitchAvailableInMixes); putsSwitches(x, y, value, attr); diff --git a/radio/src/gui/horus/widgets.h b/radio/src/gui/horus/widgets.h index 1c49e533b..c1d1c6273 100644 --- a/radio/src/gui/horus/widgets.h +++ b/radio/src/gui/horus/widgets.h @@ -63,7 +63,7 @@ void drawSlider(coord_t x, coord_t y, int len, int val, int min, int max, uint8_ select_menu_value_t selectMenuItem(coord_t x, coord_t y, const pm_char * values, select_menu_value_t value, select_menu_value_t min, select_menu_value_t max, LcdFlags attr, evt_t event); uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, LcdFlags attr, evt_t event); -int8_t switchMenuItem(coord_t x, coord_t y, int8_t value, LcdFlags attr, evt_t event); +swsrc_t switchMenuItem(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, evt_t event); #if defined(GVARS) int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t editflags, evt_t event); #else