MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h"

Browse Source 
This reverts commit 4d5b0e2037.
This commit is contained in:
AnHardt 2015-01-30 22:42:44 +01:00
parent 4d5b0e2037
commit 76bf93efcb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/language.h
View File

@ -2,7 +2,6 @@
#define LANGUAGE_H #define LANGUAGE_H
#include "Configuration.h" #include "Configuration.h"
#include "ultralcd_implementation_hitachi_HD44780.h"
#define LANGUAGE_CONCAT(M) #M #define LANGUAGE_CONCAT(M) #M
#define GENERATE_LANGUAGE_INCLUDE(M) LANGUAGE_CONCAT(language_##M.h) #define GENERATE_LANGUAGE_INCLUDE(M) LANGUAGE_CONCAT(language_##M.h)
@ -173,7 +172,7 @@
#define STR_ue "ue" #define STR_ue "ue"
#define STR_sz "ss" #define STR_sz "ss"
#define STR_Deg "" #define STR_Deg ""
#define STR_THERMOMETER LCD_STR_THERMOMETER #define STR_THERMOMETER "\302"
#ifdef DISPLAY_CHARSET_DOGM #ifdef DISPLAY_CHARSET_DOGM
#define STR_Ae "\304" // U8glib #define STR_Ae "\304" // U8glib
@ -195,7 +194,7 @@
#define STR_Ue STR_ue #define STR_Ue STR_ue
#define STR_sz "\342" #define STR_sz "\342"
#define STR_Deg "\271" #define STR_Deg "\271"
#define STR_THERMOMETER LCD_STR_THERMOMETER #define STR_THERMOMETER "\302"
#endif #endif
#ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western) #ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western)
#define STR_Ae "\216" #define STR_Ae "\216"
@ -206,7 +205,7 @@
#define STR_ue "\201" #define STR_ue "\201"
#define STR_sz "\160" #define STR_sz "\160"
#define STR_Deg "\337" #define STR_Deg "\337"
#define STR_THERMOMETER LCD_STR_THERMOMETER #define STR_THERMOMETER "\302"
#endif #endif
/* /*