Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

2014-05-24 13:08:58 +01:00
parent e541323741 38192cb5f3
commit efb6d61413
4 changed files with 29 additions and 9 deletions
--- a/Marlin/ultralcd_implementation_hitachi_HD44780.h
+++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h
@ -305,7 +305,7 @@ static void lcd_implementation_init()
        B00000
    }; //thanks Sonny Mounicou

-#if defined(LCDI2C_TYPE_PCF8575)
+#if defined(LCD_I2C_TYPE_PCF8575)
    lcd.begin(LCD_WIDTH, LCD_HEIGHT);
  #ifdef LCD_I2C_PIN_BL
    lcd.setBacklightPin(LCD_I2C_PIN_BL,POSITIVE);