From 1883e1bb602ad054b2dfeb5ae0d65b278ad8475c Mon Sep 17 00:00:00 2001
From: AnHardt <github@kitelab.de>
Date: Tue, 17 Mar 2015 11:23:44 +0100
Subject: [PATCH] Applied thinkyheads corrections from 2015-03-17
---
Marlin/Configuration.h | 4 +--
Marlin/dogm_lcd_implementation.h | 4 +--
Marlin/language.h | 4 +--
Marlin/language_an.h | 2 +-
Marlin/language_ca.h | 2 +-
Marlin/language_de.h | 2 +-
Marlin/language_es.h | 2 +-
Marlin/language_eu.h | 2 +-
Marlin/language_fi.h | 2 +-
Marlin/language_fr.h | 2 +-
Marlin/language_it.h | 2 +-
Marlin/language_kana.h | 2 +-
Marlin/language_kana_utf8.h | 2 +-
Marlin/language_nl.h | 2 +-
Marlin/language_pl.h | 2 +-
Marlin/language_pt-br.h | 2 +-
Marlin/language_pt.h | 2 +-
Marlin/language_ru.h | 2 +-
Marlin/language_test.h | 2 +-
Marlin/utf_mapper.h | 44 ++++++++++++++++----------------
20 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 87102f79a1..1a432f1cc7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -558,10 +558,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
// 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.
// 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.
-// Se also documentation/LCDLanguageFont.md
+// See also documentation/LCDLanguageFont.md
#define DISPLAY_CHARSET_HD44780_JAPAN // this is the most common hardware
//#define DISPLAY_CHARSET_HD44780_WESTERN
- //#define DISPLAY_CHARSET_HD44780_CYRILIC
+ //#define DISPLAY_CHARSET_HD44780_CYRILLIC
//#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h
index c13c2d32e1..f92696ac80 100644
--- a/Marlin/dogm_lcd_implementation.h
+++ b/Marlin/dogm_lcd_implementation.h
@@ -14,8 +14,6 @@
#ifndef DOGM_LCD_IMPLEMENTATION_H
#define DOGM_LCD_IMPLEMENTATION_H
-#define MARLIN_VERSION "1.0.2"
-
/**
* Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays.
*/
@@ -71,7 +69,7 @@
#elif defined( DISPLAY_CHARSET_HD44780_WESTERN )
#include "dogm_font_data_HD44780_W.h"
#define FONT_MENU_NAME HD44780_W_5x7
- #elif defined( DISPLAY_CHARSET_HD44780_CYRILIC )
+ #elif defined( DISPLAY_CHARSET_HD44780_CYRILLIC )
#include "dogm_font_data_HD44780_C.h"
#define FONT_MENU_NAME HD44780_C_5x7
#else // fall-back
diff --git a/Marlin/language.h b/Marlin/language.h
index 5055814966..559e33571b 100644
--- a/Marlin/language.h
+++ b/Marlin/language.h
@@ -11,7 +11,7 @@
//
// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h"
// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
-// Se also documentation/LCDLanguageFont.md
+// See also documentation/LCDLanguageFont.md
// Languages
// en English
@@ -203,7 +203,7 @@
// LCD Menu Messages
-#if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILIC ))
+#if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILLIC ))
#define DISPLAY_CHARSET_HD44780_JAPAN
#endif
diff --git a/Marlin/language_an.h b/Marlin/language_an.h
index aef304075b..b8e83d3b3c 100644
--- a/Marlin/language_an.h
+++ b/Marlin/language_an.h
@@ -2,7 +2,7 @@
* Aragonese
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_AN_H
diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h
index 8f00f8b7db..f25fe57890 100644
--- a/Marlin/language_ca.h
+++ b/Marlin/language_ca.h
@@ -2,7 +2,7 @@
* Catalan
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_CA_H
diff --git a/Marlin/language_de.h b/Marlin/language_de.h
index 2487ba93a2..0f7b832a58 100644
--- a/Marlin/language_de.h
+++ b/Marlin/language_de.h
@@ -2,7 +2,7 @@
* German
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_DE_H
diff --git a/Marlin/language_es.h b/Marlin/language_es.h
index 1602c3c1c4..143a1f4579 100644
--- a/Marlin/language_es.h
+++ b/Marlin/language_es.h
@@ -2,7 +2,7 @@
* Spanish
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_ES_H
diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h
index 9bce0a7c1a..21cb733a1c 100644
--- a/Marlin/language_eu.h
+++ b/Marlin/language_eu.h
@@ -2,7 +2,7 @@
* Basque-Euskera
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_EU_H
diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h
index 711f096395..e1bfbf1af3 100644
--- a/Marlin/language_fi.h
+++ b/Marlin/language_fi.h
@@ -2,7 +2,7 @@
* Finnish
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_FI_H
diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h
index 7e1194d7b2..ed65efdbde 100644
--- a/Marlin/language_fr.h
+++ b/Marlin/language_fr.h
@@ -2,7 +2,7 @@
* French
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_FR_H
diff --git a/Marlin/language_it.h b/Marlin/language_it.h
index 5b2709faf8..7fbcb46ac6 100644
--- a/Marlin/language_it.h
+++ b/Marlin/language_it.h
@@ -2,7 +2,7 @@
* Italian
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_IT_H
diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h
index 5810fa11d4..272440bac6 100644
--- a/Marlin/language_kana.h
+++ b/Marlin/language_kana.h
@@ -2,7 +2,7 @@
* Japanese (Kana)
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h
index d08c188337..94ce69bc4f 100644
--- a/Marlin/language_kana_utf8.h
+++ b/Marlin/language_kana_utf8.h
@@ -2,7 +2,7 @@
* Japanese (Kana UTF8 version)
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h
index 81eef72bbb..bc44dcc7ef 100644
--- a/Marlin/language_nl.h
+++ b/Marlin/language_nl.h
@@ -2,7 +2,7 @@
* Dutch
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_NL_H
diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h
index 2d56430248..f654594bc4 100644
--- a/Marlin/language_pl.h
+++ b/Marlin/language_pl.h
@@ -2,7 +2,7 @@
* Polish
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_PL_H
diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h
index 734272a299..060f3ba89b 100644
--- a/Marlin/language_pt-br.h
+++ b/Marlin/language_pt-br.h
@@ -2,7 +2,7 @@
* Portuguese (Brazil)
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_PT_BR_H
diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h
index 08274e112f..9d3ff26540 100644
--- a/Marlin/language_pt.h
+++ b/Marlin/language_pt.h
@@ -2,7 +2,7 @@
* Portuguese
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_PT_H
diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h
index 3e33598555..b961be7eef 100644
--- a/Marlin/language_ru.h
+++ b/Marlin/language_ru.h
@@ -2,7 +2,7 @@
* Russian
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_RU_H
diff --git a/Marlin/language_test.h b/Marlin/language_test.h
index da79d4f1b6..57505bc130 100644
--- a/Marlin/language_test.h
+++ b/Marlin/language_test.h
@@ -2,7 +2,7 @@
* TEST
*
* LCD Menu Messages
- * Se also documentation/LCDLanguageFont.md
+ * See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_TEST_H
diff --git a/Marlin/utf_mapper.h b/Marlin/utf_mapper.h
index 5a0ba2f43c..69e2e5da59 100644
--- a/Marlin/utf_mapper.h
+++ b/Marlin/utf_mapper.h
@@ -4,9 +4,9 @@
#include "language.h"
#ifdef DOGLCD
- #define HARDWAERE_CHAR_OUT u8g.print
+ #define HARDWARE_CHAR_OUT u8g.print
#else
- #define HARDWAERE_CHAR_OUT lcd.write
+ #define HARDWARE_CHAR_OUT lcd.write
#endif
#if !(defined( SIMULATE_ROMFONT )) && defined( DOGLCD )
@@ -90,7 +90,7 @@
#error( "Katakana on a western display makes no sense. There are no matching symbols." );
#endif
- #elif defined( DISPLAY_CHARSET_HD44780_CYRILIC )
+ #elif defined( DISPLAY_CHARSET_HD44780_CYRILLIC )
#if defined( MAPPER_D0D1 )
#define MAPPER_D0D1_MOD
// it is a Russian alphabet translation
@@ -120,12 +120,12 @@
#endif
#else
#error("Something went wrong in the selection of DISPLAY_CHARSET_HD44780's");
- #endif // DISPLAY_CHARSET_HD44780_CYRILIC
+ #endif // DISPLAY_CHARSET_HD44780_CYRILLIC
#endif // SIMULATE_ROMFONT
#if defined( MAPPER_NON )
char charset_mapper(char c){
- HARDWAERE_CHAR_OUT( c );
+ HARDWARE_CHAR_OUT( c );
return 1;
}
#elif defined( MAPPER_C2C3 )
@@ -142,17 +142,17 @@
else if (seen_c2){
d &= 0x3f;
#ifndef MAPPER_ONE_TO_ONE
- HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
+ HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
#else
- HARDWAERE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
+ HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
#endif
}
else {
- HARDWAERE_CHAR_OUT('?');
+ HARDWARE_CHAR_OUT('?');
}
}
else {
- HARDWAERE_CHAR_OUT((char) c );
+ HARDWARE_CHAR_OUT((char) c );
}
seen_c2 = false;
return 1;
@@ -172,18 +172,18 @@
} else if (seen_d5) {
d &= 0x3f;
if ( !utf_hi_char && ( d == 1 )) {
- HARDWAERE_CHAR_OUT((char) 0xa2 ); // Ё
+ HARDWARE_CHAR_OUT((char) 0xa2 ); // Ё
} else if ((utf_hi_char == 1) && (d == 0x11)) {
- HARDWAERE_CHAR_OUT((char) 0xb5 ); // ё
+ HARDWARE_CHAR_OUT((char) 0xb5 ); // ё
} else {
- HARDWAERE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
+ HARDWARE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
}
}
else {
- HARDWAERE_CHAR_OUT('?');
+ HARDWARE_CHAR_OUT('?');
}
} else {
- HARDWAERE_CHAR_OUT((char) c );
+ HARDWARE_CHAR_OUT((char) c );
}
seen_d5 = false;
return 1;
@@ -201,15 +201,15 @@
} else if (seen_d5) {
d &= 0x3fu;
#ifndef MAPPER_ONE_TO_ONE
- HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
+ HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
#else
- HARDWAERE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
+ HARDWARE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
#endif
} else {
- HARDWAERE_CHAR_OUT('?');
+ HARDWARE_CHAR_OUT('?');
}
} else {
- HARDWAERE_CHAR_OUT((char) c );
+ HARDWARE_CHAR_OUT((char) c );
}
seen_d5 = false;
return 1;
@@ -231,15 +231,15 @@
} else if ((seen_e3 == true) && (seen_82_83 == true)){
d &= 0x3f;
#ifndef MAPPER_ONE_TO_ONE
- HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
+ HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
#else
- HARDWAERE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
+ HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
#endif
} else {
- HARDWAERE_CHAR_OUT((char) '?' );
+ HARDWARE_CHAR_OUT((char) '?' );
}
} else {
- HARDWAERE_CHAR_OUT((char) c );
+ HARDWARE_CHAR_OUT((char) c );
}
seen_e3 = false;
seen_82_83 = false;
--
GitLab