From 0c11566f426acf6befd51e9693eece83620696d0 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 26 Apr 2016 23:32:15 -0700 Subject: [PATCH] Replace LANGUAGE_INCLUDE with LCD_LANGUAGE --- Marlin/Configuration.h | 2 +- Marlin/SanityCheck.h | 2 ++ .../example_configurations/Felix/Configuration.h | 2 +- .../Felix/Configuration_DUAL.h | 2 +- .../Hephestos/Configuration.h | 2 +- .../Hephestos_2/Configuration.h | 2 +- .../example_configurations/K8200/Configuration.h | 2 +- .../RepRapWorld/Megatronics/Configuration.h | 2 +- .../RigidBot/Configuration.h | 2 +- .../example_configurations/SCARA/Configuration.h | 2 +- .../example_configurations/TAZ4/Configuration.h | 2 +- .../WITBOX/Configuration.h | 2 +- .../adafruit/ST7565/Configuration.h | 2 +- .../delta/biv2.5/Configuration.h | 2 +- .../delta/generic/Configuration.h | 2 +- .../delta/kossel_mini/Configuration.h | 2 +- .../delta/kossel_pro/Configuration.h | 2 +- .../delta/kossel_xl/Configuration.h | 2 +- .../makibox/Configuration.h | 2 +- .../tvrrug/Round2/Configuration.h | 2 +- Marlin/language.h | 16 +++++++++------- 21 files changed, 30 insertions(+), 26 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9ecfad283c..e433314830 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -771,7 +771,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 9f918781ea..70553f6f55 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -506,6 +506,8 @@ #error DISABLE_MAX_ENDSTOPS and DISABLE_MIN_ENDSTOPS deprecated. Use individual USE_*_PLUG options instead. #elif ENABLED(Z_DUAL_ENDSTOPS) && !defined(Z2_USE_ENDSTOP) #error Z_DUAL_ENDSTOPS settings are simplified. Just set Z2_USE_ENDSTOP to the endstop you want to repurpose for Z2 +#elif defined(LANGUAGE_INCLUDE) + #error LANGUAGE_INCLUDE has been replaced by LCD_LANGUAGE. Please update your configuration. #endif #endif //SANITYCHECK_H diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 7c23be9b8e..ca3bf1f8c5 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -753,7 +753,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +//#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 3da920c125..0cd247491a 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -750,7 +750,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +//#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index cd666eb501..80adf1d2fc 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -762,7 +762,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +//#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 0490108940..85d47b07e5 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -764,7 +764,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index f276919254..e0959afff8 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -787,7 +787,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index b86d79efa7..c41b4af61c 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -770,7 +770,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 7e56111574..2198dd5784 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -765,7 +765,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index e74071d79c..f65c2d32da 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -778,7 +778,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +//#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 8b91f45815..997170a590 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -791,7 +791,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 7e64c38483..2eeb2a3c2a 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -762,7 +762,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +//#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 90a7026962..f284f72900 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -770,7 +770,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index fd1d0ca7f9..80c3f9d3d8 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -899,7 +899,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index de116a9477..6303c4412c 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -899,7 +899,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index bb9cce1bbc..dc525e73df 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -903,7 +903,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 4df6821927..fc6ad03585 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -896,7 +896,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 276a194d72..44b835987c 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -904,7 +904,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index de0dc03a72..d75cc382bb 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -773,7 +773,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +//#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index d9cd68d7bc..b68021ca92 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -764,7 +764,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, // fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test // -//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +//#define LCD_LANGUAGE en /** * LCD Character Set diff --git a/Marlin/language.h b/Marlin/language.h index a88aacace9..179b1f7109 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -25,7 +25,10 @@ #include "Configuration.h" -#define GENERATE_LANGUAGE_INCLUDE(M) STRINGIFY_(language_##M.h) +// Fallback if no language is set. DON'T CHANGE +#ifndef LCD_LANGUAGE + #define LCD_LANGUAGE en +#endif // For character-based LCD controllers (DISPLAY_CHARSET_HD44780) #define JAPANESE 1 @@ -62,11 +65,6 @@ // cn Chinese // cz Czech -// fallback if no language is set, don't change -#ifndef LANGUAGE_INCLUDE - #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) -#endif - #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else @@ -236,7 +234,11 @@ // LCD Menu Messages -#include LANGUAGE_INCLUDE +#define LANGUAGE_INCL_(M) STRINGIFY_(language_##M.h) +#define LANGUAGE_INCL(M) LANGUAGE_INCL_(M) +#define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE) + +#include INCLUDE_LANGUAGE #include "language_en.h" #endif //__LANGUAGE_H