Merge pull request #7766 from thinkyhead/bf1_melzi_fixes

Melzi fixes
master
Scott Lahteine 7 years ago committed by GitHub
commit 0c2cefed8f

@ -1149,7 +1149,7 @@ static_assert(1 >= 0
&& DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE)
+ 1 + 1
#endif #endif
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(LCD_FOR_MELZI)
+ 1 + 1
#endif #endif
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)

@ -240,7 +240,7 @@
#ifndef ST7920_DELAY_1 #ifndef ST7920_DELAY_1
#define ST7920_DELAY_1 DELAY_0_NOP #define ST7920_DELAY_1 DELAY_0_NOP
#endif #endif
#ifndef ST7920_DELAY_3 #ifndef ST7920_DELAY_2
#define ST7920_DELAY_2 DELAY_3_NOP #define ST7920_DELAY_2 DELAY_3_NOP
#endif #endif
#ifndef ST7920_DELAY_3 #ifndef ST7920_DELAY_3

Loading…
Cancel
Save