From 1f6a711d24d895d5ac4ba5039574a1acaaba336e Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 2 Apr 2016 16:45:43 +0400 Subject: [PATCH 1/3] [Horus] Extra trims added (#3393) --- radio/src/dataconstants.h | 20 ++++++++++++++++ radio/src/datastructs.h | 6 ++--- radio/src/functions.cpp | 2 +- .../src/gui/horus/menu_model_flightmodes.cpp | 16 ++++++++----- radio/src/gui/horus/menu_model_inputs.cpp | 2 +- radio/src/gui/taranis/menu_model_inputs.cpp | 2 +- radio/src/mixer.cpp | 6 ++--- radio/src/myeeprom.h | 7 ++++++ radio/src/opentx.cpp | 6 ++--- radio/src/opentx.h | 10 +++++--- radio/src/storage/datacopy.cpp | 2 +- radio/src/storage/eeprom_conversions.cpp | 2 +- radio/src/targets/horus/keys_driver.cpp | 4 ++-- radio/src/translations/cz.h.txt | 20 +++++++++++++--- radio/src/translations/de.h.txt | 20 +++++++++++++--- radio/src/translations/en.h.txt | 20 +++++++++++++--- radio/src/translations/es.h.txt | 23 ++++++++++++++++--- radio/src/translations/fi.h.txt | 23 ++++++++++++++++--- radio/src/translations/fr.h.txt | 20 +++++++++++++--- radio/src/translations/it.h.txt | 20 +++++++++++++--- radio/src/translations/nl.h.txt | 20 +++++++++++++--- radio/src/translations/pl.h.txt | 22 ++++++++++++++---- radio/src/translations/pt.h.txt | 23 ++++++++++++++++--- radio/src/translations/se.h.txt | 20 +++++++++++++--- 24 files changed, 257 insertions(+), 59 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 499160814..7141f334c 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -234,6 +234,12 @@ enum CurveType { #define NUM_ROTARY_ENCODERS 0 #endif +#if defined(PCBHORUS) + #define NUM_AUX_TRIMS 2 +#else + #define NUM_AUX_TRIMS 0 +#endif + #if defined(COLORLCD) enum MainViews { VIEW_BLANK, @@ -660,7 +666,15 @@ enum SwitchSources { SWSRC_TrimThrUp, SWSRC_TrimAilLeft, SWSRC_TrimAilRight, +#if defined(PCBHORUS) + SWSRC_TrimT5Down, + SWSRC_TrimT5Up, + SWSRC_TrimT6Down, + SWSRC_TrimT6Up, + SWSRC_LAST_TRIM = SWSRC_TrimT6Up, +#else SWSRC_LAST_TRIM = SWSRC_TrimAilRight, +#endif #if defined(PCBSKY9X) SWSRC_REa, @@ -803,7 +817,13 @@ enum MixSources { MIXSRC_TrimEle, LUA_EXPORT("trim-ele", "Elevator trim") MIXSRC_TrimThr, LUA_EXPORT("trim-thr", "Throttle trim") MIXSRC_TrimAil, LUA_EXPORT("trim-ail", "Aileron trim") +#if defined(PCBHORUS) + MIXSRC_TrimT5, LUA_EXPORT("trim-t5", "Aux trim T5") + MIXSRC_TrimT6, LUA_EXPORT("trim-t6", "Aux trim T6") + MIXSRC_LAST_TRIM = MIXSRC_TrimT6, +#else MIXSRC_LAST_TRIM = MIXSRC_TrimAil, +#endif MIXSRC_FIRST_SWITCH, diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 831ed2ab8..28780af59 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -366,7 +366,7 @@ typedef int16_t gvar_t; #if defined(CPUARM) PACK(struct FlightModeData { - trim_t trim[4]; + trim_t trim[NUM_STICKS+NUM_AUX_TRIMS]; NOBACKUP(char name[LEN_FLIGHT_MODE_NAME]); int16_t swtch:9; // swtch of phase[0] is not used int16_t spare:7; @@ -377,7 +377,7 @@ PACK(struct FlightModeData { }); #elif !defined(PCBSTD) PACK(struct FlightModeData { - trim_t trim[4]; + trim_t trim[NUM_STICKS]; int8_t swtch; // swtch of phase[0] is not used NOBACKUP(char name[LEN_FLIGHT_MODE_NAME]); uint8_t fadeIn:4; @@ -387,7 +387,7 @@ PACK(struct FlightModeData { }); #else PACK(struct FlightModeData { - int8_t trim[4]; + int8_t trim[NUM_STICKS]; int8_t trim_ext; // 2 extra bits per trim (10bits) int8_t swtch; // swtch of phase[0] is not used NOBACKUP(char name[LEN_FLIGHT_MODE_NAME]); diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp index 85a632ebd..0ad0d8c44 100644 --- a/radio/src/functions.cpp +++ b/radio/src/functions.cpp @@ -280,7 +280,7 @@ void evalFunctions() #endif #if defined(GVARS) - for (uint8_t i=0; icarryTrim; lcdDrawText(MENUS_MARGIN_LEFT, y, STR_TRIM); lcdDrawTextAtIndex(EXPO_ONE_2ND_COLUMN, y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, menuHorizontalPosition==0 ? attr : 0); - if (attr) ed->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL); + if (attr) ed->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_LAST); break; } y += FH; diff --git a/radio/src/gui/taranis/menu_model_inputs.cpp b/radio/src/gui/taranis/menu_model_inputs.cpp index b9999a8bb..590789198 100644 --- a/radio/src/gui/taranis/menu_model_inputs.cpp +++ b/radio/src/gui/taranis/menu_model_inputs.cpp @@ -260,7 +260,7 @@ void menuModelExpoOne(uint8_t event) int8_t carryTrim = -ed->carryTrim; lcd_putsLeft(y, STR_TRIM); lcdDrawTextAtIndex(EXPO_ONE_2ND_COLUMN, y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, menuHorizontalPosition==0 ? attr : 0); - if (attr) ed->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL); + if (attr) ed->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_LAST); break; } y += FH; diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index 2fdb56b87..cd5011551 100644 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -28,7 +28,7 @@ #endif int16_t anas [NUM_INPUTS] = {0}; -int16_t trims[NUM_STICKS] = {0}; +int16_t trims[NUM_STICKS+NUM_AUX_TRIMS] = {0}; int32_t chans[NUM_CHNOUT] = {0}; BeepANACenter bpanaCenter = 0; @@ -280,8 +280,8 @@ getvalue_t getValue(mixsrc_t i) #endif } - else if (i <= MIXSRC_TrimAil) { - return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_TrimRud)); + else if (i <= MIXSRC_LAST_TRIM) { + return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_FIRST_TRIM)); } #if defined(PCBFLAMENCO) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 0298dac07..21dbfee01 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -236,6 +236,13 @@ enum CurveRefType { #define TRIM_ELE (-2) #define TRIM_THR (-3) #define TRIM_AIL (-4) +#if defined(PCBHORUS) + #define TRIM_T5 (-5) + #define TRIM_T6 (-6) + #define TRIM_LAST TRIM_T6 +#else + #define TRIM_LAST TRIM_AIL +#endif #define MLTPX_ADD 0 #define MLTPX_MUL 1 diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index daf92bd33..a04cc7ac5 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1355,7 +1355,7 @@ void alert(const pm_char * t, const pm_char * s MESSAGE_SOUND_ARG) } #if defined(GVARS) -int8_t trimGvar[NUM_STICKS] = { -1, -1, -1, -1 }; +int8_t trimGvar[NUM_STICKS+NUM_AUX_TRIMS] = { -1, -1, -1, -1 }; #endif #if defined(CPUARM) @@ -1737,7 +1737,7 @@ uint16_t s_sum_samples_thr_10s; void evalTrims() { uint8_t phase = mixerCurrentFlightMode; - for (uint8_t i=0; i throttle trim if applicable int16_t trim = getTrimValue(phase, i); #if !defined(VIRTUALINPUTS) @@ -2467,7 +2467,7 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim } // reset all trims, except throttle (if throttle trim) - for (uint8_t i=0; i= 0 #else #define TRIM_REUSED(idx) 0 @@ -1188,7 +1192,7 @@ extern CurveInfo curveInfo(uint8_t idx); #endif extern int16_t anas [NUM_INPUTS]; -extern int16_t trims[NUM_STICKS]; +extern int16_t trims[NUM_STICKS+NUM_AUX_TRIMS]; extern BeepANACenter bpanaCenter; extern uint8_t s_mixer_first_run_done; diff --git a/radio/src/storage/datacopy.cpp b/radio/src/storage/datacopy.cpp index eec909994..56a8f8e33 100644 --- a/radio/src/storage/datacopy.cpp +++ b/radio/src/storage/datacopy.cpp @@ -91,7 +91,7 @@ void copytrim_t(A * dest, B * src) template void copyFlightModeData(A * dest, B * src) { - for (int i=0; i<4; i++) { + for (int i=0; itrim[i], &src->trim[i]); } dest->swtch = src->swtch; diff --git a/radio/src/storage/eeprom_conversions.cpp b/radio/src/storage/eeprom_conversions.cpp index 56c6d52c3..ffa106727 100644 --- a/radio/src/storage/eeprom_conversions.cpp +++ b/radio/src/storage/eeprom_conversions.cpp @@ -346,7 +346,7 @@ PACK(typedef struct { }) TimerData_v217; PACK(typedef struct { - int16_t trim[4]; + int16_t trim[NUM_STICKS]; int8_t swtch; // swtch of phase[0] is not used char name[LEN_FLIGHT_MODE_NAME]; uint8_t fadeIn; diff --git a/radio/src/targets/horus/keys_driver.cpp b/radio/src/targets/horus/keys_driver.cpp index ac2dc2aa6..411fdf5e4 100644 --- a/radio/src/targets/horus/keys_driver.cpp +++ b/radio/src/targets/horus/keys_driver.cpp @@ -64,7 +64,7 @@ uint32_t readTrims() result |= 0x40; if (~TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR) result |= 0x80; -#if 0 +#if !defined(SIMU) if (~TRIMS_GPIO_REG_LSD & TRIMS_GPIO_PIN_LSD) result |= 0x100; if (~TRIMS_GPIO_REG_LSU & TRIMS_GPIO_PIN_LSU) @@ -79,7 +79,7 @@ uint32_t readTrims() return result; } -uint8_t trimDown(uint8_t idx) +uint16_t trimDown(uint16_t idx) { return readTrims() & (1 << idx); } diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 5d50804dc..28383135b 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -224,7 +224,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\004" -#define TR_VMIXTRIMS "VYP\0""ZAP\0""Směr""Výšk""Plyn""Křid" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "VYP\0""ZAP\0""Směr""Výšk""Plyn""Křid""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "VYP\0""ZAP\0""Směr""Výšk""Plyn""Křid" +#endif #if LCD_W >= 212 #define TR_CSWTIMER "Timer" @@ -487,7 +492,12 @@ #define TR_INPUTNAMES "Smer""Vysk""Plyn""Krid" #define TR_STICKS_VSRCRAW TR("Směr""Výšk""Plyn""Křid", "\307Směr""\307Výšk""\307Plyn""\307Křid") -#define TR_TRIMS_VSRCRAW TR("TrmS""TrmV""TrmP""TrmK", "\313Směr""\313Výšk""\313Plyn""\313Křid") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Směr""\313Výšk""\313Plyn""\313Křid""\313T5\0 ""\313T6\0 " +#else + #define TR_TRIMS_VSRCRAW TR("TrmS""TrmV""TrmP""TrmK", "\313Směr""\313Výšk""\313Plyn""\313Křid") +#endif #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" @@ -513,7 +523,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tSl""tSp""tVd""tVn""tPd""tPn""tKl""tKp", "\313Sl""\313Sp""\313Vd""\313Vn""\313Pd""\313Pn""\313Kl""\313Kp") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Sl""\313Sp""\313Vd""\313Vn""\313Pd""\313Pn""\313Kl""\313Kp""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tSl""tSp""tVd""tVn""tPd""tPn""tKl""tKp", "\313Sl""\313Sp""\313Vd""\313Vn""\313Pd""\313Pn""\313Kl""\313Kp") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index e91aae7e0..87046a35a 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -228,7 +228,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "AUS""EIN""Sei""Höh""Gas""Que" //Mixer Trim Werte + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "AUS""EIN""Sei""Höh""Gas""Que""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "AUS""EIN""Sei""Höh""Gas""Que" //Mixer Trim Werte +#endif #if LCD_W >= 212 #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator @@ -490,7 +495,12 @@ #define LEN_VSRCRAW "\004" #define TR_STICKS_VSRCRAW TR("Sei\0""Höh\0""Gas\0""Qur\0", "\307Sei""\307Höh""\307Gas""\307Qur") -#define TR_TRIMS_VSRCRAW TR("TrmS""TrmH""TrmG""TrmQ", "\313Sei""\313Höh""\313Gas""\313Qur") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Sei""\313Höh""\313Gas""\313Qur""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmS""TrmH""TrmG""TrmQ", "\313Sei""\313Höh""\313Gas""\313Qur") +#endif #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" @@ -516,7 +526,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tSl""tSr""tHd""tHu""tGd""tGu""tQl""tQr", "\313Sl""\313Sr""\313Hd""\313Hu""\313Gd""\313Gu""\313Ql""\313Qr") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Sl""\313Sr""\313Hd""\313Hu""\313Gd""\313Gu""\313Ql""\313Qr""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tSl""tSr""tHd""tHu""tGd""tGu""tQl""tQr", "\313Sl""\313Sr""\313Hd""\313Hu""\313Gd""\313Gu""\313Ql""\313Qr") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "DGa\0" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index b22737fda..27bd9609a 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -224,7 +224,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" +#endif #if LCD_W >= 212 #define TR_CSWTIMER "Timer" @@ -497,7 +502,12 @@ #define LEN_VSRCRAW "\004" #define TR_STICKS_VSRCRAW TR("Rud\0""Ele\0""Thr\0""Ail\0", "\307Rud""\307Ele""\307Thr""\307Ail") -#define TR_TRIMS_VSRCRAW TR("TrmR""TrmE""TrmT""TrmA", "\313Rud""\313Ele""\313Thr""\313Ail") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Rud""\313Ele""\313Thr""\313Ail""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmR""TrmE""TrmT""TrmA", "\313Rud""\313Ele""\313Thr""\313Ail") +#endif #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" @@ -523,7 +533,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index d43e25ee6..e666b5faf 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -224,7 +224,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Dir""Ele""Ace""Ale" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "OFF""ON\0""Dir""Ele""Ace""Ale""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "OFF""ON\0""Dir""Ele""Ace""Ale" +#endif #if defined(PCBTARANIS) #define TR_CSWTIMER "Timer" @@ -478,6 +483,14 @@ #define LEN_VSWITCHES "\003" #define LEN_VSRCRAW "\004" +#define TR_STICKS_VSRCRAW TR("Dir\0""Ele\0""Thr\0""Ale\0", "\307Dir""\307Ele""\307Thr""\307Ale") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Dir""\313Ele""\313Thr""\313Ale""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmD" "TrmE" "TrmT" "TrmA", "\313Dir""\313Ele""\313Thr""\313Ale") +#endif + #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" @@ -502,7 +515,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" @@ -536,7 +553,7 @@ #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" #endif -#define TR_VSRCRAW "---\0""Dir\0""Ele\0""Thr\0""Ale\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" TR_SW_VSRCRAW +#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index d3370d648..bb79f8892 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -224,7 +224,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" +#endif #if defined(PCBTARANIS) #define TR_CSWTIMER "Timer" @@ -478,6 +483,14 @@ #define LEN_VSWITCHES "\003" #define LEN_VSRCRAW "\004" +#define TR_STICKS_VSRCRAW TR("Rud\0""Ele\0""Thr\0""Ail\0", "\307Rud""\307Ele""\307Thr""\307Ail") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Rud""\313Ele""\313Thr""\313Ail""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmR""TrmE""TrmT""TrmA", "\313Rud""\313Ele""\313Thr""\313Ail") +#endif + #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" @@ -502,7 +515,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313\313d""\313\313u""\313Al""\313Ar") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" @@ -536,7 +553,7 @@ #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" #endif -#define TR_VSRCRAW "---\0""Rud\0""Ele\0""Thr\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" TR_SW_VSRCRAW +#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 9f9b2da25..67dd2947b 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -224,7 +224,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" +#endif #if LCD_W >= 212 #define TR_CSWTIMER "Tempo" @@ -486,7 +491,12 @@ #define LEN_VSRCRAW "\004" #define TR_STICKS_VSRCRAW TR("Dir\0""Prf\0""Gaz\0""Ail\0", "\307Dir""\307Prf""\307Gaz""\307Ail") -#define TR_TRIMS_VSRCRAW TR("TrmD""TrmP""TrmG""TrmA", "\313Dir""\313Prf""\313Gaz""\313Ail") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Dir""\313Prf""\313Gaz""\313Ail""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmD""TrmP""TrmG""TrmA", "\313Dir""\313Prf""\313Gaz""\313Ail") +#endif #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" @@ -512,7 +522,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tDg""tDd""tPb""tPh""tGb""tGh""tAg""tAd", "\313Dg""\313Dd""\313Pb""\313Ph""\313Gb""\313Gh""\313Ag""\313Ad") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Dg""\313Dd""\313Pb""\313Ph""\313Gb""\313Gh""\313Ag""\313Ad""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tDg""tDd""tPb""tPh""tGb""tGh""tAg""tAd", "\313Dg""\313Dd""\313Pb""\313Ph""\313Gb""\313Gh""\313Ag""\313Ad") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index ad9a5199a..5f137bd94 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -224,7 +224,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON ""Dir""Ele""Mot""Ale" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "OFF""ON\0""Dir""Ele""Mot""Ale""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "OFF""ON\0""Dir""Ele""Mot""Ale" +#endif #if LCD_W >= 212 #define TR_CSWTIMER "Timer" @@ -486,7 +491,12 @@ #define LEN_VSRCRAW "\004" #define TR_STICKS_VSRCRAW TR("Dir\0""Ele\0""Mot\0""Ale\0", "\307Dir""\307Ele""\307Mot""\307Ale") -#define TR_TRIMS_VSRCRAW TR("TrmR""TrmE""TrmT""TrmA", "\313Dir""\313Ele""\313Mot""\313Ale") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Dir""\313Ele""\313Mot""\313Ale""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmR""TrmE""TrmT""TrmA", "\313Dir""\313Ele""\313Mot""\313Ale") +#endif #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" @@ -512,7 +522,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index ac788036a..52c8151b9 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -225,7 +225,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" +#endif #if LCD_W >= 212 #define TR_CSWTIMER "Timer" @@ -487,7 +492,12 @@ #define LEN_VSRCRAW "\004" #define TR_STICKS_VSRCRAW TR("Rud\0""Ele\0""Thr\0""Ail\0", "\307Rud""\307Ele""\307Thr""\307Ail") -#define TR_TRIMS_VSRCRAW TR("TrmR""TrmE""TrmT""TrmA", "\313Rud""\313Ele""\313Thr""\313Ail") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Rud""\313Ele""\313Thr""\313Ail""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmR""TrmE""TrmT""TrmA", "\313Rud""\313Ele""\313Thr""\313Ail") +#endif #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" @@ -513,7 +523,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 58cdd678c..a7247f150 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -188,7 +188,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "WYŁ""ZAŁ""SK\0""SW\0""GAZ""Lot" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "WYŁ""ZAŁ""SK\0""SW\0""GAZ""Lot""Ail""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "WYŁ""ZAŁ""SK\0""SW\0""GAZ""Lot" +#endif #if LCD_W >= 212 #define TR_CSWTIMER "Timer" @@ -449,8 +454,13 @@ #define LEN_VSWITCHES "\003" #define LEN_VSRCRAW "\004" -#define TR_STICKS_VSRCRAW TR("SK \0""SW \0""Gaz\0""Lot\0", "\307SK ""\307SW ""\307Gaz""\307Lot") -#define TR_TRIMS_VSRCRAW TR("TrSK""TrSW""TrGA""TrLO", "\313SK ""\313SW ""\313Gaz""\313Lot") +#define TR_STICKS_VSRCRAW TR("SK\0 ""SW\0 ""Gaz\0""Lot\0", "\307SK ""\307SW ""\307Gaz""\307Lot") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313SK\0""\313SW\0""\313Gaz""\313Lot""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrSK""TrSW""TrGA""TrLO", "\313SK ""\313SW ""\313Gaz""\313Lot") +#endif #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" @@ -476,7 +486,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index e2277a358..7dab5496c 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -218,7 +218,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Lem""Pfd""Mot""Ail" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "OFF""ON\0""Lem""Pfd""Mot""Ail""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "OFF""ON\0""Lem""Pfd""Mot""Ail" +#endif #if defined(PCBTARANIS) #define TR_CSWTIMER "Timer" @@ -472,6 +477,14 @@ #define LEN_VSWITCHES "\003" #define LEN_VSRCRAW "\004" +#define TR_STICKS_VSRCRAW TR("Lem\0""Pfd\0""Mot\0""Ail\0", "\307Lem""\307Pfd""\307Mot""\307Ail") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Lem""\313Pfd""\313Mot""\313Ail""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmL""TrmP""TrmM""TrmA", "\313Lem""\313Pfd""\313Mot""\313Ail") +#endif + #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" @@ -496,7 +509,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313\313d""\313\313u""\313Al""\313Ar") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Rl""\313Rr""\313Ed""\313Eu""\313Td""\313Tu""\313Al""\313Ar""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr", "\313Rl""\313Rr""\313Ed""\313Eu""\313Eu""\313Td""\313Tu""\313Al""\313Ar") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" @@ -530,7 +547,7 @@ #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" #endif -#define TR_VSRCRAW "---\0""Lem\0""Pfd\0""Mot\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" TR_SW_VSRCRAW +#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""MTs""MT%""MTt" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 0e5d57609..9ce7180bf 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -221,7 +221,12 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "Av\0""På\0""Rod""Hjd""Gas""Ske" + +#if defined(PCBHORUS) + #define TR_VMIXTRIMS "Av\0""På\0""Rod""Hjd""Gas""Ske""T5\0""T6\0" +#else + #define TR_VMIXTRIMS "Av\0""På\0""Rod""Hjd""Gas""Ske" +#endif #if defined(PCBTARANIS) #define TR_CSWTIMER "Timer" @@ -492,7 +497,12 @@ #define TR_STICKS_VSRCRAW TR("Rod\0""Hjd\0""Gas\0""Ske\0", "\307Rod""\307Hjd""\307Gas""\307Ske") -#define TR_TRIMS_VSRCRAW TR("TrmR""TrmH""TrmG""TrmS", "\313Rod""\313Hjd""\313Gas""\313Ske") + +#if defined(PCBHORUS) + #define TR_TRIMS_VSRCRAW "\313Rod""\313Hjd""\313Gas""\313Ske""\313T5\0""\313T6\0" +#else + #define TR_TRIMS_VSRCRAW TR("TrmR""TrmH""TrmG""TrmS", "\313Rod""\313Hjd""\313Gas""\313Ske") +#endif #if defined(PCBHORUS) #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0" @@ -518,7 +528,11 @@ #define TR_LOGICALSW "L1\0""L2\0""L3\0""L4\0""L5\0""L6\0""L7\0""L8\0""L9\0""L10""L11""L12" #endif -#define TR_TRIMS_SWITCHES TR("tRv""tRh""tHn""tHu""tGn""tGu""tSv""tSh", "\313Rv""\313Rh""\313Hn""\313Hu""\313Gn""\313Gu""\313Sv""\313Sh") +#if defined(PCBHORUS) + #define TR_TRIMS_SWITCHES "\313Rv""\313Rh""\313Hn""\313Hu""\313Gn""\313Gu""\313Sv""\313Sh""\3135d""\3135u""\3136d""\3136u" +#else + #define TR_TRIMS_SWITCHES TR("tRv""tRh""tHn""tHu""tGn""tGu""tSv""tSh", "\313Rv""\313Rh""\313Hn""\313Hu""\313Gn""\313Gu""\313Sv""\313Sh") +#endif #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "REa\0" From d207a600e8f68a780c56ca274a016bb803a470fb Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 2 Apr 2016 17:03:24 +0400 Subject: [PATCH 2/3] Attempt at getting the simu interface usable with the extra trims --- companion/src/eeprominterface.h | 6 +++++- companion/src/simulation/simulatordialoghorus.cpp | 7 ++++++- companion/src/simulation/simulatorimport.h | 2 +- companion/src/simulation/simulatorinterface.h | 2 +- radio/src/simu.cpp | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index da8862c87..f7d8f9a1b 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -135,7 +135,11 @@ enum FailsafeModes { #define TRIM_RV_UP 5 #define TRIM_RH_L 6 #define TRIM_RH_R 7 -#define TRIM_NONE 8 +#define TRIM_T5_DN 8 +#define TRIM_T5_UP 9 +#define TRIM_T6_DN 10 +#define TRIM_T6_UP 11 +#define TRIM_NONE 12 // Beep center bits #define BC_BIT_RUD (0x01) diff --git a/companion/src/simulation/simulatordialoghorus.cpp b/companion/src/simulation/simulatordialoghorus.cpp index 9e69e3b59..0345a3c42 100644 --- a/companion/src/simulation/simulatordialoghorus.cpp +++ b/companion/src/simulation/simulatordialoghorus.cpp @@ -141,7 +141,12 @@ void SimulatorDialogHorus::getValues() trimPressed == TRIM_RV_DN, trimPressed == TRIM_RV_UP, trimPressed == TRIM_RH_L, - trimPressed == TRIM_RH_R + trimPressed == TRIM_RH_R, + 0,0,0,0 + /*trimPressed == TRIM_T5_DN, + trimPressed == TRIM_T5_UP, + trimPressed == TRIM_T6_DN, + trimPressed == TRIM_T6_UP*/ } }; diff --git a/companion/src/simulation/simulatorimport.h b/companion/src/simulation/simulatorimport.h index 5bf52b265..6278ac70d 100644 --- a/companion/src/simulation/simulatorimport.h +++ b/companion/src/simulation/simulatorimport.h @@ -37,7 +37,7 @@ for (int i=0; i Date: Fri, 8 Apr 2016 14:38:45 +0400 Subject: [PATCH 3/3] Bad define --- radio/src/targets/simu/simpgmspace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp index 24e87966e..6609d6639 100644 --- a/radio/src/targets/simu/simpgmspace.cpp +++ b/radio/src/targets/simu/simpgmspace.cpp @@ -211,7 +211,7 @@ void simuSetTrim(uint8_t trim, bool state) TRIM_CASE(5, TRIMS_GPIO_REG_RVU, TRIMS_GPIO_PIN_RVU) TRIM_CASE(6, TRIMS_GPIO_REG_RHL, TRIMS_GPIO_PIN_RHL) TRIM_CASE(7, TRIMS_GPIO_REG_RHR, TRIMS_GPIO_PIN_RHR) -#if defined(HORUS) +#if defined(PCBHORUS) TRIM_CASE(8, TRIMS_GPIO_REG_LSU, TRIMS_GPIO_PIN_LSU) TRIM_CASE(9, TRIMS_GPIO_REG_LSD, TRIMS_GPIO_PIN_RVU) TRIM_CASE(10, TRIMS_GPIO_REG_RSU, TRIMS_GPIO_PIN_RHL)