Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 12:25:12 +03:00
Code Issues Wiki Activity

[Horus] Extra trims added (#3393)

Browse source
This commit is contained in:
Andre Bernet 2016-04-02 16:45:43 +04:00
parent 27d37f7b78
commit 1f6a711d24
24 changed files with 257 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

20
radio/src/dataconstants.h
View file

@ -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,

6
radio/src/datastructs.h
View file

@ -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]);

2
radio/src/functions.cpp
View file

@ -280,7 +280,7 @@ void evalFunctions()
#endif
#if defined(GVARS)
for (uint8_t i=0; i<NUM_STICKS; i++) {
for (uint8_t i=0; i<NUM_STICKS+NUM_AUX_TRIMS; i++) {
trimGvar[i] = -1;
}
#endif

16
radio/src/gui/horus/menu_model_flightmodes.cpp
View file

@ -58,6 +58,8 @@ enum FlightModesItems {
ITEM_FLIGHT_MODES_TRIM_ELE,
ITEM_FLIGHT_MODES_TRIM_THR,
ITEM_FLIGHT_MODES_TRIM_AIL,
ITEM_FLIGHT_MODES_TRIM_T5,
ITEM_FLIGHT_MODES_TRIM_T6,
ITEM_FLIGHT_MODES_FADE_IN,
ITEM_FLIGHT_MODES_FADE_OUT,
ITEM_FLIGHT_MODES_COUNT,
@ -69,12 +71,12 @@ bool isTrimModeAvailable(int mode)
return (mode < 0 || (mode%2) == 0 || (mode/2) != menuVerticalPosition);
}
#define FLIGHT_MODES_NAME_COLUMN 60
#define FLIGHT_MODES_SWITCH_COLUMN 200
#define FLIGHT_MODES_TRIMS_COLUMN 210
#define FLIGHT_MODES_TRIM_WIDTH 25
#define FLIGHT_MODES_FADEIN_COLUMN 400
#define FLIGHT_MODES_FADEOUT_COLUMN 450
#define FLIGHT_MODES_NAME_COLUMN 50
#define FLIGHT_MODES_SWITCH_COLUMN 180
#define FLIGHT_MODES_TRIMS_COLUMN 175
#define FLIGHT_MODES_TRIM_WIDTH 26
#define FLIGHT_MODES_FADEIN_COLUMN 420
#define FLIGHT_MODES_FADEOUT_COLUMN 460
bool menuModelFlightModesAll(evt_t event)
{
@ -149,6 +151,8 @@ bool menuModelFlightModesAll(evt_t event)
case ITEM_FLIGHT_MODES_TRIM_ELE:
case ITEM_FLIGHT_MODES_TRIM_THR:
case ITEM_FLIGHT_MODES_TRIM_AIL:
case ITEM_FLIGHT_MODES_TRIM_T5:
case ITEM_FLIGHT_MODES_TRIM_T6:
{
uint8_t t = j-ITEM_FLIGHT_MODES_TRIM_RUD;
if (active) {

2
radio/src/gui/horus/menu_model_inputs.cpp
View file

@ -283,7 +283,7 @@ bool menuModelExpoOne(evt_t event)
int8_t carryTrim = -ed->carryTrim;
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;

2
radio/src/gui/taranis/menu_model_inputs.cpp
View file

@ -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;

6
radio/src/mixer.cpp
View file

@ -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)

7
radio/src/myeeprom.h
View file

@ -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

6
radio/src/opentx.cpp
View file

@ -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<NUM_STICKS; i++) {
for (uint8_t i=0; i<NUM_STICKS+NUM_AUX_TRIMS; i++) {
// do trim -> 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<NUM_STICKS; i++) {
for (uint8_t i=0; i<NUM_STICKS+NUM_AUX_TRIMS; i++) {
if (i!=THR_STICK || !g_model.thrTrim) {
int16_t original_trim = getTrimValue(mixerCurrentFlightMode, i);
for (uint8_t phase=0; phase<MAX_FLIGHT_MODES; phase++) {

10
radio/src/opentx.h
View file

@ -639,7 +639,11 @@ extern uint8_t potsPos[NUM_XPOTS];
#endif
bool switchState(EnumKeys enuk);
uint8_t trimDown(uint8_t idx);
#if defined(PCBHORUS)
uint16_t trimDown(uint16_t idx);
#else
uint8_t trimDown(uint8_t idx);
#endif
void readKeysAndTrims();
uint16_t evalChkSum();
@ -780,7 +784,7 @@ swsrc_t getMovedSwitch();
#endif
#if defined(GVARS)
extern int8_t trimGvar[NUM_STICKS];
extern int8_t trimGvar[NUM_STICKS+NUM_AUX_TRIMS];
#define TRIM_REUSED(idx) trimGvar[idx] >= 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;

2
radio/src/storage/datacopy.cpp
View file

@ -91,7 +91,7 @@ void copytrim_t(A * dest, B * src)
template <class A, class B>
void copyFlightModeData(A * dest, B * src)
{
for (int i=0; i<4; i++) {
for (int i=0; i<NUM_STICKS; i++) {
copytrim_t(&dest->trim[i], &src->trim[i]);
}
dest->swtch = src->swtch;

2
radio/src/storage/eeprom_conversions.cpp
View file

@ -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;

4
radio/src/targets/horus/keys_driver.cpp
View file

@ -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);
}

20
radio/src/translations/cz.h.txt
View file

@ -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"

20
radio/src/translations/de.h.txt
View file

@ -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"

20
radio/src/translations/en.h.txt
View file

@ -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"

23
radio/src/translations/es.h.txt
View file

@ -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"

23
radio/src/translations/fi.h.txt
View file

@ -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"

20
radio/src/translations/fr.h.txt
View file

@ -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"

20
radio/src/translations/it.h.txt
View file

@ -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"

20
radio/src/translations/nl.h.txt
View file

@ -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"

22
radio/src/translations/pl.h.txt
View file

@ -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"

23
radio/src/translations/pt.h.txt
View file

@ -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"

20
radio/src/translations/se.h.txt
View file

@ -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"