From ac14c656434083aebb0a0b1dbcfd36666a9da83e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 23 Jan 2025 18:00:17 -0600 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20SD-=20and=20SPI-related=20?= =?UTF-8?q?pins=20cleanup=20(#27650)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration_adv.h | 4 +- Marlin/src/HAL/AVR/spi_pins.h | 50 +++++++++--------- Marlin/src/HAL/DUE/HAL.cpp | 2 +- Marlin/src/HAL/DUE/HAL_SPI.cpp | 7 ++- Marlin/src/HAL/DUE/spi_pins.h | 51 +++++++++---------- Marlin/src/HAL/ESP32/spi_pins.h | 17 +++++-- Marlin/src/HAL/LINUX/spi_pins.h | 6 --- Marlin/src/HAL/LPC1768/inc/SanityCheck.h | 6 +-- Marlin/src/HAL/LPC1768/spi_pins.h | 8 --- Marlin/src/HAL/NATIVE_SIM/spi_pins.h | 7 --- Marlin/src/HAL/RP2040/HAL.cpp | 7 +-- Marlin/src/HAL/RP2040/spi_pins.h | 5 +- Marlin/src/HAL/SAMD21/HAL.cpp | 2 +- Marlin/src/HAL/SAMD21/spi_pins.h | 7 --- Marlin/src/HAL/SAMD51/HAL.cpp | 2 +- Marlin/src/HAL/SAMD51/spi_pins.h | 5 -- Marlin/src/HAL/STM32/HAL.cpp | 4 +- Marlin/src/HAL/STM32/spi_pins.h | 3 -- Marlin/src/HAL/STM32F1/spi_pins.h | 5 -- Marlin/src/HAL/TEENSY31_32/spi_pins.h | 1 - Marlin/src/HAL/TEENSY35_36/spi_pins.h | 1 - Marlin/src/HAL/TEENSY40_41/spi_pins.h | 1 - Marlin/src/inc/Changes.h | 10 ++++ .../extui/ftdi_eve_touch_ui/pin_mappings.h | 2 +- Marlin/src/pins/esp32/pins_E4D.h | 2 +- Marlin/src/pins/esp32/pins_ENWI_ESPNP.h | 7 +-- Marlin/src/pins/esp32/pins_ESP32.h | 2 +- Marlin/src/pins/esp32/pins_ESPA_common.h | 2 +- .../pins/esp32/pins_GODI_CONTROLLER_V1_0.h | 2 +- Marlin/src/pins/esp32/pins_MKS_TINYBEE.h | 2 +- Marlin/src/pins/esp32/pins_MM_JOKER.h | 2 +- Marlin/src/pins/esp32/pins_MRR_ESPE.h | 2 +- Marlin/src/pins/esp32/pins_PANDA_common.h | 2 +- Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h | 17 +++---- Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h | 4 +- Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h | 1 - Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h | 5 +- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h | 8 +-- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 2 +- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 2 +- Marlin/src/pins/lpc1768/pins_MKS_SBASE.h | 2 +- Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h | 2 +- Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h | 2 +- Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h | 2 +- Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h | 2 +- .../src/pins/lpc1769/pins_COHESION3D_MINI.h | 2 +- .../src/pins/lpc1769/pins_COHESION3D_REMIX.h | 2 +- Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h | 2 +- Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h | 2 +- .../pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h | 2 +- Marlin/src/pins/mega/pins_CHEAPTRONICv2.h | 2 +- Marlin/src/pins/mega/pins_CNCONTROLS_11.h | 2 +- Marlin/src/pins/mega/pins_CNCONTROLS_12.h | 2 +- Marlin/src/pins/mega/pins_CNCONTROLS_15.h | 2 +- Marlin/src/pins/mega/pins_EINSTART-S.h | 2 +- Marlin/src/pins/mega/pins_ELEFU_3.h | 2 +- Marlin/src/pins/mega/pins_GT2560_REV_A.h | 2 +- Marlin/src/pins/mega/pins_GT2560_V3.h | 2 +- Marlin/src/pins/mega/pins_GT2560_V41b.h | 2 +- Marlin/src/pins/mega/pins_HJC2560C_REV2.h | 2 +- Marlin/src/pins/mega/pins_INTAMSYS40.h | 2 +- Marlin/src/pins/mega/pins_LEAPFROG.h | 2 +- Marlin/src/pins/mega/pins_MEGACONTROLLER.h | 2 +- Marlin/src/pins/mega/pins_MEGATRONICS.h | 2 +- Marlin/src/pins/mega/pins_MEGATRONICS_2.h | 2 +- Marlin/src/pins/mega/pins_MEGATRONICS_3.h | 2 +- Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h | 2 +- Marlin/src/pins/mega/pins_MINITRONICS.h | 2 +- Marlin/src/pins/mega/pins_OVERLORD.h | 2 +- Marlin/src/pins/mega/pins_PICA.h | 4 +- Marlin/src/pins/mega/pins_SILVER_GATE.h | 2 +- Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h | 2 +- Marlin/src/pins/mega/pins_WEEDO_62A.h | 2 +- Marlin/src/pins/native/pins_RAMPS_NATIVE.h | 8 +-- Marlin/src/pins/pinsDebug_list.h | 8 +-- Marlin/src/pins/pins_postprocess.h | 4 +- Marlin/src/pins/rambo/pins_EINSY_RAMBO.h | 2 +- Marlin/src/pins/rambo/pins_EINSY_RETRO.h | 2 +- Marlin/src/pins/rambo/pins_MINIRAMBO.h | 2 +- Marlin/src/pins/rambo/pins_RAMBO.h | 2 +- Marlin/src/pins/rambo/pins_SCOOVO_X9H.h | 2 +- Marlin/src/pins/ramps/pins_3DRAG.h | 2 +- .../src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h | 2 +- Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h | 4 +- .../src/pins/ramps/pins_FORMBOT_TREX2PLUS.h | 2 +- Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h | 2 +- Marlin/src/pins/ramps/pins_FYSETC_F6_13.h | 2 +- Marlin/src/pins/ramps/pins_K8600.h | 2 +- Marlin/src/pins/ramps/pins_K8800.h | 4 +- Marlin/src/pins/ramps/pins_MKS_GEN_13.h | 2 +- Marlin/src/pins/ramps/pins_ORTUR_4.h | 2 +- Marlin/src/pins/ramps/pins_RAMPS.h | 10 ++-- Marlin/src/pins/ramps/pins_RAMPS_OLD.h | 2 +- Marlin/src/pins/ramps/pins_RAMPS_S_12.h | 2 +- Marlin/src/pins/ramps/pins_RUMBA.h | 2 +- Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h | 2 +- Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h | 2 +- Marlin/src/pins/ramps/pins_TT_OSCAR.h | 14 ++--- Marlin/src/pins/ramps/pins_ULTIMAIN_2.h | 2 +- Marlin/src/pins/ramps/pins_ULTIMAKER.h | 2 +- Marlin/src/pins/ramps/pins_ZRIB_V53.h | 8 +-- Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h | 2 +- Marlin/src/pins/rp2040/pins_RP2040.h | 8 +-- Marlin/src/pins/sam/pins_ADSK.h | 2 +- Marlin/src/pins/sam/pins_ALLIGATOR_R2.h | 2 +- Marlin/src/pins/sam/pins_ARCHIM1.h | 2 +- Marlin/src/pins/sam/pins_ARCHIM2.h | 2 +- Marlin/src/pins/sam/pins_CNCONTROLS_15D.h | 2 +- Marlin/src/pins/sam/pins_DUE3DOM.h | 4 +- Marlin/src/pins/sam/pins_DUE3DOM_MINI.h | 6 +-- Marlin/src/pins/sam/pins_KRATOS32.h | 2 +- Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h | 2 +- Marlin/src/pins/sam/pins_RADDS.h | 8 +-- Marlin/src/pins/sam/pins_RAMPS_FD_V1.h | 2 +- Marlin/src/pins/sam/pins_RURAMPS4D_11.h | 4 +- Marlin/src/pins/sam/pins_RURAMPS4D_13.h | 4 +- Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h | 2 +- .../src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h | 11 ++-- Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h | 10 ++-- Marlin/src/pins/samd/pins_MINITRONICS20.h | 8 +-- Marlin/src/pins/samd/pins_RAMPS_144.h | 10 ++-- Marlin/src/pins/sanguino/pins_ANET_10.h | 4 +- Marlin/src/pins/sanguino/pins_GEN3_PLUS.h | 2 +- Marlin/src/pins/sanguino/pins_GEN6.h | 2 +- Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h | 2 +- .../src/pins/sanguino/pins_MELZI_CREALITY.h | 2 +- .../pins/sanguino/pins_MELZI_CREALITY_E2.h | 2 +- Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h | 2 +- Marlin/src/pins/sanguino/pins_OMCA.h | 2 +- Marlin/src/pins/sanguino/pins_OMCA_A.h | 2 +- .../src/pins/sanguino/pins_SANGUINOLOLU_11.h | 12 ++--- Marlin/src/pins/sanguino/pins_ZMIB_V2.h | 4 +- Marlin/src/pins/stm32f0/pins_MALYAN_M300.h | 5 -- Marlin/src/pins/stm32f1/pins_BEAST.h | 2 +- Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h | 2 +- Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 2 +- .../stm32f1/pins_BTT_SKR_MINI_E3_common.h | 2 +- .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 1 - Marlin/src/pins/stm32f1/pins_CHITU3D.h | 11 ++-- Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h | 1 - Marlin/src/pins/stm32f1/pins_FLY_MINI.h | 1 - Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h | 2 +- Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h | 2 +- Marlin/src/pins/stm32f1/pins_GTM32_MINI.h | 2 - Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h | 2 - Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h | 2 - Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h | 2 - Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h | 1 - Marlin/src/pins/stm32f1/pins_MALYAN_M200.h | 2 - Marlin/src/pins/stm32f1/pins_MD_D301.h | 2 +- Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h | 3 +- Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h | 2 +- .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h | 5 +- .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 2 +- Marlin/src/pins/stm32f1/pins_MORPHEUS.h | 2 +- Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h | 2 +- Marlin/src/pins/stm32f1/pins_STM32F1R.h | 2 +- Marlin/src/pins/stm32f1/pins_STM3R_MINI.h | 2 +- Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h | 3 +- Marlin/src/pins/stm32f4/pins_ANET_ET4.h | 3 +- Marlin/src/pins/stm32f4/pins_ARMED.h | 2 +- Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h | 9 +--- Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h | 2 +- .../src/pins/stm32f4/pins_BLACKPILL_CUSTOM.h | 5 +- .../src/pins/stm32f4/pins_BLACK_STM32F407VE.h | 2 +- .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h | 2 - Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h | 5 +- .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 3 +- .../stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h | 1 - .../pins/stm32f4/pins_BTT_SKR_PRO_common.h | 4 +- .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 3 +- Marlin/src/pins/stm32f4/pins_FLYF407ZG.h | 4 +- .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h | 2 +- .../pins/stm32f4/pins_FYSETC_CHEETAH_V30.h | 4 +- .../src/pins/stm32f4/pins_FYSETC_S6_common.h | 4 +- .../pins/stm32f4/pins_FYSETC_SPIDER_KING407.h | 4 +- Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h | 4 +- Marlin/src/pins/stm32f4/pins_LERDGE_K.h | 1 - Marlin/src/pins/stm32f4/pins_LERDGE_S.h | 1 - Marlin/src/pins/stm32f4/pins_LERDGE_X.h | 1 - .../src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h | 3 +- .../pins/stm32f4/pins_MKS_MONSTER8_common.h | 5 +- Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h | 2 - .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h | 5 +- .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h | 5 +- Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h | 1 - .../src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h | 10 ++-- .../src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h | 10 ++-- Marlin/src/pins/stm32f4/pins_RUMBA32_common.h | 2 +- .../src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h | 8 +-- .../src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h | 3 +- Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h | 1 - Marlin/src/pins/stm32f7/pins_REMRAM_V1.h | 4 +- .../pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h | 1 - .../pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h | 3 +- .../pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h | 3 +- .../pins/stm32g0/pins_BTT_MANTA_M8P_common.h | 3 +- Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h | 1 - .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h | 1 - .../src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h | 6 +-- .../pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h | 6 +-- .../pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h | 6 +-- .../stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h | 3 +- .../pins/stm32h7/pins_BTT_SKR_SE_BX_common.h | 3 +- .../pins/stm32h7/pins_BTT_SKR_V3_0_common.h | 3 +- Marlin/src/pins/teensy2/pins_5DPRINT.h | 2 +- Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h | 2 +- Marlin/src/pins/teensy2/pins_PRINTRBOARD.h | 6 +-- .../src/pins/teensy2/pins_PRINTRBOARD_REVF.h | 6 +-- Marlin/src/pins/teensy2/pins_SAV_MKI.h | 2 +- Marlin/src/pins/teensy2/pins_TEENSY2.h | 2 +- Marlin/src/pins/teensy2/pins_TEENSYLU.h | 4 +- Marlin/src/pins/teensy3/pins_TEENSY31_32.h | 2 +- Marlin/src/pins/teensy3/pins_TEENSY35_36.h | 2 +- Marlin/src/sd/cardreader.cpp | 6 +-- 215 files changed, 359 insertions(+), 478 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 417bea4718d3..a1e5443129bb 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1869,7 +1869,7 @@ * * SCLK, MOSI, MISO --> SCLK, MOSI, MISO * INT --> SD_DETECT_PIN [1] - * SS --> SDSS + * SS --> SD_SS_PIN * * [1] On AVR an interrupt-capable pin is best for UHS3 compatibility. */ @@ -1896,7 +1896,7 @@ //#define USE_OTG_USB_HOST #if DISABLED(USE_OTG_USB_HOST) - #define USB_CS_PIN SDSS + #define USB_CS_PIN SD_SS_PIN #define USB_INTR_PIN SD_DETECT_PIN #endif #endif diff --git a/Marlin/src/HAL/AVR/spi_pins.h b/Marlin/src/HAL/AVR/spi_pins.h index 831972938a7b..934b6e3b1466 100644 --- a/Marlin/src/HAL/AVR/spi_pins.h +++ b/Marlin/src/HAL/AVR/spi_pins.h @@ -23,43 +23,41 @@ /** * Define SPI Pins: SCK, MISO, MOSI, SS + * Platform pins have parentheses, e.g., "(53)", so we cannot use them. */ #if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__) - #define AVR_SCK_PIN 13 - #define AVR_MISO_PIN 12 - #define AVR_MOSI_PIN 11 - #define AVR_SS_PIN 10 + #define _PIN_SPI_SCK 13 + #define _PIN_SPI_MISO 12 + #define _PIN_SPI_MOSI 11 + #define _PIN_SPI_SS 10 #elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__) - #define AVR_SCK_PIN 7 - #define AVR_MISO_PIN 6 - #define AVR_MOSI_PIN 5 - #define AVR_SS_PIN 4 + #define _PIN_SPI_SCK 7 + #define _PIN_SPI_MISO 6 + #define _PIN_SPI_MOSI 5 + #define _PIN_SPI_SS 4 #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) - #define AVR_SCK_PIN 52 - #define AVR_MISO_PIN 50 - #define AVR_MOSI_PIN 51 - #define AVR_SS_PIN 53 + #define _PIN_SPI_SCK 52 + #define _PIN_SPI_MISO 50 + #define _PIN_SPI_MOSI 51 + #define _PIN_SPI_SS 53 #elif defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) - #define AVR_SCK_PIN 21 - #define AVR_MISO_PIN 23 - #define AVR_MOSI_PIN 22 - #define AVR_SS_PIN 20 + #define _PIN_SPI_SCK 21 + #define _PIN_SPI_MISO 23 + #define _PIN_SPI_MOSI 22 + #define _PIN_SPI_SS 20 #elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__) - #define AVR_SCK_PIN 10 - #define AVR_MISO_PIN 12 - #define AVR_MOSI_PIN 11 - #define AVR_SS_PIN 16 + #define _PIN_SPI_SCK 10 + #define _PIN_SPI_MISO 12 + #define _PIN_SPI_MOSI 11 + #define _PIN_SPI_SS 16 #endif #ifndef SD_SCK_PIN - #define SD_SCK_PIN AVR_SCK_PIN + #define SD_SCK_PIN _PIN_SPI_SCK #endif #ifndef SD_MISO_PIN - #define SD_MISO_PIN AVR_MISO_PIN + #define SD_MISO_PIN _PIN_SPI_MISO #endif #ifndef SD_MOSI_PIN - #define SD_MOSI_PIN AVR_MOSI_PIN -#endif -#ifndef SD_SS_PIN - #define SD_SS_PIN AVR_SS_PIN + #define SD_MOSI_PIN _PIN_SPI_MOSI #endif diff --git a/Marlin/src/HAL/DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp index 763091cb009a..d1db9148c4a5 100644 --- a/Marlin/src/HAL/DUE/HAL.cpp +++ b/Marlin/src/HAL/DUE/HAL.cpp @@ -48,7 +48,7 @@ uint16_t MarlinHAL::adc_result; void MarlinHAL::init() { #if HAS_MEDIA - OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up + OUT_WRITE(SD_SS_PIN, HIGH); // Try to set SDSS inactive before any other SPI users start up #endif usb_task_init(); // Initialize the USB stack TERN_(POSTMORTEM_DEBUGGING, install_min_serial()); // Install the min serial handler diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp index c2fabb0d49b1..5bbc4223bb00 100644 --- a/Marlin/src/HAL/DUE/HAL_SPI.cpp +++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp @@ -600,9 +600,8 @@ OUT_WRITE(SPI_EEPROM1_CS_PIN, HIGH); OUT_WRITE(SPI_EEPROM2_CS_PIN, HIGH); OUT_WRITE(SPI_FLASH_CS_PIN, HIGH); - WRITE(SD_SS_PIN, HIGH); - - OUT_WRITE(SDSS, LOW); + OUT_WRITE(SD_SS_PIN, HIGH); + WRITE(SD_SS_PIN, LOW); PIO_Configure( g_APinDescription[SPI_PIN].pPort, @@ -767,7 +766,7 @@ // Disable PIO on A26 and A27 REG_PIOA_PDR = 0x0C000000; - OUT_WRITE(SDSS, HIGH); + OUT_WRITE(SD_SS_PIN, HIGH); // Reset SPI0 (from sam lib) SPI0->SPI_CR = SPI_CR_SPIDIS; diff --git a/Marlin/src/HAL/DUE/spi_pins.h b/Marlin/src/HAL/DUE/spi_pins.h index 7f0b1290b1dc..e289c8ced206 100644 --- a/Marlin/src/HAL/DUE/spi_pins.h +++ b/Marlin/src/HAL/DUE/spi_pins.h @@ -26,39 +26,36 @@ * * Available chip select pins for HW SPI are 4 10 52 77 87 */ -#if SDSS == 4 || SDSS == 10 || SDSS == 52 || SDSS == 77 || SDSS == 87 - #if SDSS == 4 - #define SPI_PIN 87 - #define SPI_CHAN 1 - #elif SDSS == 10 - #define SPI_PIN 77 - #define SPI_CHAN 0 - #elif SDSS == 52 - #define SPI_PIN 86 - #define SPI_CHAN 2 - #elif SDSS == 77 - #define SPI_PIN 77 - #define SPI_CHAN 0 - #else - #define SPI_PIN 87 - #define SPI_CHAN 1 - #endif - #define SD_SCK_PIN 76 - #define SD_MISO_PIN 74 - #define SD_MOSI_PIN 75 +#if SD_SS_PIN == 4 || SD_SS_PIN == 10 || SD_SS_PIN == 52 || SD_SS_PIN == 77 || SD_SS_PIN == 87 + #define SD_SCK_PIN 76 + #define SD_MISO_PIN 74 + #define SD_MOSI_PIN 75 +#endif + +#if SD_SS_PIN == 4 + #define SPI_PIN 87 + #define SPI_CHAN 1 +#elif SD_SS_PIN == 10 + #define SPI_PIN 77 + #define SPI_CHAN 0 +#elif SD_SS_PIN == 52 + #define SPI_PIN 86 + #define SPI_CHAN 2 +#elif SD_SS_PIN == 77 + #define SPI_PIN 77 + #define SPI_CHAN 0 +#elif SD_SS_PIN == 87 + #define SPI_PIN 87 + #define SPI_CHAN 1 #else - // defaults #define SOFTWARE_SPI #ifndef SD_SCK_PIN - #define SD_SCK_PIN 52 + #define SD_SCK_PIN 52 #endif #ifndef SD_MISO_PIN - #define SD_MISO_PIN 50 + #define SD_MISO_PIN 50 #endif #ifndef SD_MOSI_PIN - #define SD_MOSI_PIN 51 + #define SD_MOSI_PIN 51 #endif #endif - -/* A.28, A.29, B.21, C.26, C.29 */ -#define SD_SS_PIN SDSS diff --git a/Marlin/src/HAL/ESP32/spi_pins.h b/Marlin/src/HAL/ESP32/spi_pins.h index 58881f0ea7ec..b50ea725abdc 100644 --- a/Marlin/src/HAL/ESP32/spi_pins.h +++ b/Marlin/src/HAL/ESP32/spi_pins.h @@ -21,7 +21,16 @@ */ #pragma once -#define SD_SS_PIN SDSS -#define SD_SCK_PIN 18 -#define SD_MISO_PIN 19 -#define SD_MOSI_PIN 23 +#define PIN_SPI_SCK 18 +#define PIN_SPI_MISO 19 +#define PIN_SPI_MOSI 23 + +#ifndef SD_SCK_PIN + #define SD_SCK_PIN PIN_SPI_SCK +#endif +#ifndef SD_MISO_PIN + #define SD_MISO_PIN PIN_SPI_MISO +#endif +#ifndef SD_MOSI_PIN + #define SD_MOSI_PIN PIN_SPI_MOSI +#endif diff --git a/Marlin/src/HAL/LINUX/spi_pins.h b/Marlin/src/HAL/LINUX/spi_pins.h index 4139c8f898b5..221145e4b3cb 100644 --- a/Marlin/src/HAL/LINUX/spi_pins.h +++ b/Marlin/src/HAL/LINUX/spi_pins.h @@ -38,9 +38,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN 52 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN 53 -#endif -#ifndef SDSS - #define SDSS SD_SS_PIN -#endif diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h index 2782f225b0df..5a5617f4acf5 100644 --- 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/HAL/LPC1768/spi_pins.h b/Marlin/src/HAL/LPC1768/spi_pins.h index e52f78a7cb82..036bf0e02383 100644 --- a/Marlin/src/HAL/LPC1768/spi_pins.h +++ b/Marlin/src/HAL/LPC1768/spi_pins.h @@ -32,7 +32,6 @@ //#define SD_SCK_PIN P0_07 //#define SD_MISO_PIN P0_08 //#define SD_MOSI_PIN P0_09 -//#define SD_SS_PIN P0_06 // External SD #ifndef SD_SCK_PIN @@ -44,10 +43,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN P0_18 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN P1_23 -#endif -#if !defined(SDSS) || SDSS == P_NC // gets defaulted in pins.h - #undef SDSS - #define SDSS SD_SS_PIN -#endif diff --git a/Marlin/src/HAL/NATIVE_SIM/spi_pins.h b/Marlin/src/HAL/NATIVE_SIM/spi_pins.h index d9911bf56ce4..0e83e1369273 100644 --- a/Marlin/src/HAL/NATIVE_SIM/spi_pins.h +++ b/Marlin/src/HAL/NATIVE_SIM/spi_pins.h @@ -32,7 +32,6 @@ //#define SD_SCK_PIN P0_07 //#define SD_MISO_PIN P0_08 //#define SD_MOSI_PIN P0_09 -//#define SD_SS_PIN P0_06 // External SD #ifndef SD_SCK_PIN @@ -44,9 +43,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN 52 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN 53 -#endif -#ifndef SDSS - #define SDSS SD_SS_PIN -#endif diff --git a/Marlin/src/HAL/RP2040/HAL.cpp b/Marlin/src/HAL/RP2040/HAL.cpp index d1af25a84219..ceaf5404524a 100644 --- a/Marlin/src/HAL/RP2040/HAL.cpp +++ b/Marlin/src/HAL/RP2040/HAL.cpp @@ -59,11 +59,8 @@ void MarlinHAL::init() { constexpr int cpuFreq = F_CPU; UNUSED(cpuFreq); - #undef SDSS - #define SDSS 2 - #define PIN_EXISTS_(P1,P2) (defined(P1##P2) && P1##P2 >= 0) - #if HAS_MEDIA && DISABLED(SDIO_SUPPORT) && PIN_EXISTS_(SDSS,) - OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up + #if HAS_MEDIA && DISABLED(SDIO_SUPPORT) && PIN_EXISTS(SD_SS) + OUT_WRITE(SD_SS_PIN, HIGH); // Try to set SD_SS_PIN inactive before any other SPI users start up #endif #if PIN_EXISTS(LED) diff --git a/Marlin/src/HAL/RP2040/spi_pins.h b/Marlin/src/HAL/RP2040/spi_pins.h index e6ee840b5544..949fdff36f3a 100644 --- a/Marlin/src/HAL/RP2040/spi_pins.h +++ b/Marlin/src/HAL/RP2040/spi_pins.h @@ -24,6 +24,8 @@ /** * Define SPI Pins: SCK, MISO, MOSI, SS */ +#define PIN_SPI_SS 2 + #ifndef SD_SCK_PIN #define SD_SCK_PIN PIN_SPI_SCK #endif @@ -33,6 +35,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN PIN_SPI_MOSI #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN PIN_SPI_SS -#endif diff --git a/Marlin/src/HAL/SAMD21/HAL.cpp b/Marlin/src/HAL/SAMD21/HAL.cpp index 3656d97190e6..0a95366cc4f7 100644 --- a/Marlin/src/HAL/SAMD21/HAL.cpp +++ b/Marlin/src/HAL/SAMD21/HAL.cpp @@ -107,7 +107,7 @@ void MarlinHAL::init() { #if HAS_SD_DETECT && SD_CONNECTION_IS(ONBOARD) SET_INPUT_PULLUP(SD_DETECT_PIN); #endif - OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up + OUT_WRITE(SD_SS_PIN, HIGH); // Try to set SDSS inactive before any other SPI users start up #endif } diff --git a/Marlin/src/HAL/SAMD21/spi_pins.h b/Marlin/src/HAL/SAMD21/spi_pins.h index 8c25b84dc182..1186c3de48c5 100644 --- a/Marlin/src/HAL/SAMD21/spi_pins.h +++ b/Marlin/src/HAL/SAMD21/spi_pins.h @@ -45,10 +45,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN 37 #endif -#ifndef SDSS - #define SDSS 18 -#endif - -#ifndef SD_SS_PIN - #define SD_SS_PIN SDSS -#endif diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp index a3c871ce516a..cfc44e1360ce 100644 --- a/Marlin/src/HAL/SAMD51/HAL.cpp +++ b/Marlin/src/HAL/SAMD51/HAL.cpp @@ -669,7 +669,7 @@ void MarlinHAL::init() { #if HAS_SD_DETECT && SD_CONNECTION_IS(ONBOARD) SET_INPUT_PULLUP(SD_DETECT_PIN); #endif - OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up + OUT_WRITE(SD_SS_PIN, HIGH); // Try to set SDSS inactive before any other SPI users start up #endif } diff --git a/Marlin/src/HAL/SAMD51/spi_pins.h b/Marlin/src/HAL/SAMD51/spi_pins.h index 2c7cbeb99432..a2d5b72ec409 100644 --- a/Marlin/src/HAL/SAMD51/spi_pins.h +++ b/Marlin/src/HAL/SAMD51/spi_pins.h @@ -46,14 +46,9 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN 51 #endif - #ifndef SDSS - #define SDSS 53 - #endif #else #error "Unsupported board!" #endif - -#define SD_SS_PIN SDSS diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp index 610bd0b243bd..6bebaa24f0ce 100644 --- a/Marlin/src/HAL/STM32/HAL.cpp +++ b/Marlin/src/HAL/STM32/HAL.cpp @@ -69,8 +69,8 @@ void MarlinHAL::init() { constexpr int cpuFreq = F_CPU; UNUSED(cpuFreq); - #if HAS_MEDIA && DISABLED(ONBOARD_SDIO) && (defined(SDSS) && SDSS != -1) - OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up + #if HAS_MEDIA && DISABLED(ONBOARD_SDIO) && PIN_EXISTS(SD_SS) + OUT_WRITE(SD_SS_PIN, HIGH); // Try to set SDSS inactive before any other SPI users start up #endif #if PIN_EXISTS(LED) diff --git a/Marlin/src/HAL/STM32/spi_pins.h b/Marlin/src/HAL/STM32/spi_pins.h index 7f341a8c253f..da6fa0d160b5 100644 --- a/Marlin/src/HAL/STM32/spi_pins.h +++ b/Marlin/src/HAL/STM32/spi_pins.h @@ -33,6 +33,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN PIN_SPI_MOSI #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN PIN_SPI_SS -#endif diff --git a/Marlin/src/HAL/STM32F1/spi_pins.h b/Marlin/src/HAL/STM32F1/spi_pins.h index 3d3c8f8d2f18..d9c5e1f8c636 100644 --- a/Marlin/src/HAL/STM32F1/spi_pins.h +++ b/Marlin/src/HAL/STM32F1/spi_pins.h @@ -46,11 +46,6 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN PA7 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN PA4 -#endif -#undef SDSS -#define SDSS SD_SS_PIN #ifndef SPI_DEVICE #define SPI_DEVICE 1 diff --git a/Marlin/src/HAL/TEENSY31_32/spi_pins.h b/Marlin/src/HAL/TEENSY31_32/spi_pins.h index 6d0d05f85a5d..dbd0bb9174e3 100644 --- a/Marlin/src/HAL/TEENSY31_32/spi_pins.h +++ b/Marlin/src/HAL/TEENSY31_32/spi_pins.h @@ -24,4 +24,3 @@ #define SD_SCK_PIN 13 #define SD_MISO_PIN 12 #define SD_MOSI_PIN 11 -#define SD_SS_PIN 20 // SDSS // A.28, A.29, B.21, C.26, C.29 diff --git a/Marlin/src/HAL/TEENSY35_36/spi_pins.h b/Marlin/src/HAL/TEENSY35_36/spi_pins.h index cfffdc932598..d898a923f583 100644 --- a/Marlin/src/HAL/TEENSY35_36/spi_pins.h +++ b/Marlin/src/HAL/TEENSY35_36/spi_pins.h @@ -28,4 +28,3 @@ #define SD_SCK_PIN 13 #define SD_MISO_PIN 12 #define SD_MOSI_PIN 11 -#define SD_SS_PIN 20 // SDSS // A.28, A.29, B.21, C.26, C.29 diff --git a/Marlin/src/HAL/TEENSY40_41/spi_pins.h b/Marlin/src/HAL/TEENSY40_41/spi_pins.h index ba4a2c700a4b..fc1c2a7fed2b 100644 --- a/Marlin/src/HAL/TEENSY40_41/spi_pins.h +++ b/Marlin/src/HAL/TEENSY40_41/spi_pins.h @@ -28,4 +28,3 @@ #define SD_SCK_PIN 13 #define SD_MISO_PIN 12 #define SD_MOSI_PIN 11 -#define SD_SS_PIN 20 // SDSS // A.28, A.29, B.21, C.26, C.29 diff --git a/Marlin/src/inc/Changes.h b/Marlin/src/inc/Changes.h index 8e7a71ecfc1b..abd7db80112d 100644 --- a/Marlin/src/inc/Changes.h +++ b/Marlin/src/inc/Changes.h @@ -743,8 +743,18 @@ #error "MMU2_DEBUG is now MMU_DEBUG." #elif defined(FTM_SHAPING_DEFAULT_X_FREQ) || defined(FTM_SHAPING_DEFAULT_Y_FREQ) #error "FTM_SHAPING_DEFAULT_[XY]_FREQ is now FTM_SHAPING_DEFAULT_FREQ_[XY]." +#elif defined(SDSS) + #error "SDSS is now SD_SS_PIN." #endif +// SDSS renamed to SD_SS_PIN +#undef SDSS +#define SDSS 8675309 +#if USB_CS_PIN == SDSS + #error "SDSS is now SD_SS_PIN." +#endif +#undef SDSS + // Changes to Probe Temp Compensation (#17392) #if HAS_PTC && TEMP_SENSOR_PROBE && TEMP_SENSOR_BED #if defined(PTC_PARK_POS_X) || defined(PTC_PARK_POS_Y) || defined(PTC_PARK_POS_Z) diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h index 396349384159..24e1d6ce5e37 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h @@ -138,7 +138,7 @@ #define CLCD_SPI_CS BTN_EN1 #define CLCD_MOD_RESET BTN_EN2 #if MB(EINSY_RAMBO, EINSY_RETRO) && !HAS_MEDIA - #define CLCD_SPI_EXTRA_CS SDSS + #define CLCD_SPI_EXTRA_CS SD_SS_PIN #endif #endif diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h index 06e46e3c4c08..425d6a0decac 100644 --- a/Marlin/src/pins/esp32/pins_E4D.h +++ b/Marlin/src/pins/esp32/pins_E4D.h @@ -97,5 +97,5 @@ #define SD_MOSI_PIN 23 #define SD_MISO_PIN 19 #define SD_SCK_PIN 18 -#define SDSS 5 +#define SD_SS_PIN 5 #define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers diff --git a/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h b/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h index 578ccfa849f5..b2392543465e 100644 --- a/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h +++ b/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h @@ -112,11 +112,8 @@ // #define FAN_SOFT_PWM_REQUIRED // check if needed +// // NeoPixel Rings +// #define BOARD_NEOPIXEL_PIN 14 #define NEOPIXEL2_PIN 27 - -// SPI -#define MISO_PIN 19 -#define MOSI_PIN 23 -#define SCK_PIN 18 diff --git a/Marlin/src/pins/esp32/pins_ESP32.h b/Marlin/src/pins/esp32/pins_ESP32.h index 9c9b06ca6437..6da77f55da0f 100644 --- a/Marlin/src/pins/esp32/pins_ESP32.h +++ b/Marlin/src/pins/esp32/pins_ESP32.h @@ -85,4 +85,4 @@ #define HEATER_BED_PIN 4 // SPI -#define SDSS 5 +#define SD_SS_PIN 5 diff --git a/Marlin/src/pins/esp32/pins_ESPA_common.h b/Marlin/src/pins/esp32/pins_ESPA_common.h index 36068150f720..0f1204878fa4 100644 --- a/Marlin/src/pins/esp32/pins_ESPA_common.h +++ b/Marlin/src/pins/esp32/pins_ESPA_common.h @@ -77,5 +77,5 @@ #define SD_MOSI_PIN 23 #define SD_MISO_PIN 19 #define SD_SCK_PIN 18 -#define SDSS 5 +#define SD_SS_PIN 5 #define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers diff --git a/Marlin/src/pins/esp32/pins_GODI_CONTROLLER_V1_0.h b/Marlin/src/pins/esp32/pins_GODI_CONTROLLER_V1_0.h index 3099b492e3e4..7cbaa96088f5 100644 --- a/Marlin/src/pins/esp32/pins_GODI_CONTROLLER_V1_0.h +++ b/Marlin/src/pins/esp32/pins_GODI_CONTROLLER_V1_0.h @@ -91,7 +91,7 @@ #define SD_MOSI_PIN 23 #define SD_MISO_PIN 19 #define SD_SCK_PIN 18 -#define SDSS 5 +#define SD_SS_PIN 5 #define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers #if HAS_TMC_UART diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h index 4c043fd36335..6b5411e09d51 100644 --- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h +++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h @@ -160,7 +160,7 @@ //#define SD_SCK_PIN EXP2_02_PIN // uses esp32 default 18 // TODO: Migrate external SD Card to pins/lcd -#define SDSS EXP2_04_PIN +#define SD_SS_PIN EXP2_04_PIN #define SD_DETECT_PIN EXP2_07_PIN // IO34 default is SD_DET signal (Jump to SDDET) #define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers diff --git a/Marlin/src/pins/esp32/pins_MM_JOKER.h b/Marlin/src/pins/esp32/pins_MM_JOKER.h index b74321dbfcef..2ebeda6b6071 100644 --- a/Marlin/src/pins/esp32/pins_MM_JOKER.h +++ b/Marlin/src/pins/esp32/pins_MM_JOKER.h @@ -213,7 +213,7 @@ #define SD_MOSI_PIN 23 #define SD_MISO_PIN 19 #define SD_SCK_PIN 18 -#define SDSS 5 +#define SD_SS_PIN 5 #define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers // diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h index bcdb8c4faa75..6bded9db9b9c 100644 --- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h +++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h @@ -118,7 +118,7 @@ #define SD_MOSI_PIN 23 #define SD_MISO_PIN 19 #define SD_SCK_PIN 18 -#define SDSS 5 +#define SD_SS_PIN 5 #define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers // diff --git a/Marlin/src/pins/esp32/pins_PANDA_common.h b/Marlin/src/pins/esp32/pins_PANDA_common.h index 2cc954940e47..b668245446ae 100644 --- a/Marlin/src/pins/esp32/pins_PANDA_common.h +++ b/Marlin/src/pins/esp32/pins_PANDA_common.h @@ -111,7 +111,7 @@ #define SD_MOSI_PIN EXP2_06_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_SCK_PIN EXP2_02_PIN - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_DETECT_PIN EXP2_07_PIN #endif diff --git a/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h b/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h index a477308277da..482d68616a07 100644 --- a/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h +++ b/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h @@ -123,10 +123,9 @@ // SPI // #define SPI_DEVICE -1 // Maple - #define SCK_PIN -1 - #define MISO_PIN -1 - #define MOSI_PIN -1 - #define SS_PIN -1 + #define SD_SCK_PIN -1 + #define SD_MISO_PIN -1 + #define SD_MOSI_PIN -1 // // SDIO @@ -141,12 +140,10 @@ #else - #undef SDSS - #define SDSS PC11 // SDIO_D3_PIN - #define SS_PIN SDSS - #define SCK_PIN PC12 // SDIO_CK_PIN - #define MISO_PIN PC8 // SDIO_D0_PIN - #define MOSI_PIN PD2 // SDIO_CMD_PIN + #define SD_SS_PIN PC11 // SDIO_D3_PIN + #define SD_SCK_PIN PC12 // SDIO_CK_PIN + #define SD_MISO_PIN PC8 // SDIO_D0_PIN + #define SD_MOSI_PIN PD2 // SDIO_CMD_PIN #define SOFTWARE_SPI #endif diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h index 6d5a3c70b5a2..8645baf2e4e0 100644 --- 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_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h index c498af3a64d9..63a8b8f4eaa3 100644 --- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h +++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h @@ -151,7 +151,6 @@ #define SD_MISO_PIN P0_16 // EXP1-4 #define SD_MOSI_PIN P0_18 // EXP1-3 #define SD_SS_PIN P1_30 // EXP1-2 - #define SDSS SD_SS_PIN #endif /** diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h index 3fb29b90929d..83195aaaac78 100644 --- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h +++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h @@ -124,14 +124,11 @@ * Hardware SPI can't be used because P0_17 (MISO) is not brought out on this board. */ #if HAS_MEDIA - #define SD_SCK_PIN P0_15 // EXP1-5 #define SD_MISO_PIN P0_16 // EXP1-4 #define SD_MOSI_PIN P0_18 // EXP1-3 #define SD_SS_PIN P1_30 // EXP1-2 - #define SDSS SD_SS_PIN - -#endif // HAS_MEDIA +#endif /** * PWMS diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h index be6da885df10..b10b7fa4144a 100644 --- 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 index 45b08b016a10..e6b4baddaff5 100644 --- 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 index 2de1e459e1e6..5219540db387 100644 --- 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 index b028d490981d..065502e46a44 100644 --- 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 index 38c7cac3d4b7..9b1258bec2da 100644 --- 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 index 9ca1fb9555e0..c5bd72ef0902 100644 --- 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_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h index 26f0ff39cec6..26f2d960a408 100644 --- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h +++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h @@ -117,7 +117,7 @@ #define BTN_ENC P2_11 #define SD_DETECT_PIN P1_18 - #define SDSS P1_21 + #define SD_SS_PIN P1_21 #define STAT_LED_RED_PIN P1_19 #define STAT_LED_BLUE_PIN P1_20 diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h index 5256da2ef22f..f276f9fb67a7 100644 --- 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 index 485b3109ad03..cae65592b48f 100644 --- 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 index d1ecb0e7dd03..2529f2cafbae 100644 --- 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 index 5d7a703015d9..56e7ef53b30a 100644 --- 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_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h index 062e572605cb..f762bdb6ca18 100644 --- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h +++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h @@ -105,7 +105,7 @@ #define BTN_ENC P1_30 #define SD_DETECT_PIN P1_18 - #define SDSS P1_21 + #define SD_SS_PIN P1_21 #define STAT_LED_RED_PIN P1_19 #define STAT_LED_BLUE_PIN P1_20 diff --git a/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h b/Marlin/src/pins/lpc1769/pins_XTLW_CLIMBER_8TH_LPC.h index f5a23ec5fb78..bbdf16dc2ba4 100644 --- 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_CHEAPTRONICv2.h b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h index 2669210d5715..8c3411603705 100644 --- a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h +++ b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h @@ -129,7 +129,7 @@ #define BEEPER_PIN 44 #if HAS_MEDIA - #define SDSS 53 + #define SD_SS_PIN 53 #define SD_DETECT_PIN 49 #endif diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h index 5c0c11033df1..6a7eef5782da 100644 --- a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h +++ b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h @@ -117,7 +117,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 13 // Tools diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h index 37485ea790a5..05f2865ae42d 100644 --- a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h +++ b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h @@ -117,7 +117,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 15 // Tools diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h index bbb0385844f9..7b23aa0b7376 100644 --- a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h +++ b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h @@ -112,7 +112,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 40 // Common I/O diff --git a/Marlin/src/pins/mega/pins_EINSTART-S.h b/Marlin/src/pins/mega/pins_EINSTART-S.h index 92c85c12110f..27e5f8b075a6 100644 --- a/Marlin/src/pins/mega/pins_EINSTART-S.h +++ b/Marlin/src/pins/mega/pins_EINSTART-S.h @@ -75,7 +75,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 4 // diff --git a/Marlin/src/pins/mega/pins_ELEFU_3.h b/Marlin/src/pins/mega/pins_ELEFU_3.h index 623b7a0d4335..b041f1e64b94 100644 --- a/Marlin/src/pins/mega/pins_ELEFU_3.h +++ b/Marlin/src/pins/mega/pins_ELEFU_3.h @@ -109,7 +109,7 @@ #if ENABLED(RA_CONTROL_PANEL) - #define SDSS 53 + #define SD_SS_PIN 53 #define SD_DETECT_PIN 28 #define BTN_EN1 14 diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h index 96e3e5c36ff6..08bcf9038570 100644 --- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h +++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h @@ -138,7 +138,7 @@ #define EXP2_07_PIN 38 // SD_DET #define EXP2_08_PIN -1 // RESET -#define SDSS EXP2_04_PIN +#define SD_SS_PIN EXP2_04_PIN #define LED_PIN 13 #if HAS_WIRED_LCD diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h index 1323ae3c8e24..72bdc7bb4beb 100644 --- a/Marlin/src/pins/mega/pins_GT2560_V3.h +++ b/Marlin/src/pins/mega/pins_GT2560_V3.h @@ -149,7 +149,7 @@ // Misc. Functions // #define SD_DETECT_PIN 38 -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 // Use 6 (case light) for external LED. 13 is internal (yellow) LED. #define PS_ON_PIN 12 diff --git a/Marlin/src/pins/mega/pins_GT2560_V41b.h b/Marlin/src/pins/mega/pins_GT2560_V41b.h index 3ffaaabef49e..daebc6526dcc 100644 --- a/Marlin/src/pins/mega/pins_GT2560_V41b.h +++ b/Marlin/src/pins/mega/pins_GT2560_V41b.h @@ -185,7 +185,7 @@ // Misc. Functions // #define SD_DETECT_PIN 38 -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 // Use 6 (case light) for external LED. 13 is internal (yellow) LED. #define PS_ON_PIN 12 diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h index 638465f3b9eb..38e6617f51aa 100644 --- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h +++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h @@ -99,7 +99,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 39 //#define LED_PIN 8 diff --git a/Marlin/src/pins/mega/pins_INTAMSYS40.h b/Marlin/src/pins/mega/pins_INTAMSYS40.h index 6b8296506552..83a77ec98ccd 100644 --- a/Marlin/src/pins/mega/pins_INTAMSYS40.h +++ b/Marlin/src/pins/mega/pins_INTAMSYS40.h @@ -104,7 +104,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 39 #if ENABLED(CASE_LIGHT_ENABLE) diff --git a/Marlin/src/pins/mega/pins_LEAPFROG.h b/Marlin/src/pins/mega/pins_LEAPFROG.h index d986728e7273..de4831a36a0e 100644 --- a/Marlin/src/pins/mega/pins_LEAPFROG.h +++ b/Marlin/src/pins/mega/pins_LEAPFROG.h @@ -84,7 +84,7 @@ // // Misc. Functions // -#define SDSS 11 +#define SD_SS_PIN 11 #define LED_PIN 13 #define SOL1_PIN 16 #define SOL2_PIN 17 diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h index 514f7b255efb..4ee5df8c6686 100644 --- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h +++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h @@ -128,7 +128,7 @@ // // Misc. Functions // -#define SDSS MINI_06 +#define SD_SS_PIN MINI_06 #define LED_PIN 13 #ifndef CASE_LIGHT_PIN diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h index 90d128c9fc02..d5616c002677 100644 --- a/Marlin/src/pins/mega/pins_MEGATRONICS.h +++ b/Marlin/src/pins/mega/pins_MEGATRONICS.h @@ -95,7 +95,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #define PS_ON_PIN 12 diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h index 285a77b6361a..9f7abd3fb88e 100644 --- a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h +++ b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h @@ -110,7 +110,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #define PS_ON_PIN 12 diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h index 5a7199406306..4c60ef1a5b3d 100644 --- a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h +++ b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h @@ -135,7 +135,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #define PS_ON_PIN 12 diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h index fb7366081591..9dc0c5f7d859 100644 --- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h +++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h @@ -239,7 +239,7 @@ // // SD Card // -#define SDSS 53 // B0 +#define SD_SS_PIN 53 // B0 #define SD_DETECT_PIN 9 // H6 #if HAS_TMC_UART diff --git a/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin/src/pins/mega/pins_MINITRONICS.h index d3a012dd4bc0..967c04a18111 100644 --- a/Marlin/src/pins/mega/pins_MINITRONICS.h +++ b/Marlin/src/pins/mega/pins_MINITRONICS.h @@ -92,7 +92,7 @@ // // Misc. Functions // -#define SDSS 16 +#define SD_SS_PIN 16 #define LED_PIN 46 // diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h index 804aa38e59d6..a275802f2750 100644 --- a/Marlin/src/pins/mega/pins_OVERLORD.h +++ b/Marlin/src/pins/mega/pins_OVERLORD.h @@ -99,7 +99,7 @@ // // SD Card // -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 38 // diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h index 63e14d9bf2d2..ec7c32dacada 100644 --- a/Marlin/src/pins/mega/pins_PICA.h +++ b/Marlin/src/pins/mega/pins_PICA.h @@ -127,7 +127,7 @@ // SD Support // #define SD_DETECT_PIN EXP2_07_PIN -#define SDSS EXP2_04_PIN +#define SD_SS_PIN EXP2_04_PIN /** PICA Expansion Headers * ------ ------ @@ -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/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h index d739157aaf4e..2d8419c50c58 100644 --- a/Marlin/src/pins/mega/pins_SILVER_GATE.h +++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h @@ -51,7 +51,7 @@ #define E0_DIR_PIN 37 #define E0_ENABLE_PIN 45 -#define SDSS 16 +#define SD_SS_PIN 16 #ifndef FIL_RUNOUT_PIN #define FIL_RUNOUT_PIN 34 // X_MAX unless overridden diff --git a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h index e224e061787f..8a350d34d09c 100644 --- a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h +++ b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h @@ -82,7 +82,7 @@ // SD Card // #define SD_DETECT_PIN 83 -#define SDSS 53 +#define SD_SS_PIN 53 // // Misc. Functions diff --git a/Marlin/src/pins/mega/pins_WEEDO_62A.h b/Marlin/src/pins/mega/pins_WEEDO_62A.h index 436529cb3510..b7143c79120f 100644 --- a/Marlin/src/pins/mega/pins_WEEDO_62A.h +++ b/Marlin/src/pins/mega/pins_WEEDO_62A.h @@ -85,7 +85,7 @@ // SD Support // #if HAS_MEDIA - #define SDSS 53 + #define SD_SS_PIN 53 #define SD_DETECT_PIN 49 #endif diff --git a/Marlin/src/pins/native/pins_RAMPS_NATIVE.h b/Marlin/src/pins/native/pins_RAMPS_NATIVE.h index 42b33a094487..563ad9e5b379 100644 --- a/Marlin/src/pins/native/pins_RAMPS_NATIVE.h +++ b/Marlin/src/pins/native/pins_RAMPS_NATIVE.h @@ -193,7 +193,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #define BOARD_NEOPIXEL_PIN 71 @@ -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 index 2372382a3407..e93f2325459b 100644 --- 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) @@ -1092,8 +1092,8 @@ #if PIN_EXISTS(SD_SCK) REPORT_NAME_DIGITAL(__LINE__, SD_SCK_PIN) #endif -#if _EXISTS(SDSS) - REPORT_NAME_DIGITAL(__LINE__, SDSS) +#if PIN_EXISTS(SD_SS) + REPORT_NAME_DIGITAL(__LINE__, SD_SS_PIN) #endif #if PIN_EXISTS(SD_SS) REPORT_NAME_DIGITAL(__LINE__, SD_SS_PIN) diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h index 1d3b0ebcce2a..9e82d854f9a0 100644 --- a/Marlin/src/pins/pins_postprocess.h +++ b/Marlin/src/pins/pins_postprocess.h @@ -564,8 +564,8 @@ #ifndef SDPOWER_PIN #define SDPOWER_PIN -1 #endif -#ifndef SDSS - #define SDSS -1 +#ifndef SD_SS_PIN + #define SD_SS_PIN -1 #endif #ifndef LED_PIN #define LED_PIN -1 diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h index 8315de6ee30b..98a16764afc0 100644 --- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h +++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h @@ -178,7 +178,7 @@ // // Misc. Functions // -#define SDSS EXP2_04_PIN +#define SD_SS_PIN EXP2_04_PIN #define LED_PIN 13 #ifndef CASE_LIGHT_PIN diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h index 1f5061d4ce15..ca681b8174a8 100644 --- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h +++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h @@ -141,7 +141,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #ifndef CASE_LIGHT_PIN diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h index 18f73a81d562..1d56e749f229 100644 --- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h +++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h @@ -121,7 +121,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #if !MB(MINIRAMBO_10A) #define CASE_LIGHT_PIN 9 diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h index 7e46b171512e..fdcb7958c3fb 100644 --- a/Marlin/src/pins/rambo/pins_RAMBO.h +++ b/Marlin/src/pins/rambo/pins_RAMBO.h @@ -152,7 +152,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #define PS_ON_PIN 4 diff --git a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h index 0d212010e065..1f003440b066 100644 --- a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h +++ b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h @@ -114,7 +114,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #define PS_ON_PIN 4 diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h index de4b3cfeb9ac..e5a2d05cb71a 100644 --- a/Marlin/src/pins/ramps/pins_3DRAG.h +++ b/Marlin/src/pins/ramps/pins_3DRAG.h @@ -74,7 +74,7 @@ // // Misc. Functions // -#define SDSS 25 +#define SD_SS_PIN 25 #ifndef CASE_LIGHT_PIN #define CASE_LIGHT_PIN -1 // Hardware PWM but one is not available on expansion header diff --git a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h index 83045bdfe02d..40351d2bde02 100644 --- a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h +++ b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h @@ -77,7 +77,7 @@ // // Misc. Functions // -#define SDSS 53 // PB0 / SS +#define SD_SS_PIN 53 // PB0 / SS #define LED_PIN 13 // PB7 / PWM13 #define SD_MISO_PIN 50 // PB3 diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h index f6ee06846dfd..6ebda4638b5d 100644 --- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h +++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h @@ -144,8 +144,8 @@ // // Misc. Functions // -#ifndef SDSS - #define SDSS 53 +#ifndef SD_SS_PIN + #define SD_SS_PIN 53 #endif #define LED_PIN 13 #define LED4_PIN 5 diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h index fad3cc0f9de8..76061633f3e2 100644 --- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h +++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h @@ -139,7 +139,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #ifndef LED_PIN #define LED_PIN 13 // The Formbot v 1 board has almost no unassigned pins. #endif // The Board's LED is a good place to connect the Max7219 Matrix. diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h index fd799e0d49d0..c7cb34be7c69 100644 --- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h +++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h @@ -141,7 +141,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #ifndef LED_PIN #define LED_PIN 13 diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h index 59c4c7988421..98117750f996 100644 --- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h +++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h @@ -231,7 +231,7 @@ // SD Card // -#define SDSS EXP2_04_PIN +#define SD_SS_PIN EXP2_04_PIN #define SD_DETECT_PIN EXP2_07_PIN // diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h index 170401bf1c21..a1dbb85a77ac 100644 --- a/Marlin/src/pins/ramps/pins_K8600.h +++ b/Marlin/src/pins/ramps/pins_K8600.h @@ -54,7 +54,7 @@ // // Misc. Functions // -#define SDSS 25 +#define SD_SS_PIN 25 #define CASE_LIGHT_PIN 7 // diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h index 6bd3e44ec8e8..a9cdd5705974 100644 --- a/Marlin/src/pins/ramps/pins_K8800.h +++ b/Marlin/src/pins/ramps/pins_K8800.h @@ -85,7 +85,7 @@ // // SD Card // -#define SDSS 25 +#define SD_SS_PIN 25 #define SD_DETECT_PIN 21 // PD0 // @@ -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_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h index 5797424c66c9..c71749aa8853 100644 --- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h +++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h @@ -121,7 +121,7 @@ // EXP2_06_PIN yellow MOSI // EXP2_02_PIN orange SCK - //#define SDSS EXP2_04_PIN // SDCS blue + //#define SD_SS_PIN EXP2_04_PIN // SDCS blue // // VIKI2 4-wire lead diff --git a/Marlin/src/pins/ramps/pins_ORTUR_4.h b/Marlin/src/pins/ramps/pins_ORTUR_4.h index e8a87911d1b7..83daa9380477 100644 --- 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 index 2d82b36f7740..e40415c82613 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin/src/pins/ramps/pins_RAMPS.h @@ -284,8 +284,8 @@ // // Misc. Functions // -#ifndef SDSS - #define SDSS AUX3_06 +#ifndef SD_SS_PIN + #define SD_SS_PIN AUX3_06 #endif #define LED_PIN 13 @@ -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_RAMPS_OLD.h b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h index fa24dd35b3ca..a5827569b57d 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h +++ b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h @@ -103,7 +103,7 @@ // Misc. Functions // #define SDPOWER_PIN 48 -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #ifndef CASE_LIGHT_PIN diff --git a/Marlin/src/pins/ramps/pins_RAMPS_S_12.h b/Marlin/src/pins/ramps/pins_RAMPS_S_12.h index 9565adad2f3b..10a76e99c73f 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS_S_12.h +++ b/Marlin/src/pins/ramps/pins_RAMPS_S_12.h @@ -184,7 +184,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #ifndef KILL_PIN diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h index 24cc2bada089..c62b68f6cc09 100644 --- a/Marlin/src/pins/ramps/pins_RUMBA.h +++ b/Marlin/src/pins/ramps/pins_RUMBA.h @@ -239,7 +239,7 @@ #define BEEPER_PIN 44 #if HAS_MEDIA - #define SDSS 53 + #define SD_SS_PIN 53 #define SD_DETECT_PIN 49 #endif diff --git a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h index f68b9ef8a6f7..8c015f99489a 100644 --- a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h +++ b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h @@ -151,7 +151,7 @@ // //#define PS_ON_PIN 40 // The M80/M81 PSU pin for boards v2.1-2.3 //#define CASE_LIGHT_PIN 5 -#define SDSS 53 +#define SD_SS_PIN 53 //#ifndef LED_PIN //#define LED_PIN 13 //#endif diff --git a/Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h b/Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h index 1197874d7168..3ef09f72d48d 100644 --- a/Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h +++ b/Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h @@ -125,7 +125,7 @@ // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector //#define FILWIDTH_PIN 5 // Analog Input -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 49 // diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h index a4968eff3fb7..440f66298f25 100644 --- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h +++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h @@ -206,7 +206,7 @@ // // Misc. Functions // -#define SDSS 53 // EXP2-4 +#define SD_SS_PIN 53 // EXP2-4 #define LED_PIN 13 //#ifndef FILWIDTH_PIN @@ -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) @@ -447,7 +447,7 @@ #define BTN_EN2 7 #define BTN_ENC 39 - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board //#define KILL_PIN 31 @@ -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 @@ -481,7 +481,7 @@ #define BTN_EN1 31 #define BTN_EN2 33 #define BTN_ENC 35 - //#define SDSS EXP2_04_PIN + //#define SD_SS_PIN EXP2_04_PIN #define SD_DETECT_PIN EXP2_07_PIN //#define KILL_PIN 64 @@ -501,7 +501,7 @@ #define BTN_EN2 63 #define BTN_ENC 59 - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_DETECT_PIN EXP2_07_PIN //#define KILL_PIN 64 diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h index e5998b3237c6..448c79a8d2c8 100644 --- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h +++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h @@ -114,7 +114,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 39 #define LED_PIN 8 //#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER.h b/Marlin/src/pins/ramps/pins_ULTIMAKER.h index b4eea9d4885c..baf4c234f6cc 100644 --- a/Marlin/src/pins/ramps/pins_ULTIMAKER.h +++ b/Marlin/src/pins/ramps/pins_ULTIMAKER.h @@ -106,7 +106,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #define PS_ON_PIN 12 #define SUICIDE_PIN 54 // PIN that has to be turned on right after start, to keep power flowing. diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h index f2d3b83fc96b..c8502fe3fd1f 100644 --- a/Marlin/src/pins/ramps/pins_ZRIB_V53.h +++ b/Marlin/src/pins/ramps/pins_ZRIB_V53.h @@ -171,8 +171,8 @@ // // Misc. Functions // -#ifndef SDSS - #define SDSS 53 +#ifndef SD_SS_PIN + #define SD_SS_PIN 53 #endif #define LED_PIN 13 @@ -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/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h index f63ca83723f3..57e4680508b4 100644 --- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h +++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h @@ -141,7 +141,7 @@ // // Misc. Functions // -#define SDSS 53 +#define SD_SS_PIN 53 #define LED_PIN 13 #ifndef FILWIDTH_PIN diff --git a/Marlin/src/pins/rp2040/pins_RP2040.h b/Marlin/src/pins/rp2040/pins_RP2040.h index ce1c5160aeac..aef5f5f9fde7 100644 --- a/Marlin/src/pins/rp2040/pins_RP2040.h +++ b/Marlin/src/pins/rp2040/pins_RP2040.h @@ -123,7 +123,7 @@ // // Misc. Functions // -#define SDSS 20 +#define SD_SS_PIN 20 //#define LED_PIN 13 #define NEOPIXEL_PIN 15 @@ -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_ADSK.h b/Marlin/src/pins/sam/pins_ADSK.h index c264ffb50e98..603565672fb9 100644 --- a/Marlin/src/pins/sam/pins_ADSK.h +++ b/Marlin/src/pins/sam/pins_ADSK.h @@ -129,7 +129,7 @@ A stepper for E0 extruder // // Misc. Functions // -#define SDSS 52 +#define SD_SS_PIN 52 #if ENABLED(ZONESTAR_LCD) diff --git a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h index ceaeb8a587b5..6f6182a6841c 100644 --- a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h +++ b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h @@ -121,7 +121,7 @@ // // Misc. Functions // -#define SDSS 77 // PA28 +#define SD_SS_PIN 77 // PA28 #define SD_DETECT_PIN 87 // PA29 #define LED_RED_PIN 40 // PC8 #define LED_GREEN_PIN 41 // PC9 diff --git a/Marlin/src/pins/sam/pins_ARCHIM1.h b/Marlin/src/pins/sam/pins_ARCHIM1.h index 1d8a77ba3641..1bbe86c41e21 100644 --- a/Marlin/src/pins/sam/pins_ARCHIM1.h +++ b/Marlin/src/pins/sam/pins_ARCHIM1.h @@ -172,7 +172,7 @@ #define SD_SCK_PIN 76 // D76 PA27 #define SD_MISO_PIN 74 // D74 PA25 #define SD_MOSI_PIN 75 // D75 PA26 -#define SDSS 87 // D87 PA29 +#define SD_SS_PIN 87 // D87 PA29 // 2MB SPI Flash #define SPI_FLASH_SS 52 // D52 PB21 diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h index a0488d64dc5d..2d0a42c03db8 100644 --- a/Marlin/src/pins/sam/pins_ARCHIM2.h +++ b/Marlin/src/pins/sam/pins_ARCHIM2.h @@ -193,7 +193,7 @@ #define SD_SCK_PIN 76 // D76 PA27 #define SD_MISO_PIN 74 // D74 PA25 #define SD_MOSI_PIN 75 // D75 PA26 -#define SDSS 87 // D87 PA29 +#define SD_SS_PIN 87 // D87 PA29 // Unused Digital GPIO J20 Pins #define GPIO_PB1_J20_5 94 // D94 PB1 (Header J20 5) diff --git a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h index 3d15f37e47fa..ee4890785b3b 100644 --- a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h +++ b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h @@ -119,7 +119,7 @@ #define SD_SCK_PIN 76 #define SD_MISO_PIN 74 #define SD_MOSI_PIN 75 -#define SDSS 53 +#define SD_SS_PIN 53 #define SD_DETECT_PIN 40 // Common I/O diff --git a/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin/src/pins/sam/pins_DUE3DOM.h index 66aa581271a2..50705ac964a9 100644 --- a/Marlin/src/pins/sam/pins_DUE3DOM.h +++ b/Marlin/src/pins/sam/pins_DUE3DOM.h @@ -105,7 +105,7 @@ // // Misc. Functions // -#define SDSS 4 +#define SD_SS_PIN 4 #define PS_ON_PIN 40 // @@ -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 index b9f73adfe9c1..519a8232e961 100644 --- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h +++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h @@ -97,7 +97,7 @@ // // Misc. Functions // -#define SDSS 4 +#define SD_SS_PIN 4 #define PS_ON_PIN 40 // @@ -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_KRATOS32.h b/Marlin/src/pins/sam/pins_KRATOS32.h index bebe2b82a35d..ff715270d225 100644 --- a/Marlin/src/pins/sam/pins_KRATOS32.h +++ b/Marlin/src/pins/sam/pins_KRATOS32.h @@ -152,7 +152,7 @@ #define BTN_EN2 50 #define BTN_ENC 46 - #define SDSS 4 + #define SD_SS_PIN 4 #define SD_DETECT_PIN 14 #define BEEPER_PIN 41 diff --git a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h index b85150f1ca29..0f4db200a3b4 100644 --- a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h +++ b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h @@ -152,7 +152,7 @@ #define SD_MISO_PIN 68 // set to unused pins for now #define SD_MOSI_PIN 69 // set to unused pins for now #define SD_SCK_PIN 70 // set to unused pins for now -#define SDSS 71 // set to unused pins for now +#define SD_SS_PIN 71 // set to unused pins for now /** * G2 uses 8 pins that are not available in the DUE environment: diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h index a490f9f89f89..40f667eff46f 100644 --- a/Marlin/src/pins/sam/pins_RADDS.h +++ b/Marlin/src/pins/sam/pins_RADDS.h @@ -244,7 +244,7 @@ #define BTN_BACK 71 - #define SDSS 10 + #define SD_SS_PIN 10 #define SD_DETECT_PIN 14 #elif IS_RRD_FG_SC @@ -262,7 +262,7 @@ #define BTN_EN2 52 #define BTN_ENC 48 - #define SDSS 10 + #define SD_SS_PIN 10 #define SD_DETECT_PIN 14 #elif HAS_U8GLIB_I2C_OLED @@ -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) @@ -293,5 +293,5 @@ #endif // HAS_WIRED_LCD #ifndef SDSS - #define SDSS 4 + #define SD_SS_PIN 4 #endif diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h index 2b9c8fd7eb79..a34a02839c3a 100644 --- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h +++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h @@ -131,7 +131,7 @@ // // Misc. Functions // -#define SDSS 4 +#define SD_SS_PIN 4 #define LED_PIN 13 /** diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h index 0ece2aeade5e..03ba77c07723 100644 --- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h +++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h @@ -155,7 +155,7 @@ // // Misc. Functions // -#define SDSS 4 // 4,10,52 if using HW SPI. +#define SD_SS_PIN 4 // 4,10,52 if using HW SPI. #define LED_PIN -1 // 13 - HEATER_0_PIN #define PS_ON_PIN -1 // 65 @@ -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 index fa27868ff940..a4574cda54c0 100644 --- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h +++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h @@ -145,7 +145,7 @@ // // Misc. Functions // -#define SDSS 4 // 4,10,52 if using HW SPI. +#define SD_SS_PIN 4 // 4,10,52 if using HW SPI. #define LED_PIN -1 // 13 - HEATER_0_PIN #define PS_ON_PIN -1 // 65 @@ -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/sam/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h index f3ec7806e620..bbd618984214 100644 --- a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h +++ b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h @@ -128,7 +128,7 @@ // // Misc. Functions // -#define SDSS 59 +#define SD_SS_PIN 59 #define SD_DETECT_PIN 60 #define LED_PIN 13 #define PS_ON_PIN 32 diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h index 7f4344a3645f..7f8943ac4642 100644 --- 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 @@ -561,11 +561,10 @@ #endif #if SD_CONNECTION_IS(ONBOARD) - #define SDSS 83 - #undef SD_DETECT_PIN + #define SD_SS_PIN 83 #define SD_DETECT_PIN 95 #else - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #endif #if HAS_TMC_UART diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h index fd475ab2220f..e4766d33bb34 100644 --- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h +++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h @@ -411,7 +411,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 @@ -422,7 +422,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) @@ -456,7 +456,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 @@ -613,11 +613,11 @@ #endif #if SD_CONNECTION_IS(ONBOARD) - #define SDSS 83 + #define SD_SS_PIN 83 #undef SD_DETECT_PIN #define SD_DETECT_PIN 95 #else - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #endif #if HAS_TMC_UART diff --git a/Marlin/src/pins/samd/pins_MINITRONICS20.h b/Marlin/src/pins/samd/pins_MINITRONICS20.h index 12cba80f000e..3d625180cac9 100644 --- a/Marlin/src/pins/samd/pins_MINITRONICS20.h +++ b/Marlin/src/pins/samd/pins_MINITRONICS20.h @@ -313,7 +313,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 @@ -324,7 +324,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) @@ -358,7 +358,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 @@ -500,7 +500,7 @@ // SD Support // -#define SDSS 2 +#define SD_SS_PIN 2 #undef SD_DETECT_PIN #define SD_DETECT_PIN 22 diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h index 33a45fc9f4e8..97d662f8f204 100644 --- a/Marlin/src/pins/samd/pins_RAMPS_144.h +++ b/Marlin/src/pins/samd/pins_RAMPS_144.h @@ -244,11 +244,11 @@ #endif #if SD_CONNECTION_IS(ONBOARD) - #define SDSS 83 + #define SD_SS_PIN 83 #undef SD_DETECT_PIN #define SD_DETECT_PIN 95 #else - #define SDSS 53 + #define SD_SS_PIN 53 #endif // @@ -538,7 +538,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 AUX4_07 #undef LCD_PINS_EN // not used, causes false pin conflict report @@ -548,7 +548,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 @@ -584,7 +584,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/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h index 708df2219953..0d87e9ad0e93 100644 --- a/Marlin/src/pins/sanguino/pins_ANET_10.h +++ b/Marlin/src/pins/sanguino/pins_ANET_10.h @@ -148,7 +148,7 @@ // // Misc. Functions // -#define SDSS 31 +#define SD_SS_PIN 31 #define LED_PIN -1 /** @@ -184,7 +184,7 @@ #if HAS_WIRED_LCD - #define LCD_SDSS EXP1_06_PIN + #define LCD_SDSS_PIN EXP1_06_PIN #if HAS_ADC_BUTTONS diff --git a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h index 86869fc85f31..d9c07eec50b1 100644 --- a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h +++ b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h @@ -82,5 +82,5 @@ // // Misc. Functions // -#define SDSS 4 +#define SD_SS_PIN 4 #define PS_ON_PIN 14 diff --git a/Marlin/src/pins/sanguino/pins_GEN6.h b/Marlin/src/pins/sanguino/pins_GEN6.h index ad8ef97cb493..e3c58029195d 100644 --- a/Marlin/src/pins/sanguino/pins_GEN6.h +++ b/Marlin/src/pins/sanguino/pins_GEN6.h @@ -88,7 +88,7 @@ // // Misc. Functions // -#define SDSS 17 +#define SD_SS_PIN 17 #define DEBUG_PIN 0 #ifndef CASE_LIGHT_PIN diff --git a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h index c363e528d380..eb03fe317831 100644 --- a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h +++ b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h @@ -85,7 +85,7 @@ // // Misc. Functions // -#define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support +#define SD_SS_PIN 31 // SCL pin of I2C header || CS Pin for SD Card support #define PS_ON_PIN 19 #ifndef CASE_LIGHT_PIN diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h index ba3c6767b261..adbbbc0300ae 100644 --- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h +++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h @@ -70,7 +70,7 @@ #define DOGLCD_A0 EXP1_06_PIN #endif - #define LCD_SDSS 31 // Controller's SD card + #define LCD_SDSS_PIN 31 // Controller's SD card #define BTN_ENC EXP1_02_PIN #define BTN_EN1 EXP1_03_PIN diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY_E2.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY_E2.h index dd557265c464..991e8ec66522 100644 --- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY_E2.h +++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY_E2.h @@ -76,7 +76,7 @@ #define LCD_PINS_DEFINED #endif -#define LCD_SDSS 31 // Controller's SD card +#define LCD_SDSS_PIN 31 // Controller's SD card #include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11 diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h index 99cdfd0b4228..fcaeb3ba337e 100644 --- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h +++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h @@ -30,7 +30,7 @@ #define Z_ENABLE_PIN 14 -#define LCD_SDSS -1 +#define LCD_SDSS_PIN -1 #if ANY(CR10_STOCKDISPLAY, LCD_FOR_MELZI) #define BTN_ENC 26 diff --git a/Marlin/src/pins/sanguino/pins_OMCA.h b/Marlin/src/pins/sanguino/pins_OMCA.h index 428151ed5101..07a614a7ff8a 100644 --- a/Marlin/src/pins/sanguino/pins_OMCA.h +++ b/Marlin/src/pins/sanguino/pins_OMCA.h @@ -123,7 +123,7 @@ // // Misc. Functions // -#define SDSS 11 +#define SD_SS_PIN 11 #define I2C_SCL_PIN 16 #define I2C_SDA_PIN 17 diff --git a/Marlin/src/pins/sanguino/pins_OMCA_A.h b/Marlin/src/pins/sanguino/pins_OMCA_A.h index e3a46664b1e5..b60591aa5803 100644 --- a/Marlin/src/pins/sanguino/pins_OMCA_A.h +++ b/Marlin/src/pins/sanguino/pins_OMCA_A.h @@ -118,6 +118,6 @@ // // Misc. Functions // -#define SDSS 11 +#define SD_SS_PIN 11 /* Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31) */ diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h index 50df2c95091a..f65b55ca5c1c 100644 --- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h +++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h @@ -109,8 +109,8 @@ * If you encounter issues with these pins, upgrade your * Sanguino libraries! See #368. */ -//#define SDSS 24 -#define SDSS AUX1_09 +//#define SD_SS_PIN 24 +#define SD_SS_PIN AUX1_09 #if IS_MELZI #define LED_PIN AUX1_01 @@ -243,8 +243,8 @@ #if IS_MELZI #define BTN_ENC AUX1_05 - #ifndef LCD_SDSS - #define LCD_SDSS AUX1_07 // Panelolu2 SD card reader rather than the Melzi + #ifndef LCD_SDSS_PIN + #define LCD_SDSS_PIN AUX1_07 // Panelolu2 SD card reader rather than the Melzi #endif #else #define BTN_ENC AUX1_07 @@ -254,8 +254,8 @@ #else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2 #define BTN_ENC AUX1_02 - #ifndef LCD_SDSS - #define LCD_SDSS AUX1_03 // Smart Controller SD card reader rather than the Melzi + #ifndef LCD_SDSS_PIN + #define LCD_SDSS_PIN AUX1_03 // Smart Controller SD card reader rather than the Melzi #endif #endif diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h index 39d55d1b2831..b583c17b31d1 100644 --- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h +++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h @@ -159,7 +159,7 @@ // SD card // #if HAS_MEDIA - #define SDSS 4 + #define SD_SS_PIN 4 #endif #define SD_DETECT_PIN -1 @@ -191,7 +191,7 @@ // #define LCDSCREEN_NAME "ZONESTAR_12864LCD" #define FORCE_SOFT_SPI - //#define LCD_SDSS EXP1_03_PIN + //#define LCD_SDSS_PIN EXP1_03_PIN #define LCD_PINS_RS EXP1_03_PIN // ST7920 CS (LCD-4) #define LCD_PINS_EN EXP1_06_PIN // ST7920 DAT (LCD-5) #define LCD_PINS_D4 EXP1_04_PIN // ST7920 CLK (LCD-6) diff --git a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h index ba6263cd74f0..9687feacabee 100644 --- a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h +++ b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h @@ -37,11 +37,6 @@ #endif #endif -// -// SD CARD SPI -// -#define SDSS SD_SS_PIN - // // Timers // diff --git a/Marlin/src/pins/stm32f1/pins_BEAST.h b/Marlin/src/pins/stm32f1/pins_BEAST.h index cf64ff1c6a29..466f7fdbbe17 100644 --- a/Marlin/src/pins/stm32f1/pins_BEAST.h +++ b/Marlin/src/pins/stm32f1/pins_BEAST.h @@ -77,7 +77,7 @@ // // Misc. Functions // -#define SDSS PA15 +#define SD_SS_PIN PA15 #define LED_PIN PB2 // diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h index 7693aa690203..c9b1d93525cb 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h @@ -174,7 +174,7 @@ #if SD_CONNECTION_IS(ONBOARD) #define SD_DETECT_PIN PC4 #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card - #define SDSS ONBOARD_SD_CS_PIN + #define SD_SS_PIN ONBOARD_SD_CS_PIN #endif // diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h index de7ded7d52ac..ab1684ae26fb 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h @@ -368,4 +368,4 @@ #define ONBOARD_SPI_DEVICE 1 // SPI1 #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card -#define SDSS ONBOARD_SD_CS_PIN +#define SD_SS_PIN ONBOARD_SD_CS_PIN diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h index 09acba180b8b..8c463717f4be 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h @@ -416,7 +416,7 @@ #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card #define ENABLE_SPI1 -#define SDSS ONBOARD_SD_CS_PIN +#define SD_SS_PIN ONBOARD_SD_CS_PIN #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PA7 diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h index 70f3f85747d4..301453cd7059 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h @@ -283,4 +283,3 @@ #define ONBOARD_SPI_DEVICE 1 // SPI1 #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card -#define SDSS SD_SS_PIN diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h index bdc609c7b580..ee3e8c989dc9 100644 --- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h +++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h @@ -67,7 +67,6 @@ // // Misc. Functions // -#define SDSS -1 #define LED_PIN -1 #ifndef CASE_LIGHT_PIN @@ -158,7 +157,7 @@ #define BTN_EN1 PC15 // 47 #define BTN_EN2 PC11 // 43 #define BTN_ENC PC0 // 32 - #define LCD_SDSS PD5 // 53 + #define LCD_SDSS_PIN PD5 // 53 #define SD_DETECT_PIN -1 #define KILL_PIN PC9 // 41 #undef LCD_PINS_EN // not used, causes false pin conflict report @@ -169,7 +168,7 @@ #define BTN_EN2 PA7 // 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 PD5 // 53 + #define LCD_SDSS_PIN PD5 // 53 #define SD_DETECT_PIN PD1 // 49 #elif ANY(VIKI2, miniVIKI) @@ -184,7 +183,7 @@ #define BTN_EN2 PA7 // 7 #define BTN_ENC PC7 // 39 - #define SDSS PD5 // 53 + #define SD_SS_PIN PD5 // 53 #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board #define KILL_PIN PB15 // 31 @@ -199,7 +198,7 @@ #define BTN_EN2 PC5 // 37 #define BTN_ENC PB15 // 31 #define SD_DETECT_PIN PD1 // 49 - #define LCD_SDSS PD5 // 53 + #define LCD_SDSS_PIN PD5 // 53 #define KILL_PIN PC9 // 41 #define BEEPER_PIN PB7 // 23 #define DOGLCD_CS PB13 // 29 @@ -213,7 +212,7 @@ #define DOGLCD_A0 PC12 // 44 #define DOGLCD_CS PE2 // 66 #define LCD_BACKLIGHT_PIN PE1 // 65 // backlight LED on A11/D65 - #define SDSS PD5 // 53 + #define SD_SS_PIN PD5 // 53 #define KILL_PIN PE0 // 64 diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h index caac738bb995..b42a249e8541 100644 --- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h +++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h @@ -256,7 +256,6 @@ #define SD_SCK_PIN PC12 #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 - #define SD_SS_PIN -1 #define SD_DETECT_PIN PD12 // SD_CD (if -1 no detection) #else #define ONBOARD_SDIO diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h index 22c977d8b92b..1f62a1014983 100644 --- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h +++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h @@ -155,7 +155,6 @@ #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN - #define SDSS SD_SS_PIN #define SD_DETECT_PIN EXP2_07_PIN #define BEEPER_PIN EXP1_01_PIN diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h index d32479267de9..3153f4956cca 100644 --- a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h +++ b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h @@ -152,7 +152,7 @@ // // Misc. Functions // -#define SDSS PA4 +#define SD_SS_PIN PA4 // // LCD Pins diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h index 042966cb3af2..875d3dc9988f 100644 --- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h +++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h @@ -119,7 +119,7 @@ // // Misc. Functions // -#define SDSS PA4 +#define SD_SS_PIN PA4 #define SD_DETECT_PIN PC3 #ifndef RGB_LED_R_PIN diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h index 94c6dc2bfa6b..6baee148c7d3 100644 --- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h +++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h @@ -225,8 +225,6 @@ #define SD_DETECT_PIN -1 // Card detect is not connected #endif -#define SDSS SD_SS_PIN - #if ENABLED(WIFISUPPORT) // // ESP WiFi can be soldered to J9 connector which is wired to USART2. diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h index 5f66f9bc3bb9..ee605c8765e4 100644 --- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h +++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h @@ -219,8 +219,6 @@ #define SD_DETECT_PIN -1 // Card detect is not connected #endif -#define SDSS SD_SS_PIN - #if ENABLED(WIFISUPPORT) // // ESP WiFi can be soldered to J9 connector which is wired to USART2. diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h index 9f7efa99c427..c636dea4933b 100644 --- a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h +++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h @@ -230,8 +230,6 @@ #define SD_DETECT_PIN -1 // Card detect is not connected #endif -#define SDSS SD_SS_PIN - #if ENABLED(WIFISUPPORT) // // ESP WiFi can be soldered to J9 connector which is wired to USART2. diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h index 3f6ae1414bc8..814844d95b40 100644 --- a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h +++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h @@ -222,8 +222,6 @@ #define SD_DETECT_PIN -1 // Card detect is not connected #endif -#define SDSS SD_SS_PIN - #if ENABLED(WIFISUPPORT) // // ESP WiFi can be soldered to J9 connector which is wired to USART2. diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h index 37ac753fc8a0..95d788976848 100644 --- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h +++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h @@ -163,7 +163,6 @@ #if SD_CONNECTION_IS(ONBOARD) #define ONBOARD_SDIO - #define SD_SS_PIN -1 // else SDSS set to PA4 in M43 (spi_pins.h) #endif /** diff --git a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h index 94e53400996e..35ad992209f3 100644 --- a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h +++ b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h @@ -41,8 +41,6 @@ #define FLASH_EEPROM_EMULATION #endif -#define SDSS SD_SS_PIN // Also in HAL/STM32F1/spi_pins.h - // Based on PWM timer usage, we have to use these timers and soft PWM for the fans // On STM32F103: // PB3, PB6, PB7, and PB8 can be used with pwm, which rules out TIM2 and TIM4. diff --git a/Marlin/src/pins/stm32f1/pins_MD_D301.h b/Marlin/src/pins/stm32f1/pins_MD_D301.h index 5d7a2dbf886d..23e44ad4a08d 100644 --- a/Marlin/src/pins/stm32f1/pins_MD_D301.h +++ b/Marlin/src/pins/stm32f1/pins_MD_D301.h @@ -159,7 +159,7 @@ #define ONBOARD_SPI_DEVICE 1 // SPI1 #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card -#define SDSS ONBOARD_SD_CS_PIN +#define SD_SS_PIN ONBOARD_SD_CS_PIN // // Misc. Functions diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h index 4e9a06f7da14..353eefae76cd 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h @@ -225,9 +225,8 @@ #define SD_SCK_PIN PC12 #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 - #define SD_SS_PIN -1 #define ONBOARD_SD_CS_PIN PC11 - #define SDSS PD2 + #define SD_SS_PIN PD2 #define SD_DETECT_PIN -1 #endif diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h index 087a064c053d..02aec548d435 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h @@ -256,7 +256,7 @@ #define ONBOARD_SD_CS_PIN PC11 #elif SD_CONNECTION_IS(LCD) #define ENABLE_SPI1 - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h index 31ef7f5c24e9..547d0f230a8e 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h @@ -254,8 +254,7 @@ // #define SDCARD_CONNECTION ONBOARD #define ONBOARD_SPI_DEVICE 2 // Maple -#define SDSS SD_SS_PIN -#define ONBOARD_SD_CS_PIN SD_SS_PIN +#define ONBOARD_SD_CS_PIN EXP2_04_PIN #define SD_DETECT_PIN EXP2_07_PIN #define NO_SD_HOST_DRIVE @@ -264,4 +263,4 @@ #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN -#define SD_SS_PIN EXP2_04_PIN +#define SD_SS_PIN ONBOARD_SD_CS_PIN diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 5c09d8e80708..39a54e388f29 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -256,7 +256,7 @@ #define ONBOARD_SD_CS_PIN PC11 #elif SD_CONNECTION_IS(LCD) #define ENABLE_SPI1 - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32f1/pins_MORPHEUS.h b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h index 08e5455b3098..65d71fccd1ed 100644 --- a/Marlin/src/pins/stm32f1/pins_MORPHEUS.h +++ b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h @@ -88,6 +88,6 @@ // Misc. // #define LED_PIN PC13 -#define SDSS PA3 +#define SD_SS_PIN PA3 #define TFTGLCD_CS PA4 #define SD_DETECT_PIN PC14 diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h index f2b903e96dc2..61ee75fa2ac2 100644 --- a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h +++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h @@ -144,7 +144,7 @@ // #define ONBOARD_SPI_DEVICE 1 // SPI1 #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card -#define SDSS ONBOARD_SD_CS_PIN +#define SD_SS_PIN ONBOARD_SD_CS_PIN #ifndef SDCARD_CONNECTION #define SDCARD_CONNECTION ONBOARD diff --git a/Marlin/src/pins/stm32f1/pins_STM32F1R.h b/Marlin/src/pins/stm32f1/pins_STM32F1R.h index 9cbc69149cd5..c17a88196282 100644 --- a/Marlin/src/pins/stm32f1/pins_STM32F1R.h +++ b/Marlin/src/pins/stm32f1/pins_STM32F1R.h @@ -74,7 +74,7 @@ // // Misc. Functions // -#define SDSS PA4 +#define SD_SS_PIN PA4 #define LED_PIN PD2 // diff --git a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h index e5b16460f010..d98fb705263b 100644 --- a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h +++ b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h @@ -73,7 +73,7 @@ // // Misc. Functions // -#define SDSS PA15 +#define SD_SS_PIN PA15 #define LED_PIN PB2 // diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h index 2f9d706b297c..b611d945dc10 100644 --- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h +++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h @@ -199,9 +199,8 @@ #define SD_SCK_PIN PC12 #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 - #define SD_SS_PIN -1 #define ONBOARD_SD_CS_PIN PC11 - #define SDSS PD2 + #define SD_SS_PIN PD2 #define SD_DETECT_PIN -1 #endif diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h index 79b648378519..794674569cea 100644 --- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h +++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h @@ -206,8 +206,7 @@ #if DISABLED(ONBOARD_SDIO) #define SOFTWARE_SPI - #define SDSS PC11 - #define SD_SS_PIN SDSS + #define SD_SS_PIN PC11 #define SD_SCK_PIN PC12 #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h index 027faf82995e..8f2ae0b93ae4 100644 --- a/Marlin/src/pins/stm32f4/pins_ARMED.h +++ b/Marlin/src/pins/stm32f4/pins_ARMED.h @@ -135,7 +135,7 @@ // // Misc functions // -#define SDSS PE7 +#define SD_SS_PIN PE7 #define LED_PIN PB7 // Heart beat #define PS_ON_PIN PA10 #define KILL_PIN PA8 diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h index 3fe629aea1e3..4d487355a3f1 100644 --- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h +++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h @@ -115,13 +115,6 @@ // #define SERVO0_PIN PC3 -// -// SPI -// -#define SCK_PIN PC10 -#define MISO_PIN PC11 -#define MOSI_PIN PC12 - // // LCD / Controller // @@ -175,7 +168,7 @@ #define BEEPER_PIN PC13 #if HAS_MEDIA - #define SDSS PA15 + #define SD_SS_PIN PA15 #define SD_DETECT_PIN PD2 #endif diff --git a/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h b/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h index 211782073663..8869de63633b 100644 --- a/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h +++ b/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h @@ -100,7 +100,7 @@ // // SD Card // -#define SDSS PA4 +#define SD_SS_PIN PA4 #define SD_DETECT_PIN -1 #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 diff --git a/Marlin/src/pins/stm32f4/pins_BLACKPILL_CUSTOM.h b/Marlin/src/pins/stm32f4/pins_BLACKPILL_CUSTOM.h index 9ad0da13f53d..647ab802e60b 100644 --- a/Marlin/src/pins/stm32f4/pins_BLACKPILL_CUSTOM.h +++ b/Marlin/src/pins/stm32f4/pins_BLACKPILL_CUSTOM.h @@ -110,15 +110,14 @@ // SD Card // #define ONBOARD_SPI_DEVICE 1 -// #define ONBOARD_SD_CS_PIN PA4 // SDSS - #define SD_DETECT_PIN -1 #define SDCARD_CONNECTION ONBOARD //#define ONBOARD_SDIO #define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer #if SD_CONNECTION_IS(ONBOARD) - #define SDSS PA4 + #define ONBOARD_SD_CS_PIN PA4 + #define SD_SS_PIN ONBOARD_SD_CS_PIN #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PA7 diff --git a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h index 025a1fc9f1a8..8bd14b219ece 100644 --- a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h +++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h @@ -148,7 +148,7 @@ #define ONBOARD_SDIO // Use SDIO for onboard SD #if DISABLED(ONBOARD_SDIO) #define SOFTWARE_SPI // Use soft SPI for onboard SD - #define SDSS PC11 + #define SD_SS_PIN PC11 #define SD_SCK_PIN PC12 #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h index 42cc30407e3b..bcbdaedcf289 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h @@ -228,8 +228,6 @@ #define SD_MISO_PIN EXP2_01_PIN // SPI1 MISO #define SD_MOSI_PIN EXP2_06_PIN // SPI1 MOSI -#define SDSS EXP2_04_PIN - // // LCD / Controller // diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h index de3e026b05cd..256868d9bc50 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h @@ -347,12 +347,11 @@ #if SD_CONNECTION_IS(LCD) #define SD_DETECT_PIN EXP2_07_PIN - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #elif SD_CONNECTION_IS(ONBOARD) - #define SDSS PA4 - #define SD_SS_PIN SDSS + #define SD_SS_PIN PA4 #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PA7 diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h index 53d84e020b4c..93cbeb11d680 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h @@ -344,8 +344,7 @@ #define SD_DETECT_PIN PC14 #elif SD_CONNECTION_IS(LCD) - #define SDSS PA4 - #define SD_SS_PIN SDSS + #define SD_SS_PIN PA4 #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PA7 diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h index 8b70b22e56d7..31501e3ddfa1 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h @@ -348,7 +348,6 @@ #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card #define ENABLE_SPI1 -#define SDSS ONBOARD_SD_CS_PIN #define SD_SS_PIN ONBOARD_SD_CS_PIN #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h index 0b8dd71f740b..943c0ed7615d 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h @@ -343,7 +343,7 @@ #if SD_CONNECTION_IS(LCD) #define SD_DETECT_PIN EXP2_07_PIN - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #elif SD_CONNECTION_IS(ONBOARD) @@ -352,7 +352,7 @@ // function with Hardware SPI. This is not currently configurable in the HAL, // so force Software SPI to work around this issue. #define SOFTWARE_SPI - #define SDSS PA4 + #define SD_SS_PIN PA4 #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PB5 diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h index d0d78ed7f56c..692b50be405d 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h @@ -357,8 +357,7 @@ // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2 // #if SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h index d63c6ea724cc..ac8a75ecd270 100644 --- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h +++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h @@ -218,7 +218,7 @@ #if DISABLED(ONBOARD_SDIO) #define SOFTWARE_SPI // Use soft SPI for onboard SD - #define SDSS PC11 + #define SD_SS_PIN PC11 #define SD_SCK_PIN PC12 #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 @@ -229,7 +229,7 @@ #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_DETECT_PIN EXP2_07_PIN #endif diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h index 7d7126b640ff..6fd927f783ec 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h @@ -129,7 +129,7 @@ // // Misc. Functions // -#define SDSS PA4 +#define SD_SS_PIN PA4 #define SD_DETECT_PIN PC3 #ifndef RGB_LED_R_PIN diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V30.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V30.h index 3da978c06f00..54e1acc936a9 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V30.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V30.h @@ -148,7 +148,7 @@ // Misc. Functions // #if 0 - #define SDSS PA4 + #define SD_SS_PIN PA4 #define SD_DETECT_PIN PC3 #endif @@ -209,7 +209,7 @@ #define SD_MISO_PIN EXP2_10_PIN #define SD_MOSI_PIN EXP2_05_PIN -#define SDSS EXP2_07_PIN +#define SD_SS_PIN EXP2_07_PIN #define SD_DETECT_PIN EXP2_04_PIN #if HAS_WIRED_LCD diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_common.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_common.h index b016db655c60..ce61bce1cf3f 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_common.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_common.h @@ -185,7 +185,7 @@ #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN -#define SDSS EXP2_04_PIN +#define SD_SS_PIN EXP2_04_PIN #define SD_DETECT_PIN EXP2_07_PIN // @@ -232,7 +232,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 #define LCD_PINS_EN EXP1_03_PIN #define LCD_PINS_D4 EXP1_05_PIN diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h index 2164223d4433..b01b5bda6aeb 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_KING407.h @@ -255,7 +255,7 @@ #define SD_MISO_PIN EXP2_10_PIN #define SD_MOSI_PIN EXP2_05_PIN -#define SDSS EXP2_07_PIN +#define SD_SS_PIN EXP2_07_PIN #define SD_DETECT_PIN EXP2_04_PIN // @@ -291,7 +291,7 @@ #define BTN_EN1 EXP2_08_PIN #define BTN_EN2 EXP2_06_PIN - #define LCD_SDSS EXP2_07_PIN + #define LCD_SDSS_PIN EXP2_07_PIN #define LCD_PINS_EN EXP1_08_PIN #define LCD_PINS_D4 EXP1_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h b/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h index 79599d59287b..e36bdae3a873 100644 --- a/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h +++ b/Marlin/src/pins/stm32f4/pins_I3DBEEZ9.h @@ -385,7 +385,7 @@ #if SD_CONNECTION_IS(LCD) #define SD_DETECT_PIN EXP2_07_PIN - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #elif SD_CONNECTION_IS(ONBOARD) @@ -394,7 +394,7 @@ // function with Hardware SPI. This is not currently configurable in the HAL, // so force Software SPI to work around this issue. #define SOFTWARE_SPI - #define SDSS PA4 + #define SD_SS_PIN PA4 #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PB5 diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h index 4b6dc89f0675..402e7f5ddc16 100644 --- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h +++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h @@ -209,7 +209,6 @@ #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 #define SD_SS_PIN PC11 - #define SDSS PC11 #endif // diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h index b72e146ad308..0d129cb62479 100644 --- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h +++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h @@ -169,7 +169,6 @@ #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 #define SD_SS_PIN PC11 - #define SDSS PC11 #endif // diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h index 43b4f02961dc..6aa5d348dc8a 100644 --- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h +++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h @@ -126,7 +126,6 @@ #define SD_MISO_PIN PC8 #define SD_MOSI_PIN PD2 #define SD_SS_PIN PC11 - #define SDSS PC11 #endif // diff --git a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h index f24e61c7507c..3fff8515b9aa 100644 --- a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h +++ b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h @@ -252,8 +252,7 @@ // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2 // #if SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h index 9c81eb1c85d7..38ed31cabea2 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h @@ -257,15 +257,14 @@ // #if SD_CONNECTION_IS(ONBOARD) #define ENABLE_SPI3 - #define SD_SS_PIN -1 - #define SDSS PC9 + #define SD_SS_PIN PC9 #define SD_SCK_PIN PC10 #define SD_MISO_PIN PC11 #define SD_MOSI_PIN PC12 #define SD_DETECT_PIN PC4 // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled #elif SD_CONNECTION_IS(LCD) #define ENABLE_SPI1 - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h index 3018a2d68c79..6004643e6eed 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h @@ -102,8 +102,6 @@ // // Misc. Functions // -#define SDSS -1 // PB12 - #define SD_DETECT_PIN PF9 #define BEEPER_PIN PG2 diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h index 8f4e5ff6b808..c9ecc617b771 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h @@ -216,8 +216,7 @@ // #if SD_CONNECTION_IS(ONBOARD) #define ENABLE_SPI3 - #define SD_SS_PIN -1 - #define SDSS PC9 + #define SD_SS_PIN PC9 #define SD_SCK_PIN PC10 #define SD_MISO_PIN PC11 #define SD_MOSI_PIN PC12 @@ -267,7 +266,7 @@ // #if SD_CONNECTION_IS(LCD) #define ENABLE_SPI1 - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h index e8b9938c954f..11edadcd58a3 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h @@ -219,8 +219,7 @@ #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9) #else #define ENABLE_SPI3 - #define SD_SS_PIN -1 - #define SDSS PC9 + #define SD_SS_PIN PC9 #define SD_SCK_PIN PC10 #define SD_MISO_PIN PC11 #define SD_MOSI_PIN PC12 @@ -261,7 +260,7 @@ /* #if SD_CONNECTION_IS(LCD) #define ENABLE_SPI1 - #define SDSS EXP2_04_PIN + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h index a0b088db4b3f..7528ac77f03c 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h @@ -267,7 +267,6 @@ #elif SD_CONNECTION_IS(CUSTOM_CABLE) #error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board" #endif - #define SDSS SD_SS_PIN #endif // diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h index 010ae0ec0573..33c0eaae8f04 100644 --- a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h +++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h @@ -155,13 +155,9 @@ // // SPI // -#define MISO_PIN PB4 -#define MOSI_PIN PB5 -#define SCK_PIN PB3 - -#define TMC_SPI_MISO MISO_PIN -#define TMC_SPI_MOSI MOSI_PIN -#define TMC_SPI_SCK SCK_PIN +#define TMC_SPI_MISO PIN_SPI_MISO +#define TMC_SPI_MOSI PIN_SPI_MOSI +#define TMC_SPI_SCK PIN_SPI_SCK // // I2C diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h index 0f275788f927..11fe08a980e5 100644 --- a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h +++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h @@ -155,13 +155,9 @@ // // SPI // -#define MISO_PIN PB4 -#define MOSI_PIN PB5 -#define SCK_PIN PB3 - -#define TMC_SPI_MISO MISO_PIN -#define TMC_SPI_MOSI MOSI_PIN -#define TMC_SPI_SCK SCK_PIN +#define TMC_SPI_MISO PIN_SPI_MISO +#define TMC_SPI_MOSI PIN_SPI_MOSI +#define TMC_SPI_SCK PIN_SPI_SCK // // I2C diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h index 4574df53ac11..02ed9d5099b2 100644 --- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h +++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h @@ -135,7 +135,7 @@ #define PS_ON_PIN PE11 #define KILL_PIN PC5 -#define SDSS PA2 +#define SD_SS_PIN PA2 #define SD_DETECT_PIN PB0 #define BEEPER_PIN PE8 diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h index cec7780b948b..4d99b524f0a1 100644 --- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h +++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h @@ -190,13 +190,13 @@ //#define SOFTWARE_SPI #define CUSTOM_SPI_PINS -#define SDSS PA4 +#define ONBOARD_SD_CS_PIN PA4 +//#define SD_DETECT_PIN -1 + +#define SD_SS_PIN ONBOARD_SD_CS_PIN #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PA7 -#define SD_SS_PIN SDSS -//#define SD_DETECT_PIN -1 -//#define ONBOARD_SD_CS_PIN SDSS // // LCD / Controller diff --git a/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h b/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h index 9ab3331d4c15..3ed778c16f2c 100644 --- a/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h +++ b/Marlin/src/pins/stm32f4/pins_XTLW_CLIMBER_8TH.h @@ -177,8 +177,7 @@ #define SDIO_CMD_PIN PD2 #elif SD_CONNECTION_IS(LCD) #define CUSTOM_SPI_PINS - #define SDSS PA4 - #define SD_SS_PIN SDSS + #define SD_SS_PIN PA4 #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PA7 diff --git a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h index 46840868abdd..4355a8225452 100644 --- a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h +++ b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h @@ -167,7 +167,6 @@ #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PA7 #define SD_SS_PIN PA4 -#define SDSS PA4 #define LED_PIN LED_BLUE diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h index 2db21be45ed5..7cf8d813a0af 100644 --- a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h +++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h @@ -110,8 +110,8 @@ #define SERVO0_PIN 26 // PWM_EXT1 #define SERVO1_PIN 27 // PWM_EXT2 -#define SDSS 57 // Onboard SD card reader -//#define SDSS 9 // LCD SD card reader +#define SD_SS_PIN 57 // Onboard SD card reader +//#define SD_SS_PIN 9 // LCD SD card reader #define LED_PIN 21 // STATUS_LED // diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h index ee7ea42bde50..a3b305b04cad 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h @@ -326,7 +326,6 @@ #define ONBOARD_SD_CS_PIN PC13 // Chip select for "System" SD card #define ENABLE_SPI3 -#define SDSS ONBOARD_SD_CS_PIN #define SD_SS_PIN ONBOARD_SD_CS_PIN #define SD_SCK_PIN PC10 #define SD_MISO_PIN PC11 diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h index 4c4a6ca928ee..38d75a3d94c2 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h @@ -184,8 +184,7 @@ // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2 // #if SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h index 90379e06e62f..b2981f67347d 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h @@ -210,8 +210,7 @@ // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2 // #if SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h index e00729208906..b05515003ed8 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h @@ -259,8 +259,7 @@ // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2 // #if SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h index 7d3c249b9052..9452ceb31d37 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_SKRAT_V1_0.h @@ -380,7 +380,6 @@ #define ONBOARD_SD_CS_PIN PB8 // Chip select for "System" SD card #define ENABLE_SPI1 -#define SDSS ONBOARD_SD_CS_PIN #define SD_SS_PIN ONBOARD_SD_CS_PIN #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h index 3afc829fedd4..12d1f5308a9c 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h @@ -443,7 +443,6 @@ #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card #define ENABLE_SPI1 -#define SDSS ONBOARD_SD_CS_PIN #define SD_SS_PIN ONBOARD_SD_CS_PIN #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 diff --git a/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h b/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h index 9f67c7a14cea..8a16a0453635 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h @@ -387,16 +387,14 @@ #elif SD_DETECT_STATE == LOW #error "BOARD_BTT_KRAKEN_V1_0 onboard SD requires SD_DETECT_STATE set to HIGH." #endif - #define SDSS PB12 - #define SD_SS_PIN SDSS + #define SD_SS_PIN PB12 #define SD_SCK_PIN PB13 #define SD_MISO_PIN PB14 #define SD_MOSI_PIN PB15 #define SD_DETECT_PIN PE15 #define SOFTWARE_SPI #elif SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h b/Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h index 496668513d41..4afea71f032b 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h @@ -383,16 +383,14 @@ #elif SD_DETECT_STATE == LOW #error "BOARD_BTT_MANTA_M8P_V2_0 onboard SD requires SD_DETECT_STATE set to HIGH." #endif - #define SDSS PB12 - #define SD_SS_PIN SDSS + #define SD_SS_PIN PB12 #define SD_SCK_PIN PB13 #define SD_MISO_PIN PB14 #define SD_MOSI_PIN PB15 #define SD_DETECT_PIN -1 #define SOFTWARE_SPI #elif SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h index a6948cd08c34..eb5429393610 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h @@ -373,16 +373,14 @@ #elif SD_DETECT_STATE == LOW #error "BOARD_BTT_OCTOPUS_MAX_EZ onboard SD requires SD_DETECT_STATE set to HIGH." #endif - #define SDSS PB12 - #define SD_SS_PIN SDSS + #define SD_SS_PIN PB12 #define SD_SCK_PIN PE12 #define SD_MISO_PIN PE13 #define SD_MOSI_PIN PE14 #define SD_DETECT_PIN PB13 #define SOFTWARE_SPI #elif SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h index 45ca3c5588eb..787fa84c1c33 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h @@ -349,8 +349,7 @@ #define SD_DETECT_PIN PC14 #elif SD_CONNECTION_IS(LCD) - #define SDSS PA4 - #define SD_SS_PIN SDSS + #define SD_SS_PIN PA4 #define SD_SCK_PIN PA5 #define SD_MISO_PIN PA6 #define SD_MOSI_PIN PA7 diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h index f6f8442cdfe9..76817cae81dc 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h @@ -258,8 +258,7 @@ #endif #define SOFTWARE_SPI -#define SDSS PA15 -#define SD_SS_PIN SDSS +#define SD_SS_PIN PA15 #define SD_SCK_PIN PC10 #define SD_MISO_PIN PC11 #define SD_MOSI_PIN PC12 diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h index fce16aebf112..74cb78f6e553 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h @@ -350,8 +350,7 @@ // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2 // #if SD_CONNECTION_IS(LCD) - #define SDSS EXP2_04_PIN - #define SD_SS_PIN SDSS + #define SD_SS_PIN EXP2_04_PIN #define SD_SCK_PIN EXP2_02_PIN #define SD_MISO_PIN EXP2_01_PIN #define SD_MOSI_PIN EXP2_06_PIN diff --git a/Marlin/src/pins/teensy2/pins_5DPRINT.h b/Marlin/src/pins/teensy2/pins_5DPRINT.h index 1b1bbf122d87..93c8c5434ed2 100644 --- a/Marlin/src/pins/teensy2/pins_5DPRINT.h +++ b/Marlin/src/pins/teensy2/pins_5DPRINT.h @@ -139,7 +139,7 @@ // // Misc. Functions // -#define SDSS 20 // B0 +#define SD_SS_PIN 20 // B0 //DIGIPOTS slave addresses #ifndef DIGIPOT_I2C_ADDRESS_A diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h index a1ef48e524e6..1b28e59068d9 100644 --- a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h +++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h @@ -133,6 +133,6 @@ // // Misc. Functions // -#define SDSS 20 // B0 +#define SD_SS_PIN 20 // B0 #define SD_DETECT_PIN 24 // B4 #define LED_PIN 13 // C3 diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h index 6dc4ab8392b0..653892f2a95c 100644 --- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h +++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h @@ -146,7 +146,7 @@ #define BTN_EN2 3 // D3 RX1 JP2-7 #define BTN_ENC 45 // F7 TDI JP2-12 - #define SDSS 43 // F5 TMS JP2-8 + #define SD_SS_PIN 43 // F5 TMS JP2-8 #define STAT_LED_RED_PIN 12 // C2 JP11-14 #define STAT_LED_BLUE_PIN 10 // C0 JP11-12 @@ -159,7 +159,7 @@ #define BTN_EN2 2 // D2 TX1 JP2-5 #define BTN_ENC 41 // F3 JP2-4 - #define SDSS 38 // F0 B-THERM connector - use SD card on Panelolu2 + #define SD_SS_PIN 38 // F0 B-THERM connector - use SD card on Panelolu2 #undef LCD_PINS_EN // not used, causes false pin conflict report #else @@ -173,5 +173,5 @@ #endif // HAS_WIRED_LCD && IS_NEWPANEL #ifndef SDSS - #define SDSS 26 // B6 SDCS + #define SD_SS_PIN 26 // B6 SDCS #endif diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h index ef70d1a2cba2..0c4a8028c835 100644 --- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h +++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h @@ -224,7 +224,7 @@ #define BTN_EN2 3 // D3 RX1 JP2-7 #define BTN_ENC 45 // F7 TDI JP2-12 - #define SDSS 3 // F5 TMS JP2-8 + #define SD_SS_PIN 3 // F5 TMS JP2-8 #define STAT_LED_RED_PIN 12 // C2 JP11-14 #define STAT_LED_BLUE_PIN 10 // C0 JP11-12 @@ -235,7 +235,7 @@ #if DISABLED(USE_INTERNAL_SD) // PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn. MKSLCD12864 PIN# - #define SDSS 11 // 36 C1 EXP2-13 EXP2-07 + #define SD_SS_PIN 11 // 36 C1 EXP2-13 EXP2-07 #define SD_DETECT_PIN 9 // 34 E1 EXP2-11 EXP2-04 #endif @@ -272,7 +272,7 @@ // // PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn. #ifndef SDSS - #define SDSS 20 // 10 B0 + #define SD_SS_PIN 20 // 10 B0 #endif /** diff --git a/Marlin/src/pins/teensy2/pins_SAV_MKI.h b/Marlin/src/pins/teensy2/pins_SAV_MKI.h index a0d056f85014..725bc4abf728 100644 --- a/Marlin/src/pins/teensy2/pins_SAV_MKI.h +++ b/Marlin/src/pins/teensy2/pins_SAV_MKI.h @@ -122,7 +122,7 @@ // // Misc. Functions // -#define SDSS 20 // B0 +#define SD_SS_PIN 20 // B0 // Extension header pin mapping // ---------------------------- diff --git a/Marlin/src/pins/teensy2/pins_TEENSY2.h b/Marlin/src/pins/teensy2/pins_TEENSY2.h index dac4c6c94006..23664bec2bc8 100644 --- a/Marlin/src/pins/teensy2/pins_TEENSY2.h +++ b/Marlin/src/pins/teensy2/pins_TEENSY2.h @@ -156,7 +156,7 @@ // // Misc. Functions // -#define SDSS 20 // B0 +#define SD_SS_PIN 20 // B0 #define LED_PIN 6 // D6 #define PS_ON_PIN 27 // B7 diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h index 454aff91fcd8..388342d9d854 100644 --- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h +++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h @@ -139,7 +139,7 @@ // // Misc. Functions // -#define SDSS 20 // B0 JP31-6 +#define SD_SS_PIN 20 // B0 JP31-6 #ifndef CASE_LIGHT_PIN #define CASE_LIGHT_PIN 0 // D0 IO-14 PWM0B @@ -157,7 +157,7 @@ #define BTN_EN1 3 // D3 IO-8 #define BTN_EN2 2 // D2 IO-10 #define BTN_ENC 41 // F3 IO-7 - #define SDSS 38 // F0 IO-13 use SD card on Panelolu2 + #define SD_SS_PIN 38 // F0 IO-13 use SD card on Panelolu2 #endif #define SD_DETECT_PIN -1 diff --git a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h index a6aa4fd86dfe..7e91377e3b95 100644 --- a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h +++ b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h @@ -91,7 +91,7 @@ // #define LED_PIN 13 //#define SOL1_PIN 28 -//#define SDSS 16 // 8 +//#define SD_SS_PIN 16 // 8 // // LCD / Controller diff --git a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h index 54bf6f883545..5f020b4f6c8a 100644 --- a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h +++ b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h @@ -128,7 +128,7 @@ // // SD Card // -#define SDSS 39 // 8 +#define SD_SS_PIN 39 // 8 #if HAS_WIRED_LCD #define LCD_PINS_RS 40 diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp index 1f4b9695aca9..fff330b15b52 100644 --- a/Marlin/src/sd/cardreader.cpp +++ b/Marlin/src/sd/cardreader.cpp @@ -487,9 +487,9 @@ void CardReader::mount() { nrItems = -1; if (root.isOpen()) root.close(); - if (!driver->init(SD_SPI_SPEED, SDSS) - #if defined(LCD_SDSS) && (LCD_SDSS != SDSS) - && !driver->init(SD_SPI_SPEED, LCD_SDSS) + if (!driver->init(SD_SPI_SPEED, SD_SS_PIN) + #if PIN_EXISTS(LCD_SDSS) && (LCD_SDSS_PIN != SD_SS_PIN) + && !driver->init(SD_SPI_SPEED, LCD_SDSS_PIN) #endif ) SERIAL_ECHO_MSG(STR_SD_INIT_FAIL); else if (!volume.init(driver))