Merge remote-tracking branch 'refs/remotes/origin/master' into dev

MarlinKimbra/Pins.h

@@ -2347,7 +2347,23 @@
     #undef SDSS
     #define SDSS            10
     #define SDCARDDETECT    14
-          
+
+  #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+    #define LCD_PINS_RS     46
+    #define LCD_PINS_ENABLE 47
+    #define LCD_PINS_D4     44
+
+    #define BEEPER_PIN      41
+
+    #define BTN_EN1         50
+    #define BTN_EN2         52
+    #define BTN_ENC         48
+
+    #if UI_VOLTAGE_LEVEL != 1
+      #undef UI_VOLTAGE_LEVEL
+      #define UI_VOLTAGE_LEVEL  1
+    #endif
+
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
     #define BTN_EN1         50
     #define BTN_EN2         52

MarlinKimbra/module/ultralcd.cpp

 #include "../base.h"
 #include "../Marlin_main.h"
-#include "../configuration_store.h"
+#include "../Configuration_Store.h"
 
 #if ENABLED(ULTRA_LCD)
 
@@ -2452,7 +2452,7 @@ char* ftostr52(const float& x) {
   return conv;
 }
 
-#if DISABLED(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
+#if !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
 
   static void lcd_level_bed() {