Browse Source

Ups. #else added

AnHardt 10 years ago
parent
commit
2dd43a82b1
1 changed files with 27 additions and 27 deletions
  1. 27
    27
      Marlin/language.h

+ 27
- 27
Marlin/language.h View File

175
   #define STR_h3 "\263"               // '³'
175
   #define STR_h3 "\263"               // '³'
176
   #define STR_Deg "\260"              // '°'
176
   #define STR_Deg "\260"              // '°'
177
   #define STR_THERMOMETER "\377"
177
   #define STR_THERMOMETER "\377"
178
+#else
179
+  #ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan)
180
+    #define STR_ae "\xe1"
181
+    #define STR_Ae STR_ae
182
+    #define STR_oe "\357"
183
+    #define STR_Oe STR_oe
184
+    #define STR_ue "\365"
185
+    #define STR_Ue STR_ue
186
+    #define STR_sz "\342"
187
+    #define STR_h2 "2"
188
+    #define STR_h3 "3"
189
+    #define STR_Deg "\271"
190
+    #define STR_THERMOMETER "\002"
191
+  #endif
192
+  #ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western)
193
+    #define STR_Ae "\216"
194
+    #define STR_ae "\204"
195
+    #define STR_Oe "\211"
196
+    #define STR_oe "\204"
197
+    #define STR_Ue "\212"
198
+    #define STR_ue "\201"
199
+    #define STR_sz "\160"
200
+    #define STR_h2 "\262"
201
+    #define STR_h3 "\263"
202
+    #define STR_Deg "\337"
203
+    #define STR_THERMOMETER "\002"
204
+  #endif
178
 #endif
205
 #endif
179
-#ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan)
180
-  #define STR_ae "\xe1"
181
-  #define STR_Ae STR_ae
182
-  #define STR_oe "\357"
183
-  #define STR_Oe STR_oe
184
-  #define STR_ue "\365"
185
-  #define STR_Ue STR_ue
186
-  #define STR_sz "\342"
187
-  #define STR_h2 "2"
188
-  #define STR_h3 "3"
189
-  #define STR_Deg "\271"
190
-  #define STR_THERMOMETER "\302"
191
-#endif
192
-#ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western)
193
-  #define STR_Ae "\216"
194
-  #define STR_ae "\204"
195
-  #define STR_Oe "\211"
196
-  #define STR_oe "\204"
197
-  #define STR_Ue "\212"
198
-  #define STR_ue "\201"
199
-  #define STR_sz "\160"
200
-  #define STR_h2 "\262"
201
-  #define STR_h3 "\263"
202
-  #define STR_Deg "\337"
203
-  #define STR_THERMOMETER "\302"
204
-#endif
205
-
206
 /*
206
 /*
207
 #define TESTSTRING000 "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017"
207
 #define TESTSTRING000 "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017"
208
 #define TESTSTRING020 "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
208
 #define TESTSTRING020 "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"

Loading…
Cancel
Save