mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-11-30 15:26:18 +00:00
Merge pull request #1455 from thinkyhead/fix_hd44780_inversion
Fix HD44780 misspelled as HD44870
This commit is contained in:
commit
6cce924cd0
@ -561,8 +561,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
|||||||
//LCD and SD support
|
//LCD and SD support
|
||||||
|
|
||||||
// Character based displays can have different extended charsets.
|
// Character based displays can have different extended charsets.
|
||||||
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
|
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
||||||
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
||||||
|
|
||||||
//#define ULTRA_LCD //general LCD support, also 16x2
|
//#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -567,8 +567,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
|||||||
//LCD and SD support
|
//LCD and SD support
|
||||||
|
|
||||||
// Character based displays can have different extended charsets.
|
// Character based displays can have different extended charsets.
|
||||||
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
|
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
||||||
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
||||||
|
|
||||||
#define ULTRA_LCD //general LCD support, also 16x2
|
#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -575,8 +575,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
|||||||
//LCD and SD support
|
//LCD and SD support
|
||||||
|
|
||||||
// Character based displays can have different extended charsets.
|
// Character based displays can have different extended charsets.
|
||||||
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
|
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
||||||
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
||||||
|
|
||||||
//#define ULTRA_LCD //general LCD support, also 16x2
|
//#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -570,8 +570,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
|||||||
//LCD and SD support
|
//LCD and SD support
|
||||||
|
|
||||||
// Character based displays can have different extended charsets.
|
// Character based displays can have different extended charsets.
|
||||||
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
|
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
||||||
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
||||||
|
|
||||||
//#define ULTRA_LCD //general LCD support, also 16x2
|
//#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -571,8 +571,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
|||||||
//LCD and SD support
|
//LCD and SD support
|
||||||
|
|
||||||
// Character based displays can have different extended charsets.
|
// Character based displays can have different extended charsets.
|
||||||
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
|
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
||||||
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
||||||
|
|
||||||
#define ULTRA_LCD //general LCD support, also 16x2
|
#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -475,8 +475,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
|||||||
//LCD and SD support
|
//LCD and SD support
|
||||||
|
|
||||||
// Character based displays can have different extended charsets.
|
// Character based displays can have different extended charsets.
|
||||||
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
|
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
||||||
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
||||||
|
|
||||||
//#define ULTRA_LCD //general LCD support, also 16x2
|
//#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -545,8 +545,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
|||||||
//LCD and SD support
|
//LCD and SD support
|
||||||
|
|
||||||
// Character based displays can have different extended charsets.
|
// Character based displays can have different extended charsets.
|
||||||
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
|
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
||||||
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
||||||
|
|
||||||
//#define ULTRA_LCD //general LCD support, also 16x2
|
//#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -558,8 +558,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
|||||||
//LCD and SD support
|
//LCD and SD support
|
||||||
|
|
||||||
// Character based displays can have different extended charsets.
|
// Character based displays can have different extended charsets.
|
||||||
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
|
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
|
||||||
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
|
||||||
|
|
||||||
//#define ULTRA_LCD //general LCD support, also 16x2
|
//#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -176,7 +176,7 @@
|
|||||||
#define STR_Deg "\260" // '°'
|
#define STR_Deg "\260" // '°'
|
||||||
#define STR_THERMOMETER "\377"
|
#define STR_THERMOMETER "\377"
|
||||||
#else
|
#else
|
||||||
#ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan)
|
#ifdef DISPLAY_CHARSET_HD44780_JAPAN // HD44780 ROM Code: A00 (Japan)
|
||||||
#define STR_ae "\xe1"
|
#define STR_ae "\xe1"
|
||||||
#define STR_Ae STR_ae
|
#define STR_Ae STR_ae
|
||||||
#define STR_oe "\357"
|
#define STR_oe "\357"
|
||||||
@ -189,7 +189,7 @@
|
|||||||
#define STR_Deg "\271"
|
#define STR_Deg "\271"
|
||||||
#define STR_THERMOMETER "\002"
|
#define STR_THERMOMETER "\002"
|
||||||
#endif
|
#endif
|
||||||
#ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western)
|
#ifdef DISPLAY_CHARSET_HD44780_WESTERN // HD44780 ROM Code: A02 (Western)
|
||||||
#define STR_Ae "\216"
|
#define STR_Ae "\216"
|
||||||
#define STR_ae "\204"
|
#define STR_ae "\204"
|
||||||
#define STR_Oe "\211"
|
#define STR_Oe "\211"
|
||||||
|
Loading…
Reference in New Issue
Block a user