♻️ LCD_SDSS => LCD_SDSS_PIN

MarlinFirmware · Jan 23, 2025 · a4f75f5 · a4f75f5
1 parent 6d355da
commit a4f75f5
Show file tree

Hide file tree

Showing 41 changed files with 72 additions and 72 deletions.
diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -121,7 +121,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
     #if IS_TX1(BTN_EN2) || IS_RX1(BTN_EN1)
       #error "Serial port pins (1) conflict with Encoder Buttons!"
     #elif ANY_TX(1, SD_SCK_PIN, LCD_PINS_D4, DOGLCD_SCK, LCD_RESET_PIN, LCD_PINS_RS, SHIFT_CLK_PIN) \
-       || ANY_RX(1, LCD_SDSS, LCD_PINS_RS, SD_MISO_PIN, DOGLCD_A0, SD_SS_PIN, LCD_SDSS, DOGLCD_CS, LCD_RESET_PIN, LCD_BACKLIGHT_PIN)
+       || ANY_RX(1, LCD_SDSS_PIN, LCD_PINS_RS, SD_MISO_PIN, DOGLCD_A0, SD_SS_PIN, DOGLCD_CS, LCD_RESET_PIN, LCD_BACKLIGHT_PIN)
       #error "Serial port pins (1) conflict with LCD pins!"
     #endif
   #endif
@@ -211,8 +211,8 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
       #error "SCL0 overlaps with Encoder Button!"
     #elif IS_SCL0(SD_SS_PIN)
       #error "SCL0 overlaps with SD_SS_PIN!"
-    #elif IS_SCL0(LCD_SDSS)
-      #error "SCL0 overlaps with LCD_SDSS!"
+    #elif IS_SCL0(LCD_SDSS_PIN)
+      #error "SCL0 overlaps with LCD_SDSS_PIN!"
     #endif
     #undef PIN_IS_SDA0
     #undef IS_SCL0

diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -86,7 +86,7 @@
 #endif
 #define FAN1_PIN                           P0_26
 
-#define LCD_SDSS                           P0_16  // LCD SD chip select
+#define LCD_SDSS_PIN                       P0_16  // LCD SD chip select
 
 #if ENABLED(AZSMZ_12864)
   #define BEEPER_PIN                       P1_30
@@ -104,7 +104,7 @@
   #define SD_SCK_PIN                       P0_15
   #define SD_MISO_PIN                      P0_17
   #define SD_MOSI_PIN                      P0_18
-  #define SD_SS_PIN                     LCD_SDSS
+  #define SD_SS_PIN                 LCD_SDSS_PIN
   #define SD_DETECT_PIN                    P3_25
 #elif SD_CONNECTION_IS(ONBOARD)
   #define SD_SCK_PIN                       P0_07

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -109,7 +109,7 @@
   #define BTN_EN2                    EXP2_05_PIN
   #define BTN_ENC                    EXP1_02_PIN
 
-  #define LCD_SDSS                   EXP2_04_PIN
+  #define LCD_SDSS_PIN               EXP2_04_PIN
   #define LCD_PINS_RS                EXP1_04_PIN
   #define LCD_PINS_EN                EXP2_06_PIN
   #define LCD_PINS_D4                EXP2_02_PIN
@@ -229,9 +229,9 @@
       // We use SD_DETECT_PIN for E0
       #undef SD_DETECT_PIN
       #define E0_CS_PIN              EXP2_07_PIN
-      // We use LCD_SDSS pin for E1
-      #undef LCD_SDSS
-      #define LCD_SDSS                     -1
+      // We use LCD_SDSS_PIN pin for E1
+      #undef LCD_SDSS_PIN
+      #define LCD_SDSS_PIN                 -1
       #define E1_CS_PIN              EXP2_04_PIN
     #endif
 

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -472,7 +472,7 @@
     #define LCD_PINS_EN              EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
-    #define LCD_SDSS                 EXP2_04_PIN  // (16) J3-7 & AUX-4
+    #define LCD_SDSS_PIN             EXP2_04_PIN  // (16) J3-7 & AUX-4
     #define SD_DETECT_PIN            EXP2_07_PIN  // (49) (NOT 5V tolerant)
 
     #if ENABLED(FYSETC_MINI_12864)

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -519,7 +519,7 @@
     #define LCD_PINS_EN              EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
-    #define LCD_SDSS                 EXP2_04_PIN  // (16) J3-7 & AUX-4
+    #define LCD_SDSS_PIN             EXP2_04_PIN  // (16) J3-7 & AUX-4
 
     #if ENABLED(FYSETC_MINI_12864)
       #define DOGLCD_CS              EXP1_03_PIN

diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -246,7 +246,7 @@
   #define BTN_EN1                    EXP2_05_PIN
   #define BTN_EN2                    EXP2_03_PIN
   #define LCD_PINS_RS                EXP1_04_PIN
-  #define LCD_SDSS                   EXP2_04_PIN
+  #define LCD_SDSS_PIN               EXP2_04_PIN
   #define LCD_PINS_EN                EXP1_03_PIN
   #define LCD_PINS_D4                EXP1_05_PIN
   #if ANY(VIKI2, miniVIKI)

diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -342,7 +342,7 @@
     #define BTN_EN1                  EXP2_03_PIN
     #define BTN_EN2                  EXP2_05_PIN
 
-    #define LCD_SDSS                 EXP2_04_PIN
+    #define LCD_SDSS_PIN             EXP2_04_PIN
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 

diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -322,7 +322,7 @@
   #define SD_DETECT_PIN                    P1_31  // (49) J3-1 & AUX-3 (NOT 5V tolerant)
   #define KILL_PIN                         P1_22  // (41) J5-4 & AUX-4
   #define LCD_PINS_RS                      P0_16  // (16) J3-7 & AUX-4
-  #define LCD_SDSS                         P1_23  // (53) J3-5 & AUX-3
+  #define LCD_SDSS_PIN                     P1_23  // (53) J3-5 & AUX-3
 
   #if IS_NEWPANEL
     #if IS_RRW_KEYPAD

diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -178,7 +178,7 @@
     #define SD_DETECT_PIN               _EXP2_01
     #define KILL_PIN                    _EXP1_10
     #define LCD_PINS_RS                 _EXP2_07
-    #define LCD_SDSS                    _EXP2_07
+    #define LCD_SDSS_PIN                _EXP2_07
     #define LCD_BACKLIGHT_PIN           _EXP2_07
     #define LCD_PINS_EN                 _EXP2_10
     #define LCD_PINS_D4                 _EXP2_09

diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -147,7 +147,7 @@
   #define BTN_ENC                          P1_30  // EXP1-2
 
   #define LCD_PINS_RS                      P0_16  // EXP1-4
-  #define LCD_SDSS                         P0_28  // EXP2-4
+  #define LCD_SDSS_PIN                     P0_28  // EXP2-4
   #define LCD_PINS_EN                      P0_18  // EXP1-3
   #define LCD_PINS_D4                      P0_15  // EXP1-5
 

diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -244,7 +244,7 @@
   #define BTN_ENC                    EXP1_02_PIN
 
   #define LCD_PINS_RS                EXP1_04_PIN
-  #define LCD_SDSS                   EXP2_04_PIN
+  #define LCD_SDSS_PIN               EXP2_04_PIN
   #define LCD_PINS_EN                EXP1_03_PIN
   #define LCD_PINS_D4                EXP1_05_PIN
 

diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -324,7 +324,7 @@
     #define BTN_EN1                  EXP2_03_PIN
     #define BTN_EN2                  EXP2_05_PIN
 
-    #define LCD_SDSS                 EXP2_04_PIN
+    #define LCD_SDSS_PIN             EXP2_04_PIN
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 

diff --git a/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h b/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h
@@ -196,7 +196,7 @@
     #define BTN_EN1                        P0_00
     #define BTN_EN2                        P0_01
 
-    #define LCD_SDSS                       P0_16
+    #define LCD_SDSS_PIN                   P0_16
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 

diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
@@ -174,5 +174,5 @@
   #define BTN_EN2                    EXP2_05_PIN
   #define BTN_ENC                    EXP1_02_PIN
 
-  #define LCD_SDSS                   EXP2_04_PIN
+  #define LCD_SDSS_PIN               EXP2_04_PIN
 #endif
diff --git a/Marlin/src/pins/native/pins_RAMPS_NATIVE.h b/Marlin/src/pins/native/pins_RAMPS_NATIVE.h
@@ -602,7 +602,7 @@
       #define BTN_EN1                         47
       #define BTN_EN2                         43
       #define BTN_ENC                         32
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #define KILL_PIN                        41
       #undef LCD_PINS_EN                          // not used, causes false pin conflict report
 
@@ -612,7 +612,7 @@
       #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
       #define BTN_ENC                         -1
 
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #define SD_DETECT_PIN                   49
 
     #elif ANY(VIKI2, miniVIKI)
@@ -645,7 +645,7 @@
       #define BTN_EN2                EXP1_01_PIN
       #define BTN_ENC                EXP2_03_PIN
 
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #define SD_DETECT_PIN          EXP2_07_PIN
       #define KILL_PIN               EXP2_08_PIN
 

diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
@@ -943,8 +943,8 @@
 #if _EXISTS(LCD_PINS_RS)
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_RS)
 #endif
-#if _EXISTS(LCD_SDSS)
-  REPORT_NAME_DIGITAL(__LINE__, LCD_SDSS)
+#if PIN_EXISTS(LCD_SDSS)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_SDSS_PIN)
 #endif
 #if PIN_EXISTS(LCD_RESET)
   REPORT_NAME_DIGITAL(__LINE__, LCD_RESET_PIN)

diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
@@ -95,7 +95,7 @@
 
 #if HAS_WIRED_LCD
 
-  #define LCD_SDSS                            53
+  #define LCD_SDSS_PIN                        53
 
   #define DOGLCD_CS                           29
   #define DOGLCD_A0                           27

diff --git a/Marlin/src/pins/ramps/pins_ORTUR_4.h b/Marlin/src/pins/ramps/pins_ORTUR_4.h
@@ -87,7 +87,7 @@
   #define LCD_PINS_EN                         23
   #define LCD_PINS_D4                         37
 
-  #define LCD_SDSS                            53
+  #define LCD_SDSS_PIN                        53
   #define SD_DETECT_PIN                       49
 
   #define BTN_EN1                             29

diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -750,7 +750,7 @@
       #define BTN_EN1                    AUX4_04
       #define BTN_EN2                    AUX4_06
       #define BTN_ENC                    AUX4_03
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #define KILL_PIN               EXP2_08_PIN
       #undef LCD_PINS_EN                          // not used, causes false pin conflict report
 
@@ -760,7 +760,7 @@
       #define BTN_EN2                    AUX2_08
       #define BTN_ENC                         -1
 
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #ifndef SD_DETECT_PIN
         #define SD_DETECT_PIN        EXP2_07_PIN
       #endif
@@ -800,7 +800,7 @@
       #define BTN_EN2                EXP1_01_PIN
       #define BTN_ENC                EXP2_03_PIN
 
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #ifndef SD_DETECT_PIN
         #define SD_DETECT_PIN        EXP2_07_PIN
       #endif

diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -421,7 +421,7 @@
       #define BTN_EN1                         47
       #define BTN_EN2                         43
       #define BTN_ENC                         32
-      #define LCD_SDSS               EXP2_04_PIN
+      #define LCD_SDSS_PIN           EXP2_04_PIN
       //#define KILL_PIN                      41
       #undef LCD_PINS_EN                          // not used, causes false pin conflict report
 
@@ -431,7 +431,7 @@
       #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
       #define BTN_ENC                         -1
 
-      #define LCD_SDSS               EXP2_04_PIN
+      #define LCD_SDSS_PIN           EXP2_04_PIN
       #define SD_DETECT_PIN          EXP2_07_PIN
 
     #elif ANY(VIKI2, miniVIKI)
@@ -465,7 +465,7 @@
       #define BTN_EN2                         37
       #define BTN_ENC                         31
 
-      #define LCD_SDSS               EXP2_04_PIN
+      #define LCD_SDSS_PIN           EXP2_04_PIN
       #define SD_DETECT_PIN          EXP2_07_PIN
       //#define KILL_PIN                      41
 

diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
@@ -335,7 +335,7 @@
 
 #if ENABLED(ZONESTAR_12864LCD)
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
-  #define LCD_SDSS                            16
+  #define LCD_SDSS_PIN                        16
   #define LCD_PINS_RS                         16  // ST7920 CS          (LCD-4)
   #define LCD_PINS_EN                         23  // ST7920 DAT LCD-R/W (LCD-5)
   #define LCD_PINS_D4                         17  // ST7920 CLK LCD-ENA (LCD-6)
@@ -363,7 +363,7 @@
 
 #if ANY(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
-  #define LCD_SDSS                            16
+  #define LCD_SDSS_PIN                        16
   #define LCD_PINS_RS                         23  // RESET Pull low for 1s to init
   #define LCD_PINS_DC                         17
   #define DOGLCD_CS                           16  // CS

diff --git a/Marlin/src/pins/rp2040/pins_RP2040.h b/Marlin/src/pins/rp2040/pins_RP2040.h
@@ -427,7 +427,7 @@
       #define BTN_EN1                         47
       #define BTN_EN2                         43
       #define BTN_ENC                         32
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #define KILL_PIN                        41
 
     #elif ENABLED(LCD_I2C_VIKI)
@@ -436,7 +436,7 @@
       #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
       #define BTN_ENC                         -1
 
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #define SD_DETECT_PIN                   49
 
     #elif ANY(VIKI2, miniVIKI)
@@ -468,7 +468,7 @@
       #define BTN_EN2                         37
       #define BTN_ENC                         31
 
-      #define LCD_SDSS                      SDSS
+      #define LCD_SDSS_PIN             SD_SS_PIN
       #define SD_DETECT_PIN                   49
       #define KILL_PIN                        41
 

diff --git a/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin/src/pins/sam/pins_DUE3DOM.h
@@ -149,7 +149,7 @@
     #define BTN_EN2                           52
     #define BTN_ENC                           48
     #define BEEPER_PIN                        41
-    #define LCD_SDSS                           4
+    #define LCD_SDSS_PIN                       4
     #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)

diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -145,7 +145,7 @@
     #define BTN_EN2                           52
     #define BTN_ENC                           48
     #define BEEPER_PIN                        41
-    #define LCD_SDSS                        SDSS
+    #define LCD_SDSS_PIN               SD_SS_PIN
     #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
@@ -165,7 +165,7 @@
     #define BTN_EN1                           52
     #define BTN_EN2                           50
     #define BTN_ENC                           48
-    #define LCD_SDSS                        SDSS
+    #define LCD_SDSS_PIN               SD_SS_PIN
     #define SD_DETECT_PIN                     14
     #define BEEPER_PIN                        41
     #define DOGLCD_A0                         46

diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h
@@ -271,7 +271,7 @@
     #define BTN_EN2                           52
     #define BTN_ENC                           48
     #define BEEPER_PIN                        41
-    #define LCD_SDSS                          10
+    #define LCD_SDSS_PIN                      10
     #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)

diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -241,7 +241,7 @@
   #elif HAS_U8GLIB_I2C_OLED
 
     #define BEEPER_PIN               EXP1_01_PIN
-    #define LCD_SDSS                 EXP2_04_PIN
+    #define LCD_SDSS_PIN             EXP2_04_PIN
     #define SD_DETECT_PIN            EXP2_07_PIN
 
   #elif ENABLED(FYSETC_MINI_12864)

diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -231,7 +231,7 @@
   #elif HAS_U8GLIB_I2C_OLED
 
     #define BEEPER_PIN               EXP1_01_PIN
-    #define LCD_SDSS                 EXP2_04_PIN
+    #define LCD_SDSS_PIN             EXP2_04_PIN
     #define SD_DETECT_PIN            EXP2_07_PIN
 
   #elif ENABLED(FYSETC_MINI_12864)

diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
@@ -359,7 +359,7 @@
       //#define BTN_EN1                       47
       //#define BTN_EN2              EXP2_03_PIN
       //#define BTN_ENC                       32
-      //#define LCD_SDSS                    SDSS
+      //#define LCD_SDSS_PIN           SD_SS_PIN
       //#define KILL_PIN             EXP1_01_PIN
       //#undef LCD_PINS_EN                        // not used, causes false pin conflict report
 
@@ -370,7 +370,7 @@
       //#define BTN_EN2              EXP2_05_PIN
       //#define BTN_ENC                       -1
 
-      //#define LCD_SDSS                    SDSS
+      //#define LCD_SDSS_PIN           SD_SS_PIN
       //#define SD_DETECT_PIN        EXP2_10_PIN
 
     #elif ANY(VIKI2, miniVIKI)
@@ -404,7 +404,7 @@
       //#define BTN_EN2              EXP1_06_PIN
       //#define BTN_ENC                       31
 
-      //#define LCD_SDSS                    SDSS
+      //#define LCD_SDSS_PIN           SD_SS_PIN
       //#define SD_DETECT_PIN        EXP2_10_PIN
       //#define KILL_PIN             EXP1_01_PIN