From dc5bf2117192c34e48bce1446bd2b2955920cf12 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 30 Oct 2012 17:46:19 +0000 Subject: [PATCH] [!stock] No variant displayed as it is not needed --- src/general_menus.cpp | 1 - src/stamp.cpp | 4 ++++ src/translations.cpp | 1 - src/translations.h | 1 - src/translations/cz.h | 1 - src/translations/de.h | 1 - src/translations/en.h | 1 - src/translations/es.h | 1 - src/translations/fr.h | 1 - src/translations/it.h | 1 - src/translations/se.h | 1 - 11 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/general_menus.cpp b/src/general_menus.cpp index a06cfda53..041dda397 100644 --- a/src/general_menus.cpp +++ b/src/general_menus.cpp @@ -792,7 +792,6 @@ void menuGeneralVersion(uint8_t event) } #endif lcd_putsLeft(7*FH, eeprom_stamp); - // TODO remove lcd_putsLeft(7*FH, STR_EEPROMV); } void displayKeyState(uint8_t x, uint8_t y, EnumKeys key) diff --git a/src/stamp.cpp b/src/stamp.cpp index c158967e5..c9f787035 100644 --- a/src/stamp.cpp +++ b/src/stamp.cpp @@ -40,4 +40,8 @@ const pm_char stamp1[] PROGMEM = " SVN: " SVN_STR; const pm_char stamp2[] PROGMEM = "DATE: " DATE_STR; const pm_char stamp3[] PROGMEM = "TIME: " TIME_STR; +#if defined(M64) const pm_char eeprom_stamp[] PROGMEM = "EEPR: " DEFNUMSTR(EEPROM_VER) "-" DEFNUMSTR(EEPROM_VARIANT); +#else +const pm_char eeprom_stamp[] PROGMEM = "EEPR: " DEFNUMSTR(EEPROM_VER); +#endif diff --git a/src/translations.cpp b/src/translations.cpp index a0a614410..85431fae9 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -199,7 +199,6 @@ const pm_char STR_SLAVE[] PROGMEM = TR_SLAVE; const pm_char STR_MODESRC[] PROGMEM = TR_MODESRC; const pm_char STR_MULTIPLIER[] PROGMEM = TR_MULTIPLIER; const pm_char STR_CAL[] PROGMEM = TR_CAL; -const pm_char STR_EEPROMV[] PROGMEM = TR_EEPROMV; const pm_char STR_VTRIM[] PROGMEM = TR_VTRIM; const pm_char STR_BG[] PROGMEM = TR_BG; const pm_char STR_MENUTOSTART[] PROGMEM = TR_MENUTOSTART; diff --git a/src/translations.h b/src/translations.h index 4b1f5b8d5..95b4f330b 100644 --- a/src/translations.h +++ b/src/translations.h @@ -304,7 +304,6 @@ extern const pm_char STR_MODESRC[]; extern const pm_char STR_MULTIPLIER[]; #define LEN_MULTIPLIER PSIZE(TR_MULTIPLIER) extern const pm_char STR_CAL[]; -extern const pm_char STR_EEPROMV[]; extern const pm_char STR_VTRIM[]; extern const pm_char STR_BG[]; extern const pm_char STR_MENUTOSTART[]; diff --git a/src/translations/cz.h b/src/translations/cz.h index bfe0f76c9..38b21336e 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -324,7 +324,6 @@ #define TR_MODESRC " M\205d\006% Zdroj" #define TR_MULTIPLIER "N\200sobi\201" #define TR_CAL "Kal." -#define TR_EEPROMV "EEpr:\010-" #define TR_VTRIM "Trim- +" #define TR_BG "BG:" #define TR_MENUTOSTART "\001[MENU] = START" diff --git a/src/translations/de.h b/src/translations/de.h index fd5685358..3073d301a 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -325,7 +325,6 @@ #define TR_MODESRC "MODE\003% QUELLE" #define TR_MULTIPLIER "Multiplikator" #define TR_CAL "Kal." -#define TR_EEPROMV "EEpr:\004-" #define TR_VTRIM "Trim- +" #define TR_BG "BG:" #define TR_MENUTOSTART "[MENU] > Starten" diff --git a/src/translations/en.h b/src/translations/en.h index 875c3a245..2bd460428 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -325,7 +325,6 @@ #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "Multiplier" #define TR_CAL "Cal" -#define TR_EEPROMV "EEpr:\010-" #define TR_VTRIM "Trim- +" #define TR_BG "BG:" #define TR_MENUTOSTART "[MENU] TO START" diff --git a/src/translations/es.h b/src/translations/es.h index 28dd71e56..66773c48c 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -322,7 +322,6 @@ #define TR_MODESRC "modo\006% src" #define TR_MULTIPLIER "Multiplicar" #define TR_CAL "Cal" -#define TR_EEPROMV "EEpr:\010-" #define TR_VTRIM "Ajte- +" #define TR_BG "BG:" #define TR_MENUTOSTART "[MENU] INICIAR" diff --git a/src/translations/fr.h b/src/translations/fr.h index 4e9e144c8..315a07e21 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -325,7 +325,6 @@ #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "Multiplieur" #define TR_CAL "Cal" -#define TR_EEPROMV "EEpr:\010-" #define TR_VTRIM "Trim- +" #define TR_BG "BG:" #define TR_MENUTOSTART "[MENU] POUR DEBUT" diff --git a/src/translations/it.h b/src/translations/it.h index 40924f342..1d73a8032 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -325,7 +325,6 @@ #define TR_MODESRC "mode\003% src" #define TR_MULTIPLIER "Moltiplica" #define TR_CAL "Cal" -#define TR_EEPROMV "EEpr:\004-" #define TR_VTRIM "Trim- +" #define TR_BG "BG:" #define TR_MENUTOSTART "[Men\200] per Cal." diff --git a/src/translations/se.h b/src/translations/se.h index 680a6e48b..d6108dd94 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -328,7 +328,6 @@ #define TR_MODESRC " l\201ge\006% k\201lla" #define TR_MULTIPLIER "Styrka" #define TR_CAL "Kalib." -#define TR_EEPROMV "EEpr:\010-" #define TR_VTRIM "Trim- +" #define TR_BG "BG:" #define TR_MENUTOSTART "[MENU] STARTAR"