From 303f79f0bd639b8ca2c1a9d0986c509f51c7bd12 Mon Sep 17 00:00:00 2001 From: "mhotar@gmail.com" Date: Fri, 25 Jan 2013 17:58:18 +0000 Subject: [PATCH] [all] CS menu corrections- function params renamed --- src/model_menus.cpp | 28 ++++++++++++++-------------- src/translations/cz.h | 4 ++-- src/translations/de.h | 4 ++-- src/translations/en.h | 4 ++-- src/translations/es.h | 4 ++-- src/translations/fr.h | 4 ++-- src/translations/it.h | 4 ++-- src/translations/pt.h | 4 ++-- src/translations/se.h | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 16fcd81f9..aa5779995 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -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; diff --git a/src/translations/cz.h b/src/translations/cz.h index 9e3e3b8db..5afaebb0e 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -79,8 +79,8 @@ #define LEN_VMIXTRIMS "\004" #define TR_VMIXTRIMS "VYP\0""ZAP\0""Sm\203r""V\212\207k""Plyn""K\206id" -#define LEN_VCSWFUNC "\010" -#define TR_VCSWFUNC "---\0 ""v>ofs\0 ""vofs\0""|v|v2\0 ""v1=v2\0 ""v1<=v2\0 ""d>=ofs\0 ""|d|>=ofs" +#define LEN_VCSWFUNC "\006" +#define TR_VCSWFUNC "---\0 ""v1>x\0 ""v1x""|v1|v2\0""v1=v2""v1<=v2""d>=x\0 ""|d|>=x" #define LEN_VFSWFUNC "\015" #if defined(VARIO) diff --git a/src/translations/de.h b/src/translations/de.h index d3f315f30..958341e89 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -79,8 +79,8 @@ #define LEN_VMIXTRIMS "\003" #define TR_VMIXTRIMS "AUS""AN ""StR""H\203R""Gas""QuR" -#define LEN_VCSWFUNC "\010" -#define TR_VCSWFUNC "---\0 ""v>ofs\0 ""vofs\0""|v|v2\0 ""v1=v2\0 ""v1<=v2\0 ""d>=ofs\0 ""|d|>=ofs" +#define LEN_VCSWFUNC "\006" +#define TR_VCSWFUNC "---\0 ""v1>x\0 ""v1x""|v1|v2\0""v1=v2""v1<=v2""d>=x\0 ""|d|>=x" #define LEN_VFSWFUNC "\015" #if defined(VARIO) diff --git a/src/translations/en.h b/src/translations/en.h index e933595b6..7ada1f6aa 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -86,8 +86,8 @@ #define LEN_VMIXTRIMS "\003" #define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" -#define LEN_VCSWFUNC "\010" -#define TR_VCSWFUNC "---\0 ""v>ofs\0 ""vofs\0""|v|v2\0 ""v1=v2\0 ""v1<=v2\0 ""d>=ofs\0 ""|d|>=ofs" +#define LEN_VCSWFUNC "\006" +#define TR_VCSWFUNC "---\0 ""v1>x\0 ""v1x""|v1|v2\0""v1=v2""v1<=v2""d>=x\0 ""|d|>=x" #define LEN_VFSWFUNC "\013" diff --git a/src/translations/es.h b/src/translations/es.h index c803f44cc..7469146c7 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -79,8 +79,8 @@ #define LEN_VMIXTRIMS "\003" #define TR_VMIXTRIMS "OFF""ON\0""Dir""Ele""Ace""Ale" -#define LEN_VCSWFUNC "\010" -#define TR_VCSWFUNC "---\0 ""v>ofs\0 ""vofs\0""|v|v2\0 ""v1=v2\0 ""v1<=v2\0 ""d>=ofs\0 ""|d|>=ofs" +#define LEN_VCSWFUNC "\006" +#define TR_VCSWFUNC "---\0 ""v1>x\0 ""v1x""|v1|v2\0""v1=v2""v1<=v2""d>=x\0 ""|d|>=x" #define LEN_VFSWFUNC "\015" #if defined(VARIO) diff --git a/src/translations/fr.h b/src/translations/fr.h index ccfbd4397..e8c7a577e 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -79,8 +79,8 @@ #define LEN_VMIXTRIMS "\003" #define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" -#define LEN_VCSWFUNC "\010" -#define TR_VCSWFUNC "----\0 ""v>ofs\0 ""vofs\0""|v|v2\0 ""v1=v2\0 ""v1<=v2\0 ""d>=ofs\0 ""|d|>=ofs" +#define LEN_VCSWFUNC "\006" +#define TR_VCSWFUNC "---\0 ""v1>x\0 ""v1x""|v1|v2\0""v1=v2""v1<=v2""d>=x\0 ""|d|>=x" #define LEN_VFSWFUNC "\015" #if defined(VARIO) diff --git a/src/translations/it.h b/src/translations/it.h index 3343b247c..9c56cb047 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -78,8 +78,8 @@ #define LEN_VMIXTRIMS "\003" #define TR_VMIXTRIMS "OFF""ON ""Rud""Ele""Thr""Ail" -#define LEN_VCSWFUNC "\010" -#define TR_VCSWFUNC "---\0 ""v>ofs\0 ""vofs\0""|v|v2\0 ""v1=v2\0 ""v1<=v2\0 ""d>=ofs\0 ""|d|>=ofs" +#define LEN_VCSWFUNC "\006" +#define TR_VCSWFUNC "---\0 ""v1>x\0 ""v1x""|v1|v2\0""v1=v2""v1<=v2""d>=x\0 ""|d|>=x" #define LEN_VFSWFUNC "\015" #if defined(VARIO) diff --git a/src/translations/pt.h b/src/translations/pt.h index b5fe1980d..1850fdb02 100644 --- a/src/translations/pt.h +++ b/src/translations/pt.h @@ -79,8 +79,8 @@ #define LEN_VMIXTRIMS "\003" #define TR_VMIXTRIMS "OFF""ON\0""Lem""Pfd""Mot""Ail" -#define LEN_VCSWFUNC "\010" -#define TR_VCSWFUNC "---\0 ""v>ofs\0 ""vofs\0""|v|v2\0 ""v1=v2\0 ""v1<=v2\0 ""d>=ofs\0 ""|d|>=ofs" +#define LEN_VCSWFUNC "\006" +#define TR_VCSWFUNC "---\0 ""v1>x\0 ""v1x""|v1|v2\0""v1=v2""v1<=v2""d>=x\0 ""|d|>=x" #define LEN_VFSWFUNC "\015" #if defined(VARIO) diff --git a/src/translations/se.h b/src/translations/se.h index 038cc9606..ea4c07a92 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -79,8 +79,8 @@ #define LEN_VMIXTRIMS "\003" #define TR_VMIXTRIMS "AV ""P\203 ""Rod""Hjd""Gas""Ske" -#define LEN_VCSWFUNC "\010" -#define TR_VCSWFUNC "---\0 ""v>ofs\0 ""vofs\0""|v|v2\0 ""v1=v2\0 ""v1<=v2\0 ""d>=ofs\0 ""|d|>=ofs" +#define LEN_VCSWFUNC "\006" +#define TR_VCSWFUNC "---\0 ""v1>x\0 ""v1x""|v1|v2\0""v1=v2""v1<=v2""d>=x\0 ""|d|>=x" #define LEN_VFSWFUNC "\015" #if defined(VARIO)