From d037f51c055e1d2fe1360c06fed48d840cb419ec Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 Jan 2025 23:22:29 -0600 Subject: [PATCH] No automatic SD_SS_PIN --- Marlin/src/HAL/AVR/spi_pins.h | 3 --- Marlin/src/HAL/ESP32/spi_pins.h | 4 ---- Marlin/src/HAL/LINUX/spi_pins.h | 3 --- Marlin/src/HAL/LPC1768/spi_pins.h | 4 ---- Marlin/src/HAL/NATIVE_SIM/spi_pins.h | 4 ---- Marlin/src/HAL/RP2040/spi_pins.h | 3 --- Marlin/src/HAL/SAMD21/spi_pins.h | 3 --- Marlin/src/HAL/SAMD51/spi_pins.h | 3 --- Marlin/src/HAL/STM32/spi_pins.h | 3 --- Marlin/src/HAL/STM32F1/spi_pins.h | 3 --- 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/pins/gd32f1/pins_TRIGORILLA_V006.h | 1 - Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h | 1 - Marlin/src/pins/stm32f1/pins_CHITU3D.h | 1 - Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h | 1 - Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h | 1 - Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h | 2 -- 19 files changed, 43 deletions(-) diff --git a/Marlin/src/HAL/AVR/spi_pins.h b/Marlin/src/HAL/AVR/spi_pins.h index 4ad576fd687f4..934b6e3b14662 100644 --- a/Marlin/src/HAL/AVR/spi_pins.h +++ b/Marlin/src/HAL/AVR/spi_pins.h @@ -61,6 +61,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/ESP32/spi_pins.h b/Marlin/src/HAL/ESP32/spi_pins.h index 1617f609daf61..b50ea725abdcd 100644 --- a/Marlin/src/HAL/ESP32/spi_pins.h +++ b/Marlin/src/HAL/ESP32/spi_pins.h @@ -21,14 +21,10 @@ */ #pragma once -#define PIN_SPI_SS -1 #define PIN_SPI_SCK 18 #define PIN_SPI_MISO 19 #define PIN_SPI_MOSI 23 -#ifndef SD_SS_PIN - #define SD_SS_PIN PIN_SPI_SS -#endif #ifndef SD_SCK_PIN #define SD_SCK_PIN PIN_SPI_SCK #endif diff --git a/Marlin/src/HAL/LINUX/spi_pins.h b/Marlin/src/HAL/LINUX/spi_pins.h index 37c32fe4731d4..221145e4b3cb4 100644 --- a/Marlin/src/HAL/LINUX/spi_pins.h +++ b/Marlin/src/HAL/LINUX/spi_pins.h @@ -38,6 +38,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN 52 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN 53 -#endif diff --git a/Marlin/src/HAL/LPC1768/spi_pins.h b/Marlin/src/HAL/LPC1768/spi_pins.h index 54713258f69b5..036bf0e023835 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,6 +43,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN P0_18 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN P1_23 -#endif diff --git a/Marlin/src/HAL/NATIVE_SIM/spi_pins.h b/Marlin/src/HAL/NATIVE_SIM/spi_pins.h index 9407210dadee2..0e83e13692730 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,6 +43,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN 52 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN 53 -#endif diff --git a/Marlin/src/HAL/RP2040/spi_pins.h b/Marlin/src/HAL/RP2040/spi_pins.h index 3d0e0e250d420..949fdff36f3a9 100644 --- a/Marlin/src/HAL/RP2040/spi_pins.h +++ b/Marlin/src/HAL/RP2040/spi_pins.h @@ -35,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/spi_pins.h b/Marlin/src/HAL/SAMD21/spi_pins.h index 258c4dda28e11..1186c3de48c5b 100644 --- a/Marlin/src/HAL/SAMD21/spi_pins.h +++ b/Marlin/src/HAL/SAMD21/spi_pins.h @@ -45,6 +45,3 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN 37 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN 18 -#endif diff --git a/Marlin/src/HAL/SAMD51/spi_pins.h b/Marlin/src/HAL/SAMD51/spi_pins.h index 53ba331a7b930..a2d5b72ec4090 100644 --- a/Marlin/src/HAL/SAMD51/spi_pins.h +++ b/Marlin/src/HAL/SAMD51/spi_pins.h @@ -46,9 +46,6 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN 51 #endif - #ifndef SD_SS_PIN - #define SD_SS_PIN 53 - #endif #else diff --git a/Marlin/src/HAL/STM32/spi_pins.h b/Marlin/src/HAL/STM32/spi_pins.h index 7f341a8c253fd..da6fa0d160b50 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 e6bdebef3ad63..d9c5e1f8c6368 100644 --- a/Marlin/src/HAL/STM32F1/spi_pins.h +++ b/Marlin/src/HAL/STM32F1/spi_pins.h @@ -46,9 +46,6 @@ #ifndef SD_MOSI_PIN #define SD_MOSI_PIN PA7 #endif -#ifndef SD_SS_PIN - #define SD_SS_PIN PA4 -#endif #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 6d0d05f85a5d4..dbd0bb9174e3b 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 ed60a5db53cf4..d898a923f5837 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 ba4a2c700a4b1..fc1c2a7fed2b3 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/pins/gd32f1/pins_TRIGORILLA_V006.h b/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h index 563f7ff29871e..482d68616a07a 100644 --- a/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h +++ b/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h @@ -123,7 +123,6 @@ // SPI // #define SPI_DEVICE -1 // Maple - #define SD_SS_PIN -1 #define SD_SCK_PIN -1 #define SD_MISO_PIN -1 #define SD_MOSI_PIN -1 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 31eac7effabdd..7f8943ac4642b 100644 --- a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h +++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h @@ -562,7 +562,6 @@ #if SD_CONNECTION_IS(ONBOARD) #define SD_SS_PIN 83 - #undef SD_DETECT_PIN #define SD_DETECT_PIN 95 #else #define SD_SS_PIN EXP2_04_PIN diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h index 503c4c1ac0a27..ee3e8c989dc9d 100644 --- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h +++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h @@ -67,7 +67,6 @@ // // Misc. Functions // -#define SD_SS_PIN -1 #define LED_PIN -1 #ifndef CASE_LIGHT_PIN diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h index caac738bb9957..b42a249e85416 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_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h index 37ac753fc8a0e..95d788976848b 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/stm32f4/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h index ba4e10e781d76..6004643e6eed1 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 SD_SS_PIN -1 // PB12 - #define SD_DETECT_PIN PF9 #define BEEPER_PIN PG2