浏览代码

Improve new charset featur.

Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
AnHardt 10 年前
父节点
当前提交
8dce5a6644
共有 1 个文件被更改,包括 17 次插入19 次删除
  1. 17
    19
      Marlin/language.h

+ 17
- 19
Marlin/language.h 查看文件

@@ -161,25 +161,19 @@
161 161
 
162 162
 // LCD Menu Messages
163 163
 
164
-#define STR_Ae "Ae" // No charset known now. Default will be overruled when we know.
165
-#define STR_ae "ae"
166
-#define STR_Oe "Oe"
167
-#define STR_oe "oe"
168
-#define STR_Ue "Ue"
169
-#define STR_ue "ue"
170
-#define STR_sz "ss"
171
-#define STR_Deg ""
172
-#define STR_THERMOMETER "\302"
173
-
174
-#ifdef DISPLAY_CHARSET_DOGM
175
-  #define STR_Ae "\304" // U8glib
176
-  #define STR_ae "\344"
177
-  #define STR_Oe "\326"
178
-  #define STR_oe STR_Oe
179
-  #define STR_Ue "\334"
180
-  #define STR_ue STR_Ue
181
-  #define STR_sz "\337"
182
-  #define STR_Deg "\260"
164
+// Add your own character. Reference: https://github.com/MarlinFirmware/Marlin/pull/1434 photos
165
+//                                and https://www.sparkfun.com/datasheets/LCD/HD44780.pdf page 17-18
166
+#ifdef DOGLCD
167
+  #define STR_Ae "\304"               // 'Ä' U8glib
168
+  #define STR_ae "\344"               // 'ä'
169
+  #define STR_Oe "\326"               // 'Ö'
170
+  #define STR_oe STR_Oe               // 'ö'
171
+  #define STR_Ue "\334"               // 'Ü'
172
+  #define STR_ue STR_Ue               // 'ü'
173
+  #define STR_sz "\337"               // 'ß'
174
+  #define STR_h2 "\262"               // '²'
175
+  #define STR_h3 "\263"               // '³'
176
+  #define STR_Deg "\260"              // '°'
183 177
   #define STR_THERMOMETER "\377"
184 178
 #endif
185 179
 #ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan)
@@ -190,6 +184,8 @@
190 184
   #define STR_ue "\365"
191 185
   #define STR_Ue STR_ue
192 186
   #define STR_sz "\342"
187
+  #define STR_h2 "2"
188
+  #define STR_h3 "3"
193 189
   #define STR_Deg "\271"
194 190
   #define STR_THERMOMETER "\302"
195 191
 #endif
@@ -201,6 +197,8 @@
201 197
   #define STR_Ue "\212"
202 198
   #define STR_ue "\201"
203 199
   #define STR_sz "\160"
200
+  #define STR_h2 "\262"
201
+  #define STR_h3 "\263"
204 202
   #define STR_Deg "\337"
205 203
   #define STR_THERMOMETER "\302"
206 204
 #endif

正在加载...
取消
保存