Merge upstream changes from Marlin 2.1.1

2022-09-03 09:23:32 +02:00
parent 626283aadb
commit 986e416c7f
1610 changed files with 73839 additions and 40857 deletions
--- a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
+++ b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
@@ -143,15 +143,16 @@

 #define HOME_PIN                        BTN_HOME

-#if ANY(VIKI2, miniVIKI)
+#if EITHER(VIKI2, miniVIKI)
  #define BEEPER_PIN                          44
  // Pins for DOGM SPI LCD Support
  #define DOGLCD_A0                           70
  #define DOGLCD_CS                           71
-  #define LCD_SCREEN_ROT_180

  #define SD_DETECT_PIN                       -1  // Pin 72 if using easy adapter board

  #define STAT_LED_RED_PIN                    22
  #define STAT_LED_BLUE_PIN                   32
-#endif // VIKI2/miniVIKI
+
+  #define LCD_SCREEN_ROTATE                  180  // 0, 90, 180, 270
+#endif