SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Replace LANGUAGE_INCLUDE with LCD_LANGUAGE

Browse source
This commit is contained in:
Scott Lahteine 2016-04-26 23:32:15 -07:00
parent 259794c0be
commit 0c11566f42
21 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/SanityCheck.h
View file

@ -506,6 +506,8 @@
#error DISABLE_MAX_ENDSTOPS and DISABLE_MIN_ENDSTOPS deprecated. Use individual USE_*_PLUG options instead. #error DISABLE_MAX_ENDSTOPS and DISABLE_MIN_ENDSTOPS deprecated. Use individual USE_*_PLUG options instead.
#elif ENABLED(Z_DUAL_ENDSTOPS) && !defined(Z2_USE_ENDSTOP) #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 #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
#endif //SANITYCHECK_H #endif //SANITYCHECK_H

2
Marlin/example_configurations/Felix/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/Felix/Configuration_DUAL.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/Hephestos/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/Hephestos_2/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/K8200/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/RigidBot/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/SCARA/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/TAZ4/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/WITBOX/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/delta/biv2.5/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/delta/generic/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/makibox/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

2
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file

@ -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, // 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 // 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 * LCD Character Set

16
Marlin/language.h
View file

@ -25,7 +25,10 @@
#include "Configuration.h" #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) // For character-based LCD controllers (DISPLAY_CHARSET_HD44780)
#define JAPANESE 1 #define JAPANESE 1
@ -62,11 +65,6 @@
// cn Chinese // cn Chinese
// cz Czech // 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) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
@ -236,7 +234,11 @@
// LCD Menu Messages // 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" #include "language_en.h"
#endif //__LANGUAGE_H #endif //__LANGUAGE_H