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

[Horus] 8-bit source index, really? (#3393)

Browse Source
This commit is contained in:
Andre Bernet
2016-04-01 18:22:32 +04:00
parent 5f86e87ae2
commit 3c39893bca
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/horus/lcd.cpp
+1 -1
View File
@@ -427,7 +427,7 @@ char * getSourceString(char * dest, mixsrc_t idx)
return dest; 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]; char s[16];
getSourceString(s, idx); getSourceString(s, idx);
radio/src/gui/horus/lcd.h
+1 -1
View File
@@ -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 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 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 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 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 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); void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
radio/src/gui/horus/menu_model_logical_switches.cpp
+2 -2
View File
@@ -144,7 +144,7 @@ bool menuModelLogicalSwitches(evt_t event)
} }
} }
else if (cstate == LS_FAMILY_COMP) { 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_2ND_COLUMN, y, v1_val, attr1);
putsMixerSource(CSW_3RD_COLUMN, y, cs->v2, attr2); putsMixerSource(CSW_3RD_COLUMN, y, cs->v2, attr2);
INCDEC_SET_FLAG(EE_MODEL | INCDEC_SOURCE); INCDEC_SET_FLAG(EE_MODEL | INCDEC_SOURCE);
@@ -159,7 +159,7 @@ bool menuModelLogicalSwitches(evt_t event)
INCDEC_ENABLE_CHECK(NULL); INCDEC_ENABLE_CHECK(NULL);
} }
else { else {
v1_val = (uint8_t)cs->v1; v1_val = cs->v1;
putsMixerSource(CSW_2ND_COLUMN, y, v1_val, attr1); putsMixerSource(CSW_2ND_COLUMN, y, v1_val, attr1);
if (horz == 1) { if (horz == 1) {
INCDEC_SET_FLAG(EE_MODEL | INCDEC_SOURCE); INCDEC_SET_FLAG(EE_MODEL | INCDEC_SOURCE);