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

[all] CS menu corrections- function params renamed

Browse Source
This commit is contained in:
mhotar@gmail.com
2013-01-25 17:58:18 +00:00
parent d859c9acd6
commit 303f79f0bd
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/model_menus.cpp
+14 -14
View File
@@ -2798,25 +2798,25 @@ void menuModelCustomSwitches(uint8_t event)
if (cs->func > 0) {
// CSW func
lcd_putsiAtt(4*FW - 5, y, STR_VCSWFUNC, cs->func, 0);
lcd_putsiAtt(4*FW-3, y, STR_VCSWFUNC, cs->func, 0);
// CSW params
uint8_t cstate = CS_STATE(cs->func);
if (cstate == CS_VBOOL) {
putsSwitches(12*FW-5, y, cs->v1, 0);
putsSwitches(17*FW, y, cs->v2, 0);
putsSwitches(10*FW, y, cs->v1, 0);
putsSwitches(16*FW, y, cs->v2, 0);
}
else if (cstate == CS_VCOMP) {
putsChnRaw(12*FW-5, y, cs->v1, 0);
putsChnRaw(17*FW, y, cs->v2, 0);
putsChnRaw(10*FW, y, cs->v1, 0);
putsChnRaw(16*FW, y, cs->v2, 0);
}
else {
putsChnRaw(12*FW-5, y, cs->v1, 0);
putsChnRaw(10*FW, y, cs->v1, 0);
#if defined(FRSKY)
if (cs->v1 > NUM_XCHNCSW-NUM_TELEMETRY) {
putsTelemetryChannel(19*FW+2, y, cs->v1 - (CSW_CHOUT_BASE+NUM_CHNOUT+1), convertCswTelemValue(cs), 0);
putsTelemetryChannel(18*FW+2, y, cs->v1 - (CSW_CHOUT_BASE+NUM_CHNOUT+1), convertCswTelemValue(cs), 0);
}
else
#endif
@@ -2848,28 +2848,28 @@ void menuModelCustomSwitches(uint8_t event)
putsSwitches(0, y, sw, getSwitch(sw, 0) ? BOLD : 0);
// CSW func
lcd_putsiAtt(4*FW - 5, y, STR_VCSWFUNC, cs->func, m_posHorz==0 ? attr : 0);
lcd_putsiAtt(4*FW-3, y, STR_VCSWFUNC, cs->func, m_posHorz==0 ? attr : 0);
// CSW params
uint8_t cstate = CS_STATE(cs->func);
int8_t v1_min=0, v1_max=NUM_XCHNCSW, v2_min=0, v2_max=NUM_XCHNCSW;
if (cstate == CS_VBOOL) {
putsSwitches(12*FW-5, y, cs->v1, m_posHorz==1 ? attr : 0);
putsSwitches(17*FW, y, cs->v2, m_posHorz==2 ? attr : 0);
putsSwitches(10*FW, y, cs->v1, m_posHorz==1 ? attr : 0);
putsSwitches(16*FW, y, cs->v2, m_posHorz==2 ? attr : 0);
v1_min = SWITCH_OFF; v1_max = SWITCH_ON;
v2_min = SWITCH_OFF; v2_max = SWITCH_ON;
}
else if (cstate == CS_VCOMP) {
putsChnRaw(12*FW-5, y, cs->v1, m_posHorz==1 ? attr : 0);
putsChnRaw(17*FW, y, cs->v2, m_posHorz==2 ? attr : 0);
putsChnRaw(10*FW, y, cs->v1, m_posHorz==1 ? attr : 0);
putsChnRaw(16*FW, y, cs->v2, m_posHorz==2 ? attr : 0);
}
else {
putsChnRaw(12*FW-5, y, cs->v1, (m_posHorz==1 ? attr : 0));
putsChnRaw(10*FW, y, cs->v1, (m_posHorz==1 ? attr : 0));
#if defined(FRSKY)
if (cs->v1 > CSW_CHOUT_BASE+NUM_CHNOUT) {
putsTelemetryChannel(19*FW+2, y, cs->v1 - (CSW_CHOUT_BASE+NUM_CHNOUT+1), convertCswTelemValue(cs), m_posHorz==2 ? attr : 0);
putsTelemetryChannel(18*FW+2, y, cs->v1 - (CSW_CHOUT_BASE+NUM_CHNOUT+1), convertCswTelemValue(cs), m_posHorz==2 ? attr : 0);
v2_max = maxTelemValue(cs->v1 - (CSW_CHOUT_BASE+NUM_CHNOUT));
if (cstate == CS_VOFS) {
v2_min = -128;