0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

⚰️ Remove obsolete CUSTOM_SPI_PINS (#22058)

Browse source
This commit is contained in:
Victor Oliveira 2021-06-06 02:59:19 -03:00 committed by GitHub
parent b4114553c8
commit ce5dece3b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 49 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/HAL/STM32/HAL_SPI.cpp
View file

@ -163,11 +163,9 @@ static SPISettings spiConfig;
} }
spiConfig = SPISettings(clock, MSBFIRST, SPI_MODE0); spiConfig = SPISettings(clock, MSBFIRST, SPI_MODE0);
#if ENABLED(CUSTOM_SPI_PINS) SPI.setMISO(SD_MISO_PIN);
SPI.setMISO(SD_MISO_PIN); SPI.setMOSI(SD_MOSI_PIN);
SPI.setMOSI(SD_MOSI_PIN); SPI.setSCLK(SD_SCK_PIN);
SPI.setSCLK(SD_SCK_PIN);
#endif
SPI.begin(); SPI.begin();
} }

3
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View file

@ -276,6 +276,9 @@
#if SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN PC4 #define SD_DETECT_PIN PC4
#define SD_SCK_PIN PA5
#define SD_MISO_PIN PA6
#define SD_MOSI_PIN PA7
#elif SD_CONNECTION_IS(LCD) && BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) #elif SD_CONNECTION_IS(LCD) && BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
#define SD_DETECT_PIN PA15 #define SD_DETECT_PIN PA15
#define SD_SS_PIN PA10 #define SD_SS_PIN PA10

13
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View file

@ -280,11 +280,8 @@
#define ONBOARD_SPI_DEVICE 1 // SPI1 -> used only by HAL/STM32F1... #define ONBOARD_SPI_DEVICE 1 // SPI1 -> used only by HAL/STM32F1...
#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
#define CUSTOM_SPI_PINS // TODO: needed because is the only way to set SPI for SD on STM32 (for now) #define ENABLE_SPI1
#if ENABLED(CUSTOM_SPI_PINS) #define SDSS ONBOARD_SD_CS_PIN
#define ENABLE_SPI1 #define SD_SCK_PIN PA5
#define SDSS ONBOARD_SD_CS_PIN #define SD_MISO_PIN PA6
#define SD_SCK_PIN PA5 #define SD_MOSI_PIN PA7
#define SD_MISO_PIN PA6
#define SD_MOSI_PIN PA7
#endif

1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View file

@ -186,7 +186,6 @@
// TODO: This is the only way to set SPI for SD on STM32 (for now) // TODO: This is the only way to set SPI for SD on STM32 (for now)
#define ENABLE_SPI2 #define ENABLE_SPI2
#define CUSTOM_SPI_PINS
#define SD_SCK_PIN PB13 #define SD_SCK_PIN PB13
#define SD_MISO_PIN PB14 #define SD_MISO_PIN PB14
#define SD_MOSI_PIN PB15 #define SD_MOSI_PIN PB15

11
Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
View file

@ -205,13 +205,10 @@
#define EXP2_10_PIN PA6 #define EXP2_10_PIN PA6
// HAL SPI1 pins // HAL SPI1 pins
#define CUSTOM_SPI_PINS #define SD_SCK_PIN EXP2_09_PIN // SPI1 SCLK
#if ENABLED(CUSTOM_SPI_PINS) #define SD_SS_PIN EXP2_07_PIN // SPI1 SSEL
#define SD_SCK_PIN EXP2_09_PIN // SPI1 SCLK #define SD_MISO_PIN EXP2_10_PIN // SPI1 MISO
#define SD_SS_PIN EXP2_07_PIN // SPI1 SSEL #define SD_MOSI_PIN EXP2_05_PIN // SPI1 MOSI
#define SD_MISO_PIN EXP2_10_PIN // SPI1 MISO
#define SD_MOSI_PIN EXP2_05_PIN // SPI1 MOSI
#endif
#define SDSS EXP2_07_PIN #define SDSS EXP2_07_PIN

2
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
View file

@ -357,8 +357,6 @@
#elif SD_CONNECTION_IS(ONBOARD) #elif SD_CONNECTION_IS(ONBOARD)
// Instruct the STM32 HAL to override the default SPI pins from the variant.h file
#define CUSTOM_SPI_PINS
#define SDSS PA4 #define SDSS PA4
#define SD_SS_PIN SDSS #define SD_SS_PIN SDSS
#define SD_SCK_PIN PA5 #define SD_SCK_PIN PA5

1
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
View file

@ -356,7 +356,6 @@
#define SD_DETECT_PIN PC14 #define SD_DETECT_PIN PC14
#elif SD_CONNECTION_IS(LCD) #elif SD_CONNECTION_IS(LCD)
#define CUSTOM_SPI_PINS
#define SDSS PA4 #define SDSS PA4
#define SD_SS_PIN SDSS #define SD_SS_PIN SDSS
#define SD_SCK_PIN PA5 #define SD_SCK_PIN PA5

1
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
View file

@ -348,7 +348,6 @@
#elif SD_CONNECTION_IS(LCD) #elif SD_CONNECTION_IS(LCD)
#define CUSTOM_SPI_PINS
#define SDSS PA4 #define SDSS PA4
#define SD_SS_PIN SDSS #define SD_SS_PIN SDSS
#define SD_SCK_PIN PA5 #define SD_SCK_PIN PA5

34
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
View file

@ -217,37 +217,31 @@
// //
// detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled // detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled
#if SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(ONBOARD)
#define CUSTOM_SPI_PINS // TODO: needed because is the only way to set SPI3 for SD on STM32 (by now) #define ENABLE_SPI3
#if ENABLED(CUSTOM_SPI_PINS) #define SD_SS_PIN -1
#define ENABLE_SPI3 #define SDSS PC9
#define SD_SS_PIN -1 #define SD_SCK_PIN PC10
#define SDSS PC9 #define SD_MISO_PIN PC11
#define SD_SCK_PIN PC10 #define SD_MOSI_PIN PC12
#define SD_MISO_PIN PC11 #define SD_DETECT_PIN PD12
#define SD_MOSI_PIN PC12
#define SD_DETECT_PIN PD12
#endif
#endif #endif
// //
// LCD SD // LCD SD
// //
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define CUSTOM_SPI_PINS #define ENABLE_SPI1
#if ENABLED(CUSTOM_SPI_PINS) #define SDSS PE10
#define ENABLE_SPI1 #define SD_SCK_PIN PA5
#define SDSS PE10 #define SD_MISO_PIN PA6
#define SD_SCK_PIN PA5 #define SD_MOSI_PIN PA7
#define SD_MISO_PIN PA6 #define SD_DETECT_PIN PE12
#define SD_MOSI_PIN PA7
#define SD_DETECT_PIN PE12
#endif
#endif #endif
// //
// LCD / Controller // LCD / Controller
#define SPI_FLASH #define SPI_FLASH
#define HAS_SPI_FLASH 1 #define HAS_SPI_FLASH 1
#define SPI_DEVICE 2 #define SPI_DEVICE 2
#define SPI_FLASH_SIZE 0x1000000 #define SPI_FLASH_SIZE 0x1000000
#if ENABLED(SPI_FLASH) #if ENABLED(SPI_FLASH)

47
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
View file

@ -31,7 +31,7 @@
#define BOARD_INFO_NAME "MKS Robin PRO V2" #define BOARD_INFO_NAME "MKS Robin PRO V2"
// Avoid conflict with TIMER_TONE // Avoid conflict with TIMER_TONE
#define STEP_TIMER 10 #define STEP_TIMER 10
// Use one of these or SDCard-based Emulation will be used // Use one of these or SDCard-based Emulation will be used
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation //#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
@ -50,7 +50,7 @@
// //
// Note: MKS Robin board is using SPI2 interface. // Note: MKS Robin board is using SPI2 interface.
// //
//#define SPI_MODULE 2 //#define SPI_MODULE 2
// //
// Servos // Servos
@ -203,7 +203,7 @@
//#define LED_PIN PB2 //#define LED_PIN PB2
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD
#endif #endif
//#define USE_NEW_SPI_API 1 //#define USE_NEW_SPI_API 1
@ -214,21 +214,17 @@
// //
// detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled // detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled
#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD #if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
#define CUSTOM_SPI_PINS #if USE_NEW_SPI_API
#if ENABLED(CUSTOM_SPI_PINS) #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
#else
#if USE_NEW_SPI_API #define ENABLE_SPI3
#define SD_SPI MARLIN_SPI(HardwareSPI3, PC9) #define SD_SS_PIN -1
#else #define SDSS PC9
#define ENABLE_SPI3 #define SD_SCK_PIN PC10
#define SD_SS_PIN -1 #define SD_MISO_PIN PC11
#define SDSS PC9 #define SD_MOSI_PIN PC12
#define SD_SCK_PIN PC10
#define SD_MISO_PIN PC11
#define SD_MOSI_PIN PC12
#endif
#define SD_DETECT_PIN PD12
#endif #endif
#define SD_DETECT_PIN PD12
#endif #endif
/* /*
@ -236,22 +232,19 @@
// LCD SD // LCD SD
// //
#if SDCARD_CONNECTION == LCD #if SDCARD_CONNECTION == LCD
#define CUSTOM_SPI_PINS #define ENABLE_SPI1
#if ENABLED(CUSTOM_SPI_PINS) #define SDSS PE10
#define ENABLE_SPI1 #define SD_SCK_PIN PA5
#define SDSS PE10 #define SD_MISO_PIN PA6
#define SD_SCK_PIN PA5 #define SD_MOSI_PIN PA7
#define SD_MISO_PIN PA6 #define SD_DETECT_PIN PE12
#define SD_MOSI_PIN PA7
#define SD_DETECT_PIN PE12
#endif
#endif #endif
*/ */
// //
// LCD / Controller // LCD / Controller
#define SPI_FLASH #define SPI_FLASH
#define HAS_SPI_FLASH 1 #define HAS_SPI_FLASH 1
#define SPI_DEVICE 2 #define SPI_DEVICE 2
#define SPI_FLASH_SIZE 0x1000000 #define SPI_FLASH_SIZE 0x1000000
#if ENABLED(SPI_FLASH) #if ENABLED(SPI_FLASH)