From 3c39893bca4e9352d1a89d43b5e20eada6c19a9a Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Fri, 1 Apr 2016 18:22:32 +0400 Subject: [PATCH] [Horus] 8-bit source index, really? (#3393) --- radio/src/gui/horus/lcd.cpp | 2 +- radio/src/gui/horus/lcd.h | 2 +- radio/src/gui/horus/menu_model_logical_switches.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/horus/lcd.cpp b/radio/src/gui/horus/lcd.cpp index c84670cce..e28c5ea79 100644 --- a/radio/src/gui/horus/lcd.cpp +++ b/radio/src/gui/horus/lcd.cpp @@ -427,7 +427,7 @@ char * getSourceString(char * dest, mixsrc_t idx) return dest; } -void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags flags) +void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags flags) { char s[16]; getSourceString(s, idx); diff --git a/radio/src/gui/horus/lcd.h b/radio/src/gui/horus/lcd.h index dac3167fb..d90382835 100644 --- a/radio/src/gui/horus/lcd.h +++ b/radio/src/gui/horus/lcd.h @@ -118,7 +118,7 @@ void drawStringWithIndex(coord_t x, coord_t y, const pm_char *str, int idx, LcdF void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att); void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0); void putsSwitches(coord_t x, coord_t y, swsrc_t swtch, LcdFlags flags=0); -void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0); +void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att=0); void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); void putsCurveRef(coord_t x, coord_t y, CurveRef &curve, LcdFlags att=0); void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); diff --git a/radio/src/gui/horus/menu_model_logical_switches.cpp b/radio/src/gui/horus/menu_model_logical_switches.cpp index 9b3f8e2b5..ddd59acd4 100644 --- a/radio/src/gui/horus/menu_model_logical_switches.cpp +++ b/radio/src/gui/horus/menu_model_logical_switches.cpp @@ -144,7 +144,7 @@ bool menuModelLogicalSwitches(evt_t event) } } else if (cstate == LS_FAMILY_COMP) { - v1_val = (uint8_t)cs->v1; + v1_val = cs->v1; putsMixerSource(CSW_2ND_COLUMN, y, v1_val, attr1); putsMixerSource(CSW_3RD_COLUMN, y, cs->v2, attr2); INCDEC_SET_FLAG(EE_MODEL | INCDEC_SOURCE); @@ -159,7 +159,7 @@ bool menuModelLogicalSwitches(evt_t event) INCDEC_ENABLE_CHECK(NULL); } else { - v1_val = (uint8_t)cs->v1; + v1_val = cs->v1; putsMixerSource(CSW_2ND_COLUMN, y, v1_val, attr1); if (horz == 1) { INCDEC_SET_FLAG(EE_MODEL | INCDEC_SOURCE);