Merge pull request #7766 from thinkyhead/bf1_melzi_fixes

Melzi fixes
8 years ago · 0c2cefed8f
parent aefd2a5c4b 41dcbe89dd
commit 0c2cefed8f
2 changed files with 2 additions and 2 deletions
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@ -1149,7 +1149,7 @@ static_assert(1 >= 0
      && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE)
    + 1
  #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
  #endif
  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)
--- a/Marlin/pins_SANGUINOLOLU_11.h
+++ b/Marlin/pins_SANGUINOLOLU_11.h
@ -240,7 +240,7 @@
    #ifndef ST7920_DELAY_1
      #define ST7920_DELAY_1 DELAY_0_NOP
    #endif
-    #ifndef ST7920_DELAY_3
+    #ifndef ST7920_DELAY_2
      #define ST7920_DELAY_2 DELAY_3_NOP
    #endif
    #ifndef ST7920_DELAY_3