From 02806248316f16cc60dc9571a06a959823adac50 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Mon, 3 Feb 2020 17:46:18 -0600 Subject: [PATCH] add back in changes i made since Scott's update --- .../HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp | 2 +- Marlin/src/core/boards.h | 16 +++++++-- Marlin/src/pins/pins.h | 26 +++++++------- Marlin/src/pins/stm32/pins_ARMED.h | 3 ++ .../src/pins/stm32/pins_BLACK_STM32F407VE.h | 20 +++++++---- Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h | 17 +++++++++ Marlin/src/pins/stm32/pins_FLYF407ZG.h | 24 +++++++++++++ Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h | 35 +++++++++++-------- 8 files changed, 105 insertions(+), 38 deletions(-) diff --git a/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp index dd06f4dbdf77..170d547976e1 100644 --- a/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp +++ b/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp @@ -22,7 +22,7 @@ #include "../../inc/MarlinConfig.h" -#if ENABLED(SDIO_SUPPORT) +#if ENABLED(SDIO_SUPPORT) && !defined(STM32GENERIC) #include #include diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 43cc3111eccb..cfc8ccf136de 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -209,8 +209,11 @@ #define BOARD_MKS_SGEN_L 2010 // MKS-SGen-L (Power outputs: Hotend0, Hotend1, Bed, Fan) #define BOARD_GMARSH_X6_REV1 2011 // GMARSH X6 board, revision 1 prototype #define BOARD_BIGTREE_SKR_V1_1 2012 // BigTreeTech SKR v1.1 (Power outputs: Hotend0, Hotend1, Fan, Bed) +#define BOARD_BTT_SKR_V1_1 2012 #define BOARD_BIGTREE_SKR_V1_3 2013 // BigTreeTech SKR v1.3 (Power outputs: Hotend0, Hotend1, Fan, Bed) +#define BOARD_BTT_SKR_V1_3 2013 #define BOARD_BIGTREE_SKR_V1_4 2014 // BigTreeTech SKR v1.4 (Power outputs: Hotend0, Hotend1, Fan, Bed) +#define BOARD_BTT_SKR_V1_4 2014 // // LPC1769 ARM Cortex M3 @@ -225,6 +228,7 @@ #define BOARD_SMOOTHIEBOARD 2506 // Smoothieboard #define BOARD_TH3D_EZBOARD 2507 // TH3D EZBoard v1.0 #define BOARD_BIGTREE_SKR_V1_4_TURBO 2508 // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed) +#define BOARD_BTT_SKR_V1_4_TURBO 2508 // // SAM3X8E ARM Cortex M3 @@ -282,9 +286,13 @@ #define BOARD_MKS_ROBIN_LITE3 4010 // MKS Robin Lite3 (STM32F103RCT6) #define BOARD_MKS_ROBIN_PRO 4011 // MKS Robin Pro (STM32F103ZET6) #define BOARD_BIGTREE_SKR_MINI_V1_1 4012 // BigTreeTech SKR Mini v1.1 (STM32F103RC) -#define BOARD_BTT_SKR_MINI_E3_V1_0 4013 // BigTreeTech SKR Mini E3 (STM32F103RC) -#define BOARD_BTT_SKR_MINI_E3_V1_2 4014 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC) +#define BOARD_BTT_SKR_MINI_V1_1 4012 +#define BOARD_BIGTREE_SKR_MINI_E3_V1_0 4013 // BigTreeTech SKR Mini E3 (STM32F103RC) +#define BOARD_BTT_SKR_MINI_E3_V1_0 4013 +#define BOARD_BIGTREE_SKR_MINI_E3_V1_2 4014 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC) +#define BOARD_BTT_SKR_MINI_E3_V1_2 4014 #define BOARD_BIGTREE_SKR_E3_DIP 4015 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE) +#define BOARD_BTT_SKR_E3_DIP 4015 #define BOARD_JGAURORA_A5S_A1 4016 // JGAurora A5S A1 (STM32F103ZET6) #define BOARD_FYSETC_AIO_II 4017 // FYSETC AIO_II #define BOARD_FYSETC_CHEETAH 4018 // FYSETC Cheetah @@ -314,7 +322,11 @@ #define BOARD_BLACK_STM32F407ZE 4205 // BLACK_STM32F407ZE #define BOARD_STEVAL_3DP001V1 4206 // STEVAL-3DP001V1 3D PRINTER BOARD #define BOARD_BIGTREE_SKR_PRO_V1_1 4207 // BigTreeTech SKR Pro v1.1 (STM32F407ZG) +#define BOARD_BTT_SKR_PRO_V1_1 4207 #define BOARD_BIGTREE_BTT002_V1_0 4208 // BigTreeTech BTT002 v1.0 (STM32F407VE) +#define BOARD_BTT_BTT002_V1_0 4208 +#define BOARD_BIGTREE_GTR_V1_0 4215 // BigTreeTech GTR v1.0 (STM32F407IGT) +#define BOARD_BTT_GTR_V1_0 4215 #define BOARD_LERDGE_K 4209 // Lerdge K (STM32F407ZG) #define BOARD_LERDGE_X 4210 // Lerdge X (STM32F407VE) #define BOARD_VAKE403D 4211 // VAkE 403D (STM32F446VET6) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 9b49b3956c05..b518fbbee288 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -361,11 +361,11 @@ #include "lpc1768/pins_BIQU_B300_V1.0.h" // LPC1768 env:LPC1768 #elif MB(GMARSH_X6_REV1) #include "lpc1768/pins_GMARSH_X6_REV1.h" // LPC1768 env:LPC1768 -#elif MB(BIGTREE_SKR_V1_1) +#elif( MB(BIGTREE_SKR_V1_1) || MB(BTT_SKR_V1_1)) #include "lpc1768/pins_BTT_SKR_V1_1.h" // LPC1768 env:LPC1768 -#elif MB(BIGTREE_SKR_V1_3) +#elif (MB(BIGTREE_SKR_V1_3) || MB(BTT_SKR_V1_3)) #include "lpc1768/pins_BTT_SKR_V1_3.h" // LPC1768 env:LPC1768 -#elif MB(BIGTREE_SKR_V1_4) +#elif (MB(BIGTREE_SKR_V1_4) || MB(BTT_SKR_V1_4)) #include "lpc1768/pins_BTT_SKR_V1_4.h" // LPC1768 env:LPC1768 // @@ -388,7 +388,7 @@ #include "lpc1769/pins_SMOOTHIEBOARD.h" // LPC1769 env:LPC1769 #elif MB(TH3D_EZBOARD) #include "lpc1769/pins_TH3D_EZBOARD.h" // LPC1769 env:LPC1769 -#elif MB(BIGTREE_SKR_V1_4_TURBO) +#elif (MB(BIGTREE_SKR_V1_4_TURBO) || MB(TT_SKR_V1_4_TURBO)) #include "lpc1769/pins_BTT_SKR_V1_4_TURBO.h" // LPC1769 env:LPC1769 // @@ -484,13 +484,13 @@ #include "stm32/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano #elif MB(MKS_ROBIN_LITE) #include "stm32/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite -#elif MB(BIGTREE_SKR_MINI_V1_1) +#elif (MB(BIGTREE_SKR_MINI_V1_1) || MB(BTT_SKR_MINI_V1_1)) #include "stm32/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB -#elif MB(BTT_SKR_MINI_E3_V1_0) +#elif (MB(BIGTREE_SKR_MINI_E3_V1_0) || MB(BTT_SKR_MINI_E3_V1_0)) #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB -#elif MB(BTT_SKR_MINI_E3_V1_2) +#elif (MB(BIGTREE_SKR_MINI_E3_V1_2) || MB(BTT_SKR_MINI_E3_V1_2)) #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB -#elif MB(BIGTREE_SKR_E3_DIP) +#elif (MB(BIGTREE_SKR_E3_DIP) || MB(BTT_SKR_E3_DIP)) #include "stm32/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_bigtree env:STM32F103RE_bigtree_USB env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB #elif MB(JGAURORA_A5S_A1) #include "stm32/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1 @@ -527,16 +527,16 @@ #elif MB(ARMED) #include "stm32/pins_ARMED.h" // STM32F4 env:ARMED #elif MB(RUMBA32) - #include "stm32/pins_RUMBA32.h" // STM32F4 env:RUMBA32 + #include "stm32/pins_RUMBA32.h" // STM32F4 env:rumba32_f446ve env:mks_rumba32 #elif MB(BLACK_STM32F407VE) #include "stm32/pins_BLACK_STM32F407VE.h" // STM32F4 env:STM32F407VE_black #elif MB(STEVAL_3DP001V1) #include "stm32/pins_STEVAL_3DP001V1.h" // STM32F4 env:STM32F401VE_STEVAL -#elif MB(BIGTREE_SKR_PRO_V1_1) +#elif (MB(BTT_SKR_PRO_V1_1) || MB(BIGTREE_SKR_PRO_V1_1)) #include "stm32/pins_BTT_SKR_PRO_V1_1.h" // STM32F4 env:BIGTREE_SKR_PRO -#elif MB(BIGTREE_GTR_V1_0) - #include "stm32/pins_BTT_GTR_V1_0.h" // STM32F4 env:BIGTREE_GTR -#elif MB(BIGTREE_BTT002_V1_0) +#elif (MB(BIGTREE_GTR_V1_0) || MB(BTT_GTR_V1_0)) + #include "stm32/pins_BTT_GTR_V1_0.h" // STM32F4 env:BIGTREE_GTR_V1_0 +#elif (MB(BIGTREE_BTT002_V1_0) || MB(BTT_BTT002_V1_0)) #include "stm32/pins_BTT_BTT002_V1_0.h" // STM32F4 env:BIGTREE_BTT002 #elif MB(LERDGE_K) #include "stm32/pins_LERDGE_K.h" // STM32F4 env:STM32F4 diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h index 23ccccdc03db..03f267a3a456 100644 --- a/Marlin/src/pins/stm32/pins_ARMED.h +++ b/Marlin/src/pins/stm32/pins_ARMED.h @@ -19,6 +19,9 @@ * along with this program. If not, see . * */ + +// https://github.com/ktand/Armed + #pragma once #ifndef STM32F4 diff --git a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h index f4b2a3d58916..c4ec4fccb687 100644 --- a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h +++ b/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h @@ -132,6 +132,10 @@ #define DOGLCD_CS LCD_PINS_D5 #define DOGLCD_A0 LCD_PINS_D6 + +// +// onboard SD support +// #define SDIO_D0_PIN PC8 #define SDIO_D1_PIN PC9 #define SDIO_D2_PIN PC10 @@ -139,12 +143,14 @@ #define SDIO_CK_PIN PC12 #define SDIO_CMD_PIN PD2 -#define SDIO_SUPPORT // Use SDIO for onboard SD +#if !defined(SDCARD_CONNECTION) || (defined(SDCARD_CONNECTION) && SDCARD_CONNECTION == ONBOARD) + #define SDIO_SUPPORT // Use SDIO for onboard SD -#ifndef SDIO_SUPPORT - #define SOFTWARE_SPI // Use soft SPI for onboard SD - #define SDSS SDIO_D3_PIN - #define SCK_PIN SDIO_CK_PIN - #define MISO_PIN SDIO_D0_PIN - #define MOSI_PIN SDIO_CMD_PIN + #ifndef SDIO_SUPPORT + #define SOFTWARE_SPI // Use soft SPI for onboard SD + #define SDSS SDIO_D3_PIN + #define SCK_PIN SDIO_CK_PIN + #define MISO_PIN SDIO_D0_PIN + #define MOSI_PIN SDIO_CMD_PIN + #endif #endif diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h index 8eb7d354b303..e44508199f62 100644 --- a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h +++ b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h @@ -183,6 +183,23 @@ // #define SDSS PB12 +// +// Onboard SD card +// NOT compatible with LCD +// +#if defined(SDCARD_CONNECTION) && SDCARD_CONNECTION == ONBOARD && !defined(HAS_SPI_LCD) + #define SOFTWARE_SPI // Use soft SPI for onboard SD + #undef SDSS + #undef SCK_PIN + #undef MISO_PIN + #undef MOSI_PIN + #define SDSS PA4 + #define SCK_PIN PA5 + #define MISO_PIN PA6 + #define MOSI_PIN PB5 +#endif + + /** * _____ _____ * NC | · · | GND 5V | · · | GND diff --git a/Marlin/src/pins/stm32/pins_FLYF407ZG.h b/Marlin/src/pins/stm32/pins_FLYF407ZG.h index 94b67769c729..438ffc870c2a 100644 --- a/Marlin/src/pins/stm32/pins_FLYF407ZG.h +++ b/Marlin/src/pins/stm32/pins_FLYF407ZG.h @@ -152,6 +152,30 @@ #define FAN4_PIN PE13 #define FAN5_PIN PB11 +// +// onboard SD support +// + +#define SDIO_D0 23 // PC8 SDIO_D0 +#define SDIO_D1 24 // PC9 SDIO_D1 +//#define SD_CARD_DETECT 25 // PC13 SD_CARD_DETECT +#define SDIO_D2 26 // PC10 SDIO_D2 +#define SDIO_D3 27 // PC11 SDIO_D3 +#define SDIO_CK 28 // PC12 SDIO_CK +#define SDIO_CMD 29 // PD2 SDIO_CMD + +#if !defined(SDCARD_CONNECTION) || (defined(SDCARD_CONNECTION) && SDCARD_CONNECTION == ONBOARD) + #define SDIO_SUPPORT // Use SDIO for onboard SD + + #ifndef SDIO_SUPPORT + #define SOFTWARE_SPI // Use soft SPI for onboard SD + #define SDSS SDIO_D3_PIN + #define SCK_PIN SDIO_CK_PIN + #define MISO_PIN SDIO_D0_PIN + #define MOSI_PIN SDIO_CMD_PIN + #endif +#endif + // // Trinamic Software SPI // diff --git a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h index fcfd35e4fe41..e5793b299ab2 100644 --- a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h +++ b/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h @@ -226,22 +226,27 @@ // 22 // PB3 JTAG_TDO/SWO // -// SD support +// onboard SD support // -//#define SDIO_SUPPORT -// 23 // PC8 SDIO_D0 -// 24 // PC9 SDIO_D1 -// 25 // PA15 SD_CARD_DETECT -// 26 // PC10 SDIO_D2 -// 27 // PC11 SDIO_D3 -// 28 // PC12 SDIO_CK -// 29 // PD2 SDIO_CMD - -#define SOFTWARE_SPI // Use soft SPI for onboard SD -#define SDSS 27 // PC11 SDIO_D3 -#define SCK_PIN 28 // PC12 SDIO_CK -#define MISO_PIN 23 // PC8 SDIO_D0 -#define MOSI_PIN 29 // PD2 SDIO_CMD +#define SDIO_D0 23 // PC8 SDIO_D0 +#define SDIO_D1 24 // PC9 SDIO_D1 +//#define SD_CARD_DETECT 25 // PA15 SD_CARD_DETECT +#define SDIO_D2 26 // PC10 SDIO_D2 +#define SDIO_D3 27 // PC11 SDIO_D3 +#define SDIO_CK 28 // PC12 SDIO_CK +#define SDIO_CMD 29 // PD2 SDIO_CMD + +#if !defined(SDCARD_CONNECTION) || (defined(SDCARD_CONNECTION) && SDCARD_CONNECTION == ONBOARD) + #define SDIO_SUPPORT // Use SDIO for onboard SD + + #ifndef SDIO_SUPPORT + #define SOFTWARE_SPI // Use soft SPI for onboard SD + #define SDSS SDIO_D3_PIN + #define SCK_PIN SDIO_CK_PIN + #define MISO_PIN SDIO_D0_PIN + #define MOSI_PIN SDIO_CMD_PIN + #endif +#endif // OTG // 30 // PA11 OTG_DM