From 5f567618420ca476de46240fcb8c84739c2f5d22 Mon Sep 17 00:00:00 2001 From: bsongis Date: Mon, 19 Mar 2012 21:11:29 +0000 Subject: [PATCH] Small code adjutments --- src/lcd.cpp | 2 -- src/model_menus.cpp | 10 +++++----- src/myeeprom.h | 2 ++ src/o9xstrings.cpp | 2 +- src/o9xstrings.h | 6 +++--- src/open9x.h | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lcd.cpp b/src/lcd.cpp index 6ecb0dc94..a01d96a95 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -473,10 +473,8 @@ void putsChnRaw(uint8_t x, uint8_t y, uint8_t idx, uint8_t att) putsStrIdx(x, y, STR_PPM, idx - (NUM_STICKS+NUM_POTS+2+3), att); else if (idx<=NUM_STICKS+NUM_POTS+2+3+NUM_PPM+NUM_CHNOUT) putsStrIdx(x, y, STR_CH, idx - (NUM_STICKS+NUM_POTS+2+3+NUM_PPM), att); -#ifdef FRSKY else lcd_putsiAtt(x, y, STR_VTELEMCHNS, idx-(NUM_STICKS+NUM_POTS+2+3+NUM_PPM+NUM_CHNOUT), att); -#endif } void putsChn(uint8_t x, uint8_t y, uint8_t idx, uint8_t att) diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 0fdb2a026..e1be7a7ef 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -1678,16 +1678,16 @@ void menuProcCustomSwitches(uint8_t event) lcd_putsiAtt(4*FW - 1, y, STR_VCSWFUNC, cs.func, m_posHorz==0 ? attr : 0); uint8_t cstate = CS_STATE(cs.func); - int8_t v1_min=0, v1_max=NUM_XCHNCSW-MAX_TIMERS/*TODO why*/, v2_min=0, v2_max=NUM_XCHNCSW; + int8_t v1_min=0, v1_max=NUM_XCHNCSW, v2_min=0, v2_max=NUM_XCHNCSW; if (cstate == CS_VOFS) { putsChnRaw(12*FW-2, y, cs.v1, (m_posHorz==1 ? attr : 0)); #if defined(FRSKY) - if (cs.v1 > NUM_XCHNCSW-NUM_TELEMETRY-MAX_TIMERS) { - putsTelemetryChannel(20*FW, y, cs.v1 - (NUM_XCHNCSW-NUM_TELEMETRY-MAX_TIMERS+1), convertTelemValue(cs.v1 - (NUM_XCHNCSW-NUM_TELEMETRY-MAX_TIMERS), 128+cs.v2), m_posHorz==2 ? attr : 0); - v2_min = -128; v2_max = maxTelemValue(cs.v1 - (NUM_XCHNCSW-NUM_TELEMETRY-MAX_TIMERS)) - 128; + if (cs.v1 > NUM_XCHNCSW-NUM_TELEMETRY) { + putsTelemetryChannel(20*FW, y, cs.v1 - (NUM_XCHNCSW-NUM_TELEMETRY+1), convertTelemValue(cs.v1 - (NUM_XCHNCSW-NUM_TELEMETRY), 128+cs.v2), m_posHorz==2 ? attr : 0); + v2_min = -128; v2_max = maxTelemValue(cs.v1 - (NUM_XCHNCSW-NUM_TELEMETRY)) - 128; if (cs.v2 > v2_max) { cs.v2 = v2_max; eeDirty(EE_MODEL); @@ -2030,7 +2030,7 @@ void menuProcTelemetry(uint8_t event) if (sub==subN && (s_editMode>0 || p1valdiff)) { switch (m_posHorz) { case 0: - CHECK_INCDEC_MODELVAR(event, barSource, 0, TELEM_BAR_MAX); + CHECK_INCDEC_MODELVAR(event, barSource, 0, g_model.frsky.usrProto ? TELEM_BAR_MAX : TELEM_NOUSR_BAR_MAX); if (checkIncDec_Ret) { g_model.frsky.bars[j].source = barSource; g_model.frsky.bars[j].barMin = 0; diff --git a/src/myeeprom.h b/src/myeeprom.h index 6f98d2495..5502c8097 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -302,7 +302,9 @@ enum TelemetrySource { TELEM_ACC, TELEM_GPS_TIME, TELEM_BAR_MAX = TELEM_CELL, + TELEM_NOUSR_BAR_MAX = TELEM_RSSI_RX, TELEM_CSW_MAX = TELEM_CELL, + TELEM_NOUSR_CSW_MAX = TELEM_RSSI_RX, TELEM_DISPLAY_MAX = TELEM_MAX_DIST, TELEM_STATUS_MAX = TELEM_GPS_TIME }; diff --git a/src/o9xstrings.cpp b/src/o9xstrings.cpp index a64987b17..48add8102 100644 --- a/src/o9xstrings.cpp +++ b/src/o9xstrings.cpp @@ -60,8 +60,8 @@ const pm_char STR_OPEN9X[] PROGMEM = ISTR(VFSWFUNC) ISTR(VFSWRESET) ISTR(FUNCSOUNDS) -#ifdef FRSKY ISTR(VTELEMCHNS) +#ifdef FRSKY ISTR(VTELEMUNIT) ISTR(VALARM) ISTR(VALARMFN) diff --git a/src/o9xstrings.h b/src/o9xstrings.h index 4376dd153..e2df762be 100644 --- a/src/o9xstrings.h +++ b/src/o9xstrings.h @@ -77,15 +77,15 @@ extern const pm_char STR_OPEN9X[]; #define OFS_VFSWFUNC (OFS_VCSWFUNC + sizeof(TR_VCSWFUNC)) #define OFS_VFSWRESET (OFS_VFSWFUNC + sizeof(TR_VFSWFUNC)) #define OFS_FUNCSOUNDS (OFS_VFSWRESET + sizeof(TR_VFSWRESET)) -#ifdef FRSKY #define OFS_VTELEMCHNS (OFS_FUNCSOUNDS + sizeof(TR_FUNCSOUNDS)) +#ifdef FRSKY #define OFS_VTELEMUNIT (OFS_VTELEMCHNS + sizeof(TR_VTELEMCHNS)) #define OFS_VALARM (OFS_VTELEMUNIT + sizeof(TR_VTELEMUNIT)) #define OFS_VALARMFN (OFS_VALARM + sizeof(TR_VALARM)) #define OFS_VTELPROTO (OFS_VALARMFN + sizeof(TR_VALARMFN)) #define OFS_ENDTELEM (OFS_VTELPROTO + sizeof(TR_VTELPROTO)) #else -#define OFS_ENDTELEM (OFS_FUNCSOUNDS + sizeof(TR_FUNCSOUNDS)) +#define OFS_ENDTELEM (OFS_VTELEMCHNS + sizeof(TR_VTELEMCHNS)) #endif #ifdef TEMPLATES #define OFS_VTEMPLATES (OFS_ENDTELEM) @@ -139,9 +139,9 @@ extern const pm_char STR_OPEN9X[]; #define STR_VFSWFUNC (STR_OPEN9X + OFS_VFSWFUNC) #define STR_VFSWRESET (STR_OPEN9X + OFS_VFSWRESET) #define STR_FUNCSOUNDS (STR_OPEN9X + OFS_FUNCSOUNDS) +#define STR_VTELEMCHNS (STR_OPEN9X + OFS_VTELEMCHNS) #ifdef FRSKY -#define STR_VTELEMCHNS (STR_OPEN9X + OFS_VTELEMCHNS) #define STR_VTELEMUNIT (STR_OPEN9X + OFS_VTELEMUNIT) #define STR_VALARM (STR_OPEN9X + OFS_VALARM) #define STR_VALARMFN (STR_OPEN9X + OFS_VALARMFN) diff --git a/src/open9x.h b/src/open9x.h index 4c2bb3037..f584fa475 100644 --- a/src/open9x.h +++ b/src/open9x.h @@ -333,9 +333,9 @@ enum EnumKeys { #if defined(FRSKY_HUB) #define NUM_TELEMETRY TELEM_CSW_MAX #elif defined(WS_HOW_HIGH) -#define NUM_TELEMETRY 3 // TODO timers +#define NUM_TELEMETRY TELEM_ALT #elif defined(FRSKY) -#define NUM_TELEMETRY 2 // TODO timers +#define NUM_TELEMETRY TELEM_RSSI_RX #elif defined(MAVLINK) // Number sw position #define NUM_TELEMETRY 4 @@ -345,11 +345,11 @@ enum EnumKeys { #define MIX_INC_ROTARY_SW (CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+1) #define MIX_DEC_ROTARY_SW (CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+1) #else -#define NUM_TELEMETRY 0 +#define NUM_TELEMETRY TELEM_TM2 #endif #define NUM_XCHNRAW (NUM_STICKS+NUM_POTS+1/*MAX*/+1/*ID3*/+3/*CYC1-CYC3*/+NUM_PPM+NUM_CHNOUT) -#define NUM_XCHNCSW (NUM_XCHNRAW+MAX_TIMERS+NUM_TELEMETRY) +#define NUM_XCHNCSW (NUM_XCHNRAW+NUM_TELEMETRY) #define NUM_XCHNMIX (NUM_XCHNRAW+MAX_SWITCH) #define DSW_THR 1