diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 3c82bc7fc..1e5b944a9 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -324,7 +324,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); @@ -349,7 +353,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 diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 23e150493..dc7dbfab7 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -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; diff --git a/radio/src/translations.h b/radio/src/translations.h index 99a15a148..b31c44fb6 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -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[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index f75792bbd..406db3094 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -80,11 +80,7 @@ #define TR_TRNCHN "CH1CH2CH3CH4" #define LEN_UART3MODES "\017" -<<<<<<< HEAD -#define TR_UART3MODES "VYP\0 ""S-Port Mirror\0 ""Telemetrie\0 ""Trainer\0 ""Debug\0 " -======= -#define TR_UART3MODES "VYP\0 ""S-Port Mirror\0 ""Telemetrie\0 ""Debug\0 " ->>>>>>> 2073a1f... CZ translations - Radio +#define TR_UART3MODES "VYP\0 ""S-Port Mirror\0 ""Telemetrie\0 ""SBUS Trenér\0 ""Debug\0 " #define LEN_POTTYPES "\017" #define TR_POTTYPES "Není\0 ""Pot s aretací\0 ""Vícepol. přep.\0""Potenciometr\0" @@ -475,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*"