From 26200e60803ba8975bd52cb59759ca070d871541 Mon Sep 17 00:00:00 2001 From: bsongis Date: Thu, 20 Mar 2014 15:55:36 +0100 Subject: [PATCH] Issue #820 fixed --- radio/src/gui/menu_model.cpp | 8 ++++---- radio/src/translations.cpp | 7 +++++-- radio/src/translations.h | 6 +++++- radio/src/translations/cz.h.txt | 5 +++++ radio/src/translations/de.h.txt | 5 +++++ radio/src/translations/en.h.txt | 5 +++++ radio/src/translations/es.h.txt | 5 +++++ radio/src/translations/fi.h.txt | 5 +++++ radio/src/translations/fr.h.txt | 5 +++++ radio/src/translations/it.h.txt | 5 +++++ radio/src/translations/pl.h.txt | 5 +++++ radio/src/translations/pt.h.txt | 5 +++++ radio/src/translations/se.h.txt | 16 ++++++++++++++++ 13 files changed, 75 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index 9620e11af..05839b40f 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -2418,7 +2418,7 @@ void menuModelCurveOne(uint8_t event) CurveInfo & crv = g_model.curves[s_curveChan]; int8_t * points = curveAddress(s_curveChan); - lcd_puts(9*FW, 0, "pt\003X\006Y"); + lcd_puts(9*FW, 0, TR_PT "\003X\006Y"); lcd_filled_rect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT); SIMPLE_SUBMENU(STR_MENUCURVE, 4 + 5+crv.points + (crv.type==CURVE_TYPE_CUSTOM ? 5+crv.points-2 : 0)); @@ -2429,7 +2429,7 @@ void menuModelCurveOne(uint8_t event) uint8_t attr = (m_posVert==1 ? (s_editMode>0 ? INVERS|BLINK : INVERS) : 0); lcd_putsLeft(3*FH+1, STR_TYPE); - lcd_putsiAtt(INDENT_WIDTH, 4*FH+1, "\010StandardCustom\0", crv.type, attr); + lcd_putsiAtt(INDENT_WIDTH, 4*FH+1, STR_CURVE_TYPES, crv.type, attr); if (attr) { uint8_t newType = checkIncDecModelZero(event, crv.type, CURVE_TYPE_LAST); if (newType != crv.type) { @@ -2447,7 +2447,7 @@ void menuModelCurveOne(uint8_t event) attr = (m_posVert==2 ? (s_editMode>0 ? INVERS|BLINK : INVERS) : 0); lcd_putsLeft(5*FH+1, STR_COUNT); lcd_outdezAtt(INDENT_WIDTH, 6*FH+1, 5+crv.points, LEFT|attr); - lcd_putsAtt(lcdLastPos, 6*FH+1, PSTR("pts"), attr); + lcd_putsAtt(lcdLastPos, 6*FH+1, STR_PTS, attr); if (attr) { int8_t count = checkIncDecModel(event, crv.points, -3, 12); // 2pts - 17pts if (checkIncDec_Ret) { @@ -4061,7 +4061,7 @@ void menuModelCurvesAll(uint8_t event) editName(4*FW, y, g_model.curveNames[k], sizeof(g_model.curveNames[k]), 0, 0); CurveInfo & crv = g_model.curves[k]; lcd_outdezAtt(11*FW, y, 5+crv.points, LEFT); - lcd_putsAtt(lcdLastPos, y, PSTR("pts"), 0); + lcd_putsAtt(lcdLastPos, y, STR_PTS, 0); #endif } } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index d377550f4..1691b1793 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -115,6 +115,7 @@ const pm_char STR_OPEN9X[] PROGMEM = ISTR(TARANIS_PROTOCOLS) ISTR(XJT_PROTOCOLS) ISTR(DSM_PROTOCOLS) + ISTR(CURVE_TYPES) #endif #if defined(MAVLINK) ISTR(MAVLINK_BAUDS) @@ -496,8 +497,10 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = TR_VIEW_TEXT; const pm_char STR_MIRROR[] PROGMEM = TR_MIRROR; const pm_char STR_CLEAR[] PROGMEM = TR_CLEAR; const pm_char STR_RESET[] PROGMEM = TR_RESET; -const pm_char STR_COUNT[] PROGMEM = TR_COUNT; -const pm_char STR_SMOOTH[] PROGMEM = TR_SMOOTH; + const pm_char STR_COUNT[] PROGMEM = TR_COUNT; + const pm_char STR_PT[] PROGMEM = TR_PT; + const pm_char STR_PTS[] PROGMEM = TR_PTS; + const pm_char STR_SMOOTH[] PROGMEM = TR_SMOOTH; const pm_char STR_COPY_TRIMS_TO_OFS[] PROGMEM = TR_COPY_TRIMS_TO_OFS; const pm_char STR_TOP_BAR[] PROGMEM = TR_TOP_BAR; const pm_char STR_ALTITUDE[] PROGMEM = TR_ALTITUDE; diff --git a/radio/src/translations.h b/radio/src/translations.h index 4bebcbc08..35879ae02 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -181,7 +181,8 @@ extern const pm_char STR_OPEN9X[]; #define OFS_TARANIS_PROTOCOLS (OFS_VTRAINERMODES + sizeof(TR_VTRAINERMODES)) #define OFS_XJT_PROTOCOLS (OFS_TARANIS_PROTOCOLS + sizeof(TR_TARANIS_PROTOCOLS)) #define OFS_DSM_PROTOCOLS (OFS_XJT_PROTOCOLS + sizeof(TR_XJT_PROTOCOLS)) - #define OFS_MAVLINK_BAUDS (OFS_DSM_PROTOCOLS + sizeof(TR_DSM_PROTOCOLS)) + #define OFS_CURVE_TYPES (OFS_DSM_PROTOCOLS + sizeof(TR_DSM_PROTOCOLS)) + #define OFS_MAVLINK_BAUDS (OFS_CURVE_TYPES + sizeof(TR_CURVE_TYPES)) #else #define OFS_MAVLINK_BAUDS (OFS_VTRAINERMODES) #endif @@ -278,6 +279,7 @@ extern const pm_char STR_OPEN9X[]; #define STR_TARANIS_PROTOCOLS (STR_OPEN9X + OFS_TARANIS_PROTOCOLS) #define STR_XJT_PROTOCOLS (STR_OPEN9X + OFS_XJT_PROTOCOLS) #define STR_DSM_PROTOCOLS (STR_OPEN9X + OFS_DSM_PROTOCOLS) + #define STR_CURVE_TYPES (STR_OPEN9X + OFS_CURVE_TYPES) #endif #if defined(MAVLINK) @@ -676,6 +678,8 @@ extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_CLEAR[]; extern const pm_char STR_RESET[]; extern const pm_char STR_COUNT[]; +extern const pm_char STR_PT[]; +extern const pm_char STR_PTS[]; extern const pm_char STR_SMOOTH[]; extern const pm_char STR_COPY_TRIMS_TO_OFS[]; extern const pm_char STR_TOP_BAR[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index d82599ef5..15c7b99f6 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -98,6 +98,9 @@ #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "Tichý\0""Zvuk\0 ""Hlas\0 " +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -744,6 +747,8 @@ #define TR_CLEAR "Clear" #define TR_RESET "Reset" #define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Smooth" #define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Store mAh" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 31781cba6..61c59d71b 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -95,6 +95,9 @@ #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "Kein\0 Pieps\0Stimme" +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -744,6 +747,8 @@ #define TR_CLEAR "Clear" #define TR_RESET "Reset" #define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Smooth" #define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Speichern mAh" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 36a9f0fc5..47b64eb9f 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -98,6 +98,9 @@ #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -752,6 +755,8 @@ #define TR_CLEAR "Clear" #define TR_RESET "Reset" #define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Smooth" #define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Store mAh" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 7fa022b6c..e63680bc6 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -98,6 +98,9 @@ #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voz\0" +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -742,6 +745,8 @@ #define TR_CLEAR "Clear" #define TR_RESET "Reset" #define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Smooth" #define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Valor mAh" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index a7e964d47..4763b849f 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -98,6 +98,9 @@ #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -742,6 +745,8 @@ #define TR_CLEAR "Clear" #define TR_RESET "Reset" #define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Smooth" #define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Store mAh" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 69c07ed35..733dfb6e5 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -95,6 +95,9 @@ #define LEN_VBEEPCOUNTDOWN "\007" #define TR_VBEEPCOUNTDOWN "Silence""Bips\0 ""Voix\0 " +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Libre\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -749,6 +752,8 @@ #define TR_CLEAR "Réinitialiser" #define TR_RESET "Reset" #define TR_COUNT "Nb Points" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Lissage" #define TR_COPY_TRIMS_TO_OFS "Trims vers offsets" #define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh", INDENT "Enregistrer mAh") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 4092fec75..336f03e83 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -98,6 +98,9 @@ #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "NienteSuoni\0Voce\0 " +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -742,6 +745,8 @@ #define TR_CLEAR "Clear" #define TR_RESET "Reset" #define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Smooth" #define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Store mAh" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index a397d391f..5991084ad 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -98,6 +98,9 @@ #define LEN_VBEEPCOUNTDOWN "\007" #define TR_VBEEPCOUNTDOWN "Cichy\0 ""Pikanie""Dźwięki" +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -742,6 +745,8 @@ #define TR_CLEAR "Clear" #define TR_RESET "Reset" #define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Smooth" #define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Zapisz mAh" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index c56c39f3d..79faa8ddc 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -98,6 +98,9 @@ #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -742,6 +745,8 @@ #define TR_CLEAR "Clear" #define TR_RESET "Reset" #define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" #define TR_SMOOTH "Smooth" #define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Store mAh" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b5ac29d84..0962277bf 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -98,6 +98,9 @@ #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "Tyst\0 Pip\0 Röst\0 " +#define LEN_CURVE_TYPES "\010" +#define TR_CURVE_TYPES "Standard""Custom\0" + #define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) @@ -746,6 +749,19 @@ #define TR_COUNT "Antal" #define TR_SMOOTH "Mjuk" #define TR_COPY_TRIMS_TO_OFS "Spara trimmar som offset" +======= +#define TR_ENABLE_POPUP "Enable Popup" +#define TR_DISABLE_POPUP "Disable Popup" +#define TR_CURVE_PRESET "Preset..." +#define TR_PRESET "Preset" +#define TR_MIRROR "Mirror" +#define TR_CLEAR "Clear" +#define TR_RESET "Reset" +#define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" +#define TR_SMOOTH "Smooth" +#define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Lagra mAh" #define TR_PREFLIGHT "Startkontroller" #define TR_CHECKLIST INDENT "Visa checklisa"