Browse Source

Applied thinkyheads corrections from 2015-03-17

AnHardt 10 years ago
parent
commit
1883e1bb60

+ 2
- 2
Marlin/Configuration.h View File

558
 
558
 
559
 // Chose ONE of the next three charsets. This has to match your hardware. In case of a full graphic display this information is not important.
559
 // Chose ONE of the next three charsets. This has to match your hardware. In case of a full graphic display this information is not important.
560
 // To find out what type you have - compile with (test) - upload - click to get the menu. You'll see two typical lines from the upper half of the charset.
560
 // To find out what type you have - compile with (test) - upload - click to get the menu. You'll see two typical lines from the upper half of the charset.
561
-// Se also documentation/LCDLanguageFont.md
561
+// See also documentation/LCDLanguageFont.md
562
   #define DISPLAY_CHARSET_HD44780_JAPAN        // this is the most common hardware
562
   #define DISPLAY_CHARSET_HD44780_JAPAN        // this is the most common hardware
563
   //#define DISPLAY_CHARSET_HD44780_WESTERN
563
   //#define DISPLAY_CHARSET_HD44780_WESTERN
564
-  //#define DISPLAY_CHARSET_HD44780_CYRILIC
564
+  //#define DISPLAY_CHARSET_HD44780_CYRILLIC
565
 
565
 
566
 //#define ULTRA_LCD  //general LCD support, also 16x2
566
 //#define ULTRA_LCD  //general LCD support, also 16x2
567
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
567
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)

+ 1
- 3
Marlin/dogm_lcd_implementation.h View File

14
 #ifndef DOGM_LCD_IMPLEMENTATION_H
14
 #ifndef DOGM_LCD_IMPLEMENTATION_H
15
 #define DOGM_LCD_IMPLEMENTATION_H
15
 #define DOGM_LCD_IMPLEMENTATION_H
16
 
16
 
17
-#define MARLIN_VERSION "1.0.2"
18
-
19
 /**
17
 /**
20
  * Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays.
18
  * Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays.
21
  */
19
  */
71
   #elif defined( DISPLAY_CHARSET_HD44780_WESTERN )
69
   #elif defined( DISPLAY_CHARSET_HD44780_WESTERN )
72
     #include "dogm_font_data_HD44780_W.h"
70
     #include "dogm_font_data_HD44780_W.h"
73
     #define FONT_MENU_NAME HD44780_W_5x7
71
     #define FONT_MENU_NAME HD44780_W_5x7
74
-  #elif defined( DISPLAY_CHARSET_HD44780_CYRILIC )
72
+  #elif defined( DISPLAY_CHARSET_HD44780_CYRILLIC )
75
     #include "dogm_font_data_HD44780_C.h"
73
     #include "dogm_font_data_HD44780_C.h"
76
     #define FONT_MENU_NAME HD44780_C_5x7
74
     #define FONT_MENU_NAME HD44780_C_5x7
77
   #else // fall-back
75
   #else // fall-back

+ 2
- 2
Marlin/language.h View File

11
 //
11
 //
12
 //   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h"
12
 //   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h"
13
 //   ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
13
 //   ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
14
-// Se also documentation/LCDLanguageFont.md
14
+// See also documentation/LCDLanguageFont.md
15
 
15
 
16
 // Languages
16
 // Languages
17
 // en       English
17
 // en       English
203
 // LCD Menu Messages
203
 // LCD Menu Messages
204
 
204
 
205
 
205
 
206
-#if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILIC ))
206
+#if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILLIC ))
207
   #define DISPLAY_CHARSET_HD44780_JAPAN
207
   #define DISPLAY_CHARSET_HD44780_JAPAN
208
 #endif
208
 #endif
209
 
209
 

+ 1
- 1
Marlin/language_an.h View File

2
  * Aragonese
2
  * Aragonese
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_AN_H
8
 #ifndef LANGUAGE_AN_H

+ 1
- 1
Marlin/language_ca.h View File

2
  * Catalan
2
  * Catalan
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_CA_H
8
 #ifndef LANGUAGE_CA_H

+ 1
- 1
Marlin/language_de.h View File

2
  * German
2
  * German
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_DE_H
8
 #ifndef LANGUAGE_DE_H

+ 1
- 1
Marlin/language_es.h View File

2
  * Spanish
2
  * Spanish
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_ES_H
8
 #ifndef LANGUAGE_ES_H

+ 1
- 1
Marlin/language_eu.h View File

2
  * Basque-Euskera
2
  * Basque-Euskera
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_EU_H
8
 #ifndef LANGUAGE_EU_H

+ 1
- 1
Marlin/language_fi.h View File

2
  * Finnish
2
  * Finnish
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_FI_H
8
 #ifndef LANGUAGE_FI_H

+ 1
- 1
Marlin/language_fr.h View File

2
  * French
2
  * French
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_FR_H
8
 #ifndef LANGUAGE_FR_H

+ 1
- 1
Marlin/language_it.h View File

2
  * Italian
2
  * Italian
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_IT_H
8
 #ifndef LANGUAGE_IT_H

+ 1
- 1
Marlin/language_kana.h View File

2
  * Japanese (Kana)
2
  * Japanese (Kana)
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
  
8
  

+ 1
- 1
Marlin/language_kana_utf8.h View File

2
  * Japanese (Kana UTF8 version)
2
  * Japanese (Kana UTF8 version)
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
  
8
  

+ 1
- 1
Marlin/language_nl.h View File

2
  * Dutch
2
  * Dutch
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_NL_H
8
 #ifndef LANGUAGE_NL_H

+ 1
- 1
Marlin/language_pl.h View File

2
  * Polish
2
  * Polish
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_PL_H
8
 #ifndef LANGUAGE_PL_H

+ 1
- 1
Marlin/language_pt-br.h View File

2
  * Portuguese (Brazil)
2
  * Portuguese (Brazil)
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_PT_BR_H
8
 #ifndef LANGUAGE_PT_BR_H

+ 1
- 1
Marlin/language_pt.h View File

2
  * Portuguese
2
  * Portuguese
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_PT_H
8
 #ifndef LANGUAGE_PT_H

+ 1
- 1
Marlin/language_ru.h View File

2
  * Russian
2
  * Russian
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_RU_H
8
 #ifndef LANGUAGE_RU_H

+ 1
- 1
Marlin/language_test.h View File

2
  * TEST
2
  * TEST
3
  *
3
  *
4
  * LCD Menu Messages
4
  * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
5
+ * See also documentation/LCDLanguageFont.md
6
  *
6
  *
7
  */
7
  */
8
 #ifndef LANGUAGE_TEST_H
8
 #ifndef LANGUAGE_TEST_H

+ 22
- 22
Marlin/utf_mapper.h View File

4
 #include  "language.h"
4
 #include  "language.h"
5
 
5
 
6
 #ifdef DOGLCD
6
 #ifdef DOGLCD
7
-  #define HARDWAERE_CHAR_OUT u8g.print
7
+  #define HARDWARE_CHAR_OUT u8g.print
8
 #else
8
 #else
9
-  #define HARDWAERE_CHAR_OUT lcd.write
9
+  #define HARDWARE_CHAR_OUT lcd.write
10
 #endif
10
 #endif
11
 
11
 
12
 #if !(defined( SIMULATE_ROMFONT )) && defined( DOGLCD )
12
 #if !(defined( SIMULATE_ROMFONT )) && defined( DOGLCD )
90
       #error( "Katakana on a western display makes no sense. There are no matching symbols." );
90
       #error( "Katakana on a western display makes no sense. There are no matching symbols." );
91
     #endif
91
     #endif
92
 
92
 
93
-  #elif defined( DISPLAY_CHARSET_HD44780_CYRILIC )
93
+  #elif defined( DISPLAY_CHARSET_HD44780_CYRILLIC )
94
     #if defined( MAPPER_D0D1 )
94
     #if defined( MAPPER_D0D1 )
95
       #define MAPPER_D0D1_MOD
95
       #define MAPPER_D0D1_MOD
96
       // it is a Russian alphabet translation
96
       // it is a Russian alphabet translation
120
     #endif
120
     #endif
121
   #else
121
   #else
122
     #error("Something went wrong in the selection of DISPLAY_CHARSET_HD44780's");
122
     #error("Something went wrong in the selection of DISPLAY_CHARSET_HD44780's");
123
-  #endif // DISPLAY_CHARSET_HD44780_CYRILIC
123
+  #endif // DISPLAY_CHARSET_HD44780_CYRILLIC
124
 #endif // SIMULATE_ROMFONT
124
 #endif // SIMULATE_ROMFONT
125
 
125
 
126
 #if defined( MAPPER_NON )
126
 #if defined( MAPPER_NON )
127
   char charset_mapper(char c){
127
   char charset_mapper(char c){
128
-    HARDWAERE_CHAR_OUT( c );
128
+    HARDWARE_CHAR_OUT( c );
129
     return 1;
129
     return 1;
130
   }
130
   }
131
 #elif defined( MAPPER_C2C3 )
131
 #elif defined( MAPPER_C2C3 )
142
       else if (seen_c2){
142
       else if (seen_c2){
143
         d &= 0x3f;
143
         d &= 0x3f;
144
         #ifndef MAPPER_ONE_TO_ONE
144
         #ifndef MAPPER_ONE_TO_ONE
145
-          HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
145
+          HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
146
         #else
146
         #else
147
-          HARDWAERE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
147
+          HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
148
         #endif
148
         #endif
149
       }
149
       }
150
       else {
150
       else {
151
-          HARDWAERE_CHAR_OUT('?');
151
+          HARDWARE_CHAR_OUT('?');
152
       }
152
       }
153
     }
153
     }
154
     else {
154
     else {
155
-      HARDWAERE_CHAR_OUT((char) c );
155
+      HARDWARE_CHAR_OUT((char) c );
156
     }
156
     }
157
     seen_c2 = false;
157
     seen_c2 = false;
158
     return 1;
158
     return 1;
172
       } else if (seen_d5) {
172
       } else if (seen_d5) {
173
           d &= 0x3f;
173
           d &= 0x3f;
174
           if ( !utf_hi_char && ( d == 1 )) {
174
           if ( !utf_hi_char && ( d == 1 )) {
175
-            HARDWAERE_CHAR_OUT((char) 0xa2 ); // Ё
175
+            HARDWARE_CHAR_OUT((char) 0xa2 ); // Ё
176
         } else if ((utf_hi_char == 1) && (d == 0x11)) {
176
         } else if ((utf_hi_char == 1) && (d == 0x11)) {
177
-            HARDWAERE_CHAR_OUT((char) 0xb5 ); // ё
177
+            HARDWARE_CHAR_OUT((char) 0xb5 ); // ё
178
           } else {
178
           } else {
179
-            HARDWAERE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
179
+            HARDWARE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
180
           }
180
           }
181
         }
181
         }
182
         else {
182
         else {
183
-          HARDWAERE_CHAR_OUT('?');
183
+          HARDWARE_CHAR_OUT('?');
184
         }
184
         }
185
     } else {
185
     } else {
186
-      HARDWAERE_CHAR_OUT((char) c );
186
+      HARDWARE_CHAR_OUT((char) c );
187
     }
187
     }
188
     seen_d5 = false;
188
     seen_d5 = false;
189
     return 1;
189
     return 1;
201
       } else if (seen_d5) {
201
       } else if (seen_d5) {
202
           d &= 0x3fu;
202
           d &= 0x3fu;
203
         #ifndef MAPPER_ONE_TO_ONE
203
         #ifndef MAPPER_ONE_TO_ONE
204
-          HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
204
+          HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
205
         #else
205
         #else
206
-          HARDWAERE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
206
+          HARDWARE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
207
         #endif
207
         #endif
208
       } else {
208
       } else {
209
-        HARDWAERE_CHAR_OUT('?');
209
+        HARDWARE_CHAR_OUT('?');
210
       }
210
       }
211
     } else {
211
     } else {
212
-      HARDWAERE_CHAR_OUT((char) c );
212
+      HARDWARE_CHAR_OUT((char) c );
213
     }
213
     }
214
     seen_d5 = false;
214
     seen_d5 = false;
215
     return 1;
215
     return 1;
231
       } else if ((seen_e3 == true) && (seen_82_83 == true)){
231
       } else if ((seen_e3 == true) && (seen_82_83 == true)){
232
         d &= 0x3f;
232
         d &= 0x3f;
233
         #ifndef MAPPER_ONE_TO_ONE
233
         #ifndef MAPPER_ONE_TO_ONE
234
-          HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
234
+          HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
235
         #else
235
         #else
236
-          HARDWAERE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
236
+          HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
237
         #endif
237
         #endif
238
       } else {
238
       } else {
239
-        HARDWAERE_CHAR_OUT((char) '?' );
239
+        HARDWARE_CHAR_OUT((char) '?' );
240
       }
240
       }
241
     } else {
241
     } else {
242
-      HARDWAERE_CHAR_OUT((char) c );
242
+      HARDWARE_CHAR_OUT((char) c );
243
     }
243
     }
244
     seen_e3 = false;
244
     seen_e3 = false;
245
     seen_82_83 = false;
245
     seen_82_83 = false;

Loading…
Cancel
Save