From 70a64355f629689e077fb4d0b944de5a39d83804 Mon Sep 17 00:00:00 2001
From: DecoyPlatypus <isaacbuck@apexgulfport.com>
Date: Tue, 26 Sep 2017 21:22:24 -0500
Subject: [PATCH 1/2] Fixed LCD_FOR_MELZI SanityCheck
Sanity Check for LCD_FOR_MELZI would fail with "Please select no more than one LCD controller option" any time #define LCD_FOR_MELZI was enabled in Configuration.h, even if there were no other LCD options enabled.
---
Marlin/SanityCheck.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 87d5a235bb..249992b2ab 100644
--- 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)
From 41dcbe89ddf82ff756de5755ec2dd3db7845382d Mon Sep 17 00:00:00 2001
From: DecoyPlatypus <isaacbuck@apexgulfport.com>
Date: Tue, 26 Sep 2017 21:25:07 -0500
Subject: [PATCH 2/2] Fixed ST7920_DELAY typo
Fixed typo where ST7920_DELAY_2 was being #defined after a check for #ifndef ST7920_DELAY_3
---
Marlin/pins_SANGUINOLOLU_11.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/pins_SANGUINOLOLU_11.h
index 4ed004549f..0506d78cc0 100644
--- 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