Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Merge pull request #1757 from opentx/mhotar/cz_inputs

Browse source 
Mhotar/cz inputs
This commit is contained in:
Bertrand Songis 2014-10-06 21:55:46 +02:00
commit e35eb2029d
5 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/opentx.cpp
View file

@ -374,7 +374,11 @@ void defaultInputs()
expo->weight = 100;
expo->mode = 3; // TODO constant
for (int c=0; c<4; c++) {
#if defined(TRANSLATIONS_CZ) && defined(CPUARM)
g_model.inputNames[i][c] = char2idx(STR_INPUTNAMES[1+STR_INPUTNAMES[0]*(stick_index-1)+c]);
#else
g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*stick_index+c]);
#endif
}
}
eeDirty(EE_MODEL);
@ -399,7 +403,11 @@ void applyDefaultTemplate()
expo->weight = 100;
expo->mode = 3; // TODO constant
for (int c=0; c<4; c++) {
#if defined(TRANSLATIONS_CZ) && defined(CPUARM)
g_model.inputNames[i][c] = char2idx(STR_INPUTNAMES[1+STR_INPUTNAMES[0]*(stick_index-1)+c]);
#else
g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*stick_index+c]);
#endif
}
#endif

5
radio/src/translations.cpp
View file

@ -97,6 +97,9 @@ const pm_char STR_OPEN9X[] PROGMEM =
ISTR(VKEYS)
ISTR(VSWITCHES)
ISTR(VSRCRAW)
#if defined(TRANSLATIONS_CZ) && defined(CPUARM)
ISTR(INPUTNAMES)
#endif
ISTR(VTMRMODES)
#if defined(CPUM2560) || defined(CPUARM)
ISTR(DATETIME)
@ -295,7 +298,7 @@ const pm_char STR_MENUDATEANDTIME[] PROGMEM = TR_MENUDATEANDTIME;
#endif
const pm_char STR_MENUTRAINER[] PROGMEM = TR_MENUTRAINER;
const pm_char STR_MENUGLOBALFUNCS[] PROGMEM = TR_MENUGLOBALFUNCS;
const pm_char STR_MENUGLOBALFUNCS[] PROGMEM = TR_MENUGLOBALFUNCS;
const pm_char STR_MENUVERSION[] PROGMEM = TR_MENUVERSION;
const pm_char STR_MENUDIAG[] PROGMEM = TR_MENUDIAG;
const pm_char STR_MENUANA[] PROGMEM = TR_MENUANA;

12
radio/src/translations.h
View file

@ -153,7 +153,12 @@ extern const pm_char STR_OPEN9X[];
#endif
#define OFS_VSWITCHES (OFS_VKEYS + sizeof(TR_VKEYS))
#define OFS_VSRCRAW (OFS_VSWITCHES + sizeof(TR_VSWITCHES))
#define OFS_VTMRMODES (OFS_VSRCRAW + sizeof(TR_VSRCRAW))
#if defined(TRANSLATIONS_CZ) && defined(CPUARM)
#define OFS_INPUTNAMES (OFS_VSRCRAW + sizeof(TR_VSRCRAW))
#define OFS_VTMRMODES (OFS_INPUTNAMES + sizeof(TR_INPUTNAMES))
#else
#define OFS_VTMRMODES (OFS_VSRCRAW + sizeof(TR_VSRCRAW))
#endif
#define OFS_DATETIME (OFS_VTMRMODES + sizeof(TR_VTMRMODES))
#if defined(CPUM2560) || defined(CPUARM)
#define OFS_VPERSISTENT (OFS_DATETIME + sizeof(TR_DATETIME))
@ -249,6 +254,9 @@ extern const pm_char STR_OPEN9X[];
#define STR_VKEYS (STR_OPEN9X + OFS_VKEYS)
#define STR_VSWITCHES (STR_OPEN9X + OFS_VSWITCHES)
#define STR_VSRCRAW (STR_OPEN9X + OFS_VSRCRAW)
#if defined(TRANSLATIONS_CZ) && defined(CPUARM)
#define STR_INPUTNAMES (STR_OPEN9X + OFS_INPUTNAMES)
#endif
#define STR_VTMRMODES (STR_OPEN9X + OFS_VTMRMODES)
#if defined(ROTARY_ENCODERS)
@ -456,7 +464,7 @@ extern const pm_char STR_TRIMS2OFFSETS[];
extern const pm_char STR_MENURADIOSETUP[];
extern const pm_char STR_MENUDATEANDTIME[];
extern const pm_char STR_MENUTRAINER[];
extern const pm_char STR_MENUGLOBALFUNCS[];
extern const pm_char STR_MENUGLOBALFUNCS[];
extern const pm_char STR_MENUVERSION[];
extern const pm_char STR_MENUDIAG[];
extern const pm_char STR_MENUANA[];

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

@ -471,6 +471,9 @@
#define TR_VSRCRAW "---\0""Směr""Výšk""Plyn""Křid" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" TR_SW_VSRCRAW
#define LEN_INPUTNAMES "\004"
#define TR_INPUTNAMES "Smer""Vysk""Plyn""Krid"
#define LEN_VTMRMODES "\004"
#define TR_VTMRMODES "VYP\0""ABS\0""Pln>""Pln%""Pln*"

16
radio/util/tts.py
View file

@ -630,7 +630,7 @@ def ttsCz():
"vat", "vaty", u"vatů", "vatu",
"decibel", "decibely", u"decibelů", "decibelu",
"stopa", "stopy", "stop", "stopy",
"uzel", "uzly", u"uzlů", "uzlu",
u"míle za hodinu", u"míle za hodinu", u"mil za hodinu", "míle za hodinu",
"hodina", "hodiny", "hodin", "hodiny",
"minuta", "minuty", "minut", "minuty",
"sekunda", "sekundy", "sekund", "sekundy",
@ -652,6 +652,10 @@ def ttsCz():
(u"A1,kritická", "a1_red", NO_ALTERNATE),
(u"A2,nízká", "a2_org", NO_ALTERNATE),
(u"A2,kritická", "a2_red", NO_ALTERNATE),
(u"A3,nízká", "a3_org", NO_ALTERNATE),
(u"A3,kritická", "a3_red", NO_ALTERNATE),
(u"A4,nízká", "a4_org", NO_ALTERNATE),
(u"A4,kritická", "a4_red", NO_ALTERNATE),
(u"nízký RF signál", "rssi_org", NO_ALTERNATE),
(u"kritický RF signál", "rssi_red", NO_ALTERNATE),
(u"problém s anténou rádia", "swr_red", NO_ALTERNATE),
@ -660,8 +664,8 @@ def ttsCz():
]:
systemSounds.append((s, filename(f, a)))
for i, (s, f) in enumerate([
(u"podvozek je zasunut", "podvozek0"),
(u"podvozek je vysunut", "podvozek1"),
(u"podvozek je zasunut", "podvoz0"),
(u"podvozek je vysunut", "podvoz1"),
(u"klapky jsou zapnuty", "klapky1"),
(u"klapky jsou vypnuty", "klapky0"),
(u"trenér je zapnut", "trener1"),
@ -670,7 +674,7 @@ def ttsCz():
(u"motor je aktivován", "motor1"),
(u"jsi příliš vysoko", "vysoko"),
(u"jsi příliš nízko", "nizko"),
(u"baterie modelu je vybitá", "bytvybita"),
(u"baterie modelu je vybitá", "batvybit"),
(u"dochází palivo", "palivo"),
(u"nízký signál!", "nsignal"),
(u"kritický signál!", "ksignal"),
@ -678,10 +682,10 @@ def ttsCz():
(u"termický režim aktivován", "r_termik"),
(u"normální režim aktivován", "r_norm"),
(u"režim start aktivován", "r_start"),
(u"režim přistání aktivován", "r_pristani"),
(u"režim přistání aktivován", "r_prista"),
(u"vario je zapnuto", "vario0"),
(u"vario je vypnuto", "vario1"),
(u"start povolen", "stpovolen"),
(u"start povolen", "startok"),
]):
sounds.append((s, filename(f, PROMPT_CUSTOM_BASE+i)))
return systemSounds, sounds