zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed small error in lcd define statements.

Browse source
This commit is contained in:
kiyoshigawa 2013-06-08 09:00:34 -06:00
parent 6a81291c57
commit 69b02031ca
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Marlin/ultralcd_implementation_hitachi_HD44780.h
View file

@ -10,14 +10,6 @@
extern volatile uint8_t buttons; //the last checked buttons in a bit array. extern volatile uint8_t buttons; //the last checked buttons in a bit array.
#else #else
extern volatile uint16_t buttons; //an extended version of the last checked buttons in a bit array. extern volatile uint16_t buttons; //an extended version of the last checked buttons in a bit array.
#ifdef LCD_I2C_TYPE_PCA8574
#include <LiquidCrystal_I2C.h>
#define LCD_CLASS LiquidCrystal_I2C
#else
#include <LiquidCrystal.h>
#define LCD_CLASS LiquidCrystal
#endif
#endif #endif
//////////////////////////////////// ////////////////////////////////////
@ -189,6 +181,11 @@ extern volatile uint16_t buttons; //an extended version of the last checked but
#define LCD_CLASS LiquidTWI2 #define LCD_CLASS LiquidTWI2
LCD_CLASS lcd(LCD_I2C_ADDRESS); LCD_CLASS lcd(LCD_I2C_ADDRESS);
#elif defined(LCD_I2C_TYPE_PCA8574)
#include <LiquidCrystal_I2C.h>
#define LCD_CLASS LiquidCrystal_I2C
LCD_CLASS lcd(LCD_I2C_ADDRESS, LCD_WIDTH, LCD_HEIGHT);
#else #else
// Standard directly connected LCD implementations // Standard directly connected LCD implementations
#if LANGUAGE_CHOICE == 6 #if LANGUAGE_CHOICE == 6
@ -212,12 +209,6 @@ extern volatile uint16_t buttons; //an extended version of the last checked but
#define LCD_STR_CLOCK "\x07" #define LCD_STR_CLOCK "\x07"
#define LCD_STR_ARROW_RIGHT "\x7E" /* from the default character set */ #define LCD_STR_ARROW_RIGHT "\x7E" /* from the default character set */
#ifdef LCD_I2C_TYPE_PCA8574
LCD_CLASS lcd(LCD_I2C_ADDRESS, LCD_WIDTH, LCD_HEIGHT);
#else
LCD_CLASS lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5,LCD_PINS_D6,LCD_PINS_D7); //RS,Enable,D4,D5,D6,D7
#endif
static void lcd_implementation_init() static void lcd_implementation_init()
{ {
byte bedTemp[8] = byte bedTemp[8] =
@ -303,14 +294,9 @@ static void lcd_implementation_init()
B00000, B00000,
B00000 B00000
}; //thanks Sonny Mounicou }; //thanks Sonny Mounicou
#ifdef LCD_I2C_TYPE_PCA8574 #if defined(LCDI2C_TYPE_PCF8575)
lcd.init(); lcd.begin(LCD_WIDTH, LCD_HEIGHT);
lcd.backlight(); #ifdef LCD_I2C_PIN_BL
#else
if defined(LCDI2C_TYPE_PCF8575)
lcd.begin(LCD_WIDTH, LCD_HEIGHT);
#endif
#ifdef LCD_I2C_PIN_BL
lcd.setBacklightPin(LCD_I2C_PIN_BL,POSITIVE); lcd.setBacklightPin(LCD_I2C_PIN_BL,POSITIVE);
lcd.setBacklight(HIGH); lcd.setBacklight(HIGH);
#endif #endif
@ -324,6 +310,10 @@ static void lcd_implementation_init()
lcd.setMCPType(LTI_TYPE_MCP23008); lcd.setMCPType(LTI_TYPE_MCP23008);
lcd.begin(LCD_WIDTH, LCD_HEIGHT); lcd.begin(LCD_WIDTH, LCD_HEIGHT);
#elif defined(LCD_I2C_TYPE_PCA8574)
lcd.init();
lcd.backlight();
#else #else
lcd.begin(LCD_WIDTH, LCD_HEIGHT); lcd.begin(LCD_WIDTH, LCD_HEIGHT);
#endif #endif