bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

STM32duino - Use SDIO for onboard SD (#16756)

Browse Source
This commit is contained in:
Bob Kuhn
2020-02-04 01:24:11 -06:00
committed by GitHub
parent 38a9706e16
commit 0268c1d02c
21 changed files with 485 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
Marlin/src/pins/pins.h
View File

@ -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(BTT_SKR_V1_1)
#include "lpc1768/pins_BTT_SKR_V1_1.h" // LPC1768 env:LPC1768
#elif MB(BIGTREE_SKR_V1_3)
#elif MB(BTT_SKR_V1_3)
#include "lpc1768/pins_BTT_SKR_V1_3.h" // LPC1768 env:LPC1768
#elif MB(BIGTREE_SKR_V1_4)
#elif 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(BTT_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(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)
#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)
#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(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)
#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(BTT_GTR_V1_0)
#include "stm32/pins_BTT_GTR_V1_0.h" // STM32F4 env:BIGTREE_GTR_V1_0
#elif 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
@ -587,16 +587,24 @@
// Obsolete or unknown board
//
#define BOARD_MKS_13 -1000
#define BOARD_TRIGORILLA -1001
#define BOARD_RURAMPS4D -1002
#define BOARD_FORMBOT_TREX2 -1003
#define BOARD_BIQU_SKR_V1_1 -1004
#define BOARD_STM32F1R -1005
#define BOARD_STM32F103R -1006
#define BOARD_ESP32 -1007
#define BOARD_BIGTREE_SKR_MINI_E3 -1008
#define BOARD_STEVAL -1009
#define BOARD_MKS_13 -1000
#define BOARD_TRIGORILLA -1001
#define BOARD_RURAMPS4D -1002
#define BOARD_FORMBOT_TREX2 -1003
#define BOARD_BIQU_SKR_V1_1 -1004
#define BOARD_STM32F1R -1005
#define BOARD_STM32F103R -1006
#define BOARD_ESP32 -1007
#define BOARD_STEVAL -1008
#define BOARD_BIGTREE_SKR_V1_1 -1009
#define BOARD_BIGTREE_SKR_V1_3 -1010
#define BOARD_BIGTREE_SKR_V1_4 -1011
#define BOARD_BIGTREE_SKR_V1_4_TURBO -1012
#define BOARD_BIGTREE_BTT002_V1_0 -1013
#define BOARD_BIGTREE_SKR_PRO_V1_1 -1014
#define BOARD_BIGTREE_SKR_MINI_V1_1 -1015
#define BOARD_BIGTREE_SKR_MINI_E3 -1016
#define BOARD_BIGTREE_SKR_E3_DIP -1017
#if MB(MKS_13)
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@ -607,15 +615,33 @@
#elif MB(FORMBOT_TREX2)
#error "FORMBOT_TREX2 has been renamed BOARD_FORMBOT_TREX2PLUS. Please update your configuration."
#elif MB(BIQU_SKR_V1_1)
#error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BIGTREE_SKR_V1_1. Please update your configuration."
#error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BTT_SKR_V1_1. Please update your configuration."
#elif MB(BIGTREE_SKR_V1_1)
#error "BOARD_BIGTREE_SKR_V1_1 has been renamed BOARD_BTT_SKR_V1_1. Please update your configuration."
#elif MB(BIGTREE_SKR_V2_2)
#error "BOARD_BIGTREE_SKR_V1_2 has been renamed BOARD_BTT_SKR_V1_2. Please update your configuration."
#elif MB(BIGTREE_SKR_V1_3)
#error "BOARD_BIGTREE_SKR_V1_3 has been renamed BOARD_BTT_SKR_V1_3. Please update your configuration."
#elif MB(BIGTREE_SKR_V1_4)
#error "BOARD_BIGTREE_SKR_V1_4 has been renamed BOARD_BTT_SKR_V1_4. Please update your configuration."
#elif MB(BIGTREE_SKR_V1_4_TURBO)
#error "BOARD_BIGTREE_SKR_V1_4_TURBO has been renamed BOARD_BTT_SKR_V1_4_TURBO. Please update your configuration."
#elif MB(BIGTREE_BTT002_V1_0)
#error "BOARD_BIGTREE_BTT002_V1_0 has been renamed BOARD_BTT_BTT002_V1_0. Please update your configuration."
#elif MB(BIGTREE_SKR_PRO_V1_1)
#error "BOARD_BIGTREE_SKR_PRO_V1_1 has been renamed BOARD_BTT_SKR_PRO_V1_1. Please update your configuration."
#elif MB(BIGTREE_SKR_MINI_V1_1)
#error "BOARD_BIGTREE_SKR_MINI_V1_1 has been renamed BOARD_BTT_SKR_MINI_V1_1. Please update your configuration."
#elif MB(BIGTREE_SKR_MINI_E3)
#error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
#elif MB(BIGTREE_SKR_E3_DIP)
#error "BOARD_BIGTREE_SKR_E3_DIP has been renamed BOARD_BTT_SKR_E3_DIP. Please update your configuration."
#elif MB(STM32F1R)
#error "BOARD_STM32F1R has been renamed BOARD_STM32F103RE. Please update your configuration."
#elif MB(STM32F103R)
#error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
#elif MOTHERBOARD == BOARD_ESP32
#error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
#elif MB(BIGTREE_SKR_MINI_E3)
#error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
#elif MB(STEVAL)
#error "BOARD_STEVAL has been renamed BOARD_STEVAL_3DP001V1. Please update your configuration."
#else
@ -630,8 +656,16 @@
#undef BOARD_STM32F1R
#undef BOARD_STM32F103R
#undef BOARD_ESP32
#undef BOARD_BIGTREE_SKR_MINI_E3
#undef BOARD_STEVAL
#undef BOARD_BIGTREE_SKR_MINI_E3
#undef BOARD_BIGTREE_SKR_V1_1
#undef BOARD_BIGTREE_SKR_V1_3
#undef BOARD_BIGTREE_SKR_V1_4
#undef BOARD_BIGTREE_SKR_V1_4_TURBO
#undef BOARD_BIGTREE_BTT002_V1_0
#undef BOARD_BIGTREE_SKR_PRO_V1_1
#undef BOARD_BIGTREE_SKR_MINI_V1_1
#undef BOARD_BIGTREE_SKR_E3_DIP
#endif

2
Marlin/src/pins/pinsDebug.h
View File

@ -168,7 +168,7 @@ const PinInfo pin_array[] PROGMEM = {
#endif
#include "pinsDebug_list.h"
#line 98
#line 172
};

399
Marlin/src/pins/pinsDebug_list.h
View File

@ -26,425 +26,72 @@
#line 28 // set __LINE__ to a known value for both passes
// Undefine pins to suppress warnings
#if !PIN_EXISTS(X_MS1)
#undef X_MS1_PIN
#endif
#if !PIN_EXISTS(X_MS2)
#undef X_MS2_PIN
#endif
#if !PIN_EXISTS(X_MS3)
#undef X_MS3_PIN
#endif
#if !PIN_EXISTS(X2_MS1)
#undef X2_MS1_PIN
#endif
#if !PIN_EXISTS(X2_MS2)
#undef X2_MS2_PIN
#endif
#if !PIN_EXISTS(X2_MS3)
#undef X2_MS3_PIN
#endif
#if !PIN_EXISTS(Y_MS1)
#undef Y_MS1_PIN
#endif
#if !PIN_EXISTS(Y_MS2)
#undef Y_MS2_PIN
#endif
#if !PIN_EXISTS(Y_MS3)
#undef Y_MS3_PIN
#endif
#if !PIN_EXISTS(Y2_MS1)
#undef Y2_MS1_PIN
#endif
#if !PIN_EXISTS(Y2_MS2)
#undef Y2_MS2_PIN
#endif
#if !PIN_EXISTS(Y2_MS3)
#undef Y2_MS3_PIN
#endif
#if !PIN_EXISTS(Z_MS1)
#undef Z_MS1_PIN
#endif
#if !PIN_EXISTS(Z_MS2)
#undef Z_MS2_PIN
#endif
#if !PIN_EXISTS(Z_MS3)
#undef Z_MS3_PIN
#endif
#if !PIN_EXISTS(Z2_MS1)
#undef Z2_MS1_PIN
#endif
#if !PIN_EXISTS(Z2_MS2)
#undef Z2_MS2_PIN
#endif
#if !PIN_EXISTS(Z2_MS3)
#undef Z2_MS3_PIN
#endif
#if !PIN_EXISTS(Z3_MS1)
#undef Z3_MS1_PIN
#endif
#if !PIN_EXISTS(Z3_MS2)
#undef Z3_MS2_PIN
#endif
#if !PIN_EXISTS(Z3_MS3)
#undef Z3_MS3_PIN
#endif
#if !PIN_EXISTS(Z4_MS1)
#undef Z4_MS1_PIN
#endif
#if !PIN_EXISTS(Z4_MS2)
#undef Z4_MS2_PIN
#endif
#if !PIN_EXISTS(Z4_MS3)
#undef Z4_MS3_PIN
#endif
#if !PIN_EXISTS(E0_MS1)
#undef E0_MS1_PIN
#endif
#if !PIN_EXISTS(E0_MS2)
#undef E0_MS2_PIN
#endif
#if !PIN_EXISTS(E0_MS3)
#undef E0_MS3_PIN
#endif
#if !PIN_EXISTS(E1_MS1)
#undef E1_MS1_PIN
#endif
#if !PIN_EXISTS(E1_MS2)
#undef E1_MS2_PIN
#endif
#if !PIN_EXISTS(E1_MS3)
#undef E1_MS3_PIN
#endif
#if !PIN_EXISTS(E2_MS1)
#undef E2_MS1_PIN
#endif
#if !PIN_EXISTS(E2_MS2)
#undef E2_MS2_PIN
#endif
#if !PIN_EXISTS(E2_MS3)
#undef E2_MS3_PIN
#endif
#if !PIN_EXISTS(E3_MS1)
#undef E3_MS1_PIN
#endif
#if !PIN_EXISTS(E3_MS2)
#undef E3_MS2_PIN
#endif
#if !PIN_EXISTS(E3_MS3)
#undef E3_MS3_PIN
#endif
#if !PIN_EXISTS(E4_MS1)
#undef E4_MS1_PIN
#endif
#if !PIN_EXISTS(E4_MS2)
#undef E4_MS2_PIN
#endif
#if !PIN_EXISTS(E4_MS3)
#undef E4_MS3_PIN
#endif
#if !PIN_EXISTS(E5_MS1)
#undef E5_MS1_PIN
#endif
#if !PIN_EXISTS(E5_MS2)
#undef E5_MS2_PIN
#endif
#if !PIN_EXISTS(E5_MS3)
#undef E5_MS3_PIN
#endif
#if !PIN_EXISTS(E6_MS1)
#undef E6_MS1_PIN
#endif
#if !PIN_EXISTS(E6_MS2)
#undef E6_MS2_PIN
#endif
#if !PIN_EXISTS(E6_MS3)
#undef E6_MS3_PIN
#endif
#if !PIN_EXISTS(E7_MS1)
#undef E7_MS1_PIN
#endif
#if !PIN_EXISTS(E7_MS2)
#undef E7_MS2_PIN
#endif
#if !PIN_EXISTS(E7_MS3)
#undef E7_MS3_PIN
#endif
#if !PIN_EXISTS(E0_STEP)
#undef E0_STEP_PIN
#endif
#if !PIN_EXISTS(E0_DIR)
#undef E0_DIR_PIN
#endif
#if !PIN_EXISTS(E0_ENABLE)
#undef E0_ENABLE_PIN
#endif
#if !PIN_EXISTS(E1_STEP)
#undef E1_STEP_PIN
#endif
#if !PIN_EXISTS(E1_DIR)
#undef E1_DIR_PIN
#endif
#if !PIN_EXISTS(E1_ENABLE)
#undef E1_ENABLE_PIN
#endif
#if !PIN_EXISTS(E2_STEP)
#undef E2_STEP_PIN
#endif
#if !PIN_EXISTS(E2_DIR)
#undef E2_DIR_PIN
#endif
#if !PIN_EXISTS(E2_ENABLE)
#undef E2_ENABLE_PIN
#endif
#if !PIN_EXISTS(E3_STEP)
#undef E3_STEP_PIN
#endif
#if !PIN_EXISTS(E3_DIR)
#undef E3_DIR_PIN
#endif
#if !PIN_EXISTS(E3_ENABLE)
#undef E3_ENABLE_PIN
#endif
#if !PIN_EXISTS(E4_STEP)
#undef E4_STEP_PIN
#endif
#if !PIN_EXISTS(E4_DIR)
#undef E4_DIR_PIN
#endif
#if !PIN_EXISTS(E4_ENABLE)
#undef E4_ENABLE_PIN
#endif
#if !PIN_EXISTS(E5_STEP)
#undef E5_STEP_PIN
#endif
#if !PIN_EXISTS(E5_DIR)
#undef E5_DIR_PIN
#endif
#if !PIN_EXISTS(E5_ENABLE)
#undef E5_ENABLE_PIN
#endif
#if !PIN_EXISTS(E6_STEP)
#undef E6_STEP_PIN
#endif
#if !PIN_EXISTS(E6_DIR)
#undef E6_DIR_PIN
#endif
#if !PIN_EXISTS(E6_ENABLE)
#undef E6_ENABLE_PIN
#endif
#if !PIN_EXISTS(E7_STEP)
#undef E7_STEP_PIN
#endif
#if !PIN_EXISTS(E7_DIR)
#undef E7_DIR_PIN
#endif
#if !PIN_EXISTS(E7_ENABLE)
#undef E7_ENABLE_PIN
#endif
#if !PIN_EXISTS(X_CS)
#undef X_CS_PIN
#endif
#if !PIN_EXISTS(Y_CS)
#undef Y_CS_PIN
#endif
#if !PIN_EXISTS(Z_CS)
#undef Z_CS_PIN
#endif
#if !PIN_EXISTS(E0_CS)
#undef E0_CS_PIN
#endif
#if !PIN_EXISTS(E1_CS)
#undef E1_CS_PIN
#endif
#if !PIN_EXISTS(E2_CS)
#undef E2_CS_PIN
#endif
#if !PIN_EXISTS(E3_CS)
#undef E3_CS_PIN
#endif
#if !PIN_EXISTS(E4_CS)
#undef E4_CS_PIN
#endif
#if !PIN_EXISTS(E5_CS)
#undef E5_CS_PIN
#endif
#if !PIN_EXISTS(E6_CS)
#undef E6_CS_PIN
#endif
#if !PIN_EXISTS(E7_CS)
#undef E7_CS_PIN
#endif
#if !PIN_EXISTS(FAN)
#undef FAN_PIN
#endif
#define FAN0_PIN FAN_PIN
#if !PIN_EXISTS(FAN1)
#undef FAN1_PIN
#endif
#if !PIN_EXISTS(FAN2)
#undef FAN2_PIN
#endif
#if !PIN_EXISTS(FAN3)
#undef FAN3_PIN
#endif
#if !PIN_EXISTS(FAN4)
#undef FAN4_PIN
#endif
#if !PIN_EXISTS(FAN5)
#undef FAN5_PIN
#endif
#if !PIN_EXISTS(FAN6)
#undef FAN6_PIN
#endif
#if !PIN_EXISTS(FAN7)
#undef FAN7_PIN
#endif
#if !PIN_EXISTS(CONTROLLER_FAN)
#undef CONTROLLER_FAN_PIN
#endif
#if !PIN_EXISTS(FANMUX0)
#undef FANMUX0_PIN
#endif
#if !PIN_EXISTS(FANMUX1)
#undef FANMUX1_PIN
#endif
#if !PIN_EXISTS(FANMUX2)
#undef FANMUX2_PIN
#endif
#if !PIN_EXISTS(HEATER_0)
#undef HEATER_0_PIN
#endif
#if !PIN_EXISTS(HEATER_1)
#undef HEATER_1_PIN
#endif
#if !PIN_EXISTS(HEATER_2)
#undef HEATER_2_PIN
#endif
#if !PIN_EXISTS(HEATER_3)
#undef HEATER_3_PIN
#endif
#if !PIN_EXISTS(HEATER_4)
#undef HEATER_4_PIN
#endif
#if !PIN_EXISTS(HEATER_5)
#undef HEATER_5_PIN
#endif
#if !PIN_EXISTS(HEATER_6)
#undef HEATER_6_PIN
#endif
#if !PIN_EXISTS(HEATER_7)
#undef HEATER_7_PIN
#endif
#if !PIN_EXISTS(HEATER_BED)
#undef HEATER_BED_PIN
#endif
#if !PIN_EXISTS(TEMP_0)
#undef TEMP_0_PIN
#endif
#if !PIN_EXISTS(TEMP_1)
#undef TEMP_1_PIN
#endif
#if !PIN_EXISTS(TEMP_2)
#undef TEMP_2_PIN
#endif
#if !PIN_EXISTS(TEMP_3)
#undef TEMP_3_PIN
#endif
#if !PIN_EXISTS(TEMP_4)
#undef TEMP_4_PIN
#endif
#if !PIN_EXISTS(TEMP_5)
#undef TEMP_5_PIN
#endif
#if !PIN_EXISTS(TEMP_6)
#undef TEMP_6_PIN
#endif
#if !PIN_EXISTS(TEMP_7)
#undef TEMP_7_PIN
#endif
#if !PIN_EXISTS(TEMP_BED)
#undef TEMP_BED_PIN
#endif
#if !PIN_EXISTS(SD_DETECT)
#undef SD_DETECT_PIN
#endif
#if !PIN_EXISTS(SDPOWER)
#undef SDPOWER_PIN
#endif
//
// Analog Pin Assignments
//
#if defined(EXT_AUX_A0) && EXT_AUX_A0 >= 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
#define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_PINS)
#if defined(EXT_AUX_A0) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
#endif
#if defined(EXT_AUX_A1) && EXT_AUX_A1 >= 0 && EXT_AUX_A1 < NUM_ANALOG_INPUTS
#if defined(EXT_AUX_A1) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A1)
#endif
#if defined(EXT_AUX_A2) && EXT_AUX_A2 >= 0 && EXT_AUX_A2 < NUM_ANALOG_INPUTS
#if defined(EXT_AUX_A2) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A2)
#endif
#if defined(EXT_AUX_A3) && EXT_AUX_A3 >= 0 && EXT_AUX_A3 < NUM_ANALOG_INPUTS
#if defined(EXT_AUX_A3) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A3)
#endif
#if defined(EXT_AUX_A4) && EXT_AUX_A4 >= 0 && EXT_AUX_A4 < NUM_ANALOG_INPUTS
#if defined(EXT_AUX_A4) && ANALOG_OK(EXT_AUX_A0)
REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A4)
#endif
#if PIN_EXISTS(FILWIDTH) && FILWIDTH_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(FILWIDTH) && ANALOG_OK(FILWIDTH_PIN)
REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
#endif
#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && MAIN_VOLTAGE_MEASURE_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && ANALOG_OK(MAIN_VOLTAGE_MEASURE_PIN)
REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
#endif
#if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD) //TC1 & TC2 are macros in the SAM/SAMD tool chain
#if defined(TC1) && TC1 >= 0 && TC1 < NUM_ANALOG_INPUTS
#if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD) // TC1 & TC2 are macros in the SAM/SAMD tool chain
#if defined(TC1) && ANALOG_OK(TC1)
REPORT_NAME_ANALOG(__LINE__, TC1)
#endif
#if defined(TC2) && TC2 >= 0 && TC2 < NUM_ANALOG_INPUTS
#if defined(TC2) && ANALOG_OK(TC1)
REPORT_NAME_ANALOG(__LINE__, TC2)
#endif
#endif
#if PIN_EXISTS(TEMP_0) && TEMP_0_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_0) && ANALOG_OK(TEMP_0_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
#endif
#if PIN_EXISTS(TEMP_1) && TEMP_1_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_1) && ANALOG_OK(TEMP_1_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
#endif
#if PIN_EXISTS(TEMP_2) && TEMP_2_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_2) && ANALOG_OK(TEMP_2_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
#endif
#if PIN_EXISTS(TEMP_3) && TEMP_3_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_3) && ANALOG_OK(TEMP_3_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
#endif
#if PIN_EXISTS(TEMP_4) && TEMP_4_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_4) && ANALOG_OK(TEMP_4_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
#endif
#if PIN_EXISTS(TEMP_5) && TEMP_5_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_5) && ANALOG_OK(TEMP_5_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_5_PIN)
#endif
#if PIN_EXISTS(TEMP_6) && TEMP_6_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_6) && ANALOG_OK(TEMP_6_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_6_PIN)
#endif
#if PIN_EXISTS(TEMP_7) && TEMP_7_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_7) && ANALOG_OK(TEMP_7_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_7_PIN)
#endif
#if PIN_EXISTS(TEMP_BED) && TEMP_BED_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_BED) && ANALOG_OK(TEMP_BED_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
#endif
#if PIN_EXISTS(TEMP_CHAMBER) && TEMP_CHAMBER_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(TEMP_CHAMBER) && ANALOG_OK(TEMP_CHAMBER_PIN)
REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
#endif
#if PIN_EXISTS(ADC_KEYPAD) && ADC_KEYPAD_PIN < NUM_ANALOG_INPUTS
#if PIN_EXISTS(ADC_KEYPAD) && ANALOG_OK(ADC_KEYPAD_PIN)
REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
#endif

3
Marlin/src/pins/stm32/pins_ARMED.h
View File

@ -19,6 +19,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
// https://github.com/ktand/Armed
#pragma once
#ifndef STM32F4

25
Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
View File

@ -108,7 +108,6 @@
//
// Misc. Functions
//
#define SDSS PB12
#define LED_PIN PA6
//#define LED_PIN PA7
#define KILL_PIN PB1
@ -116,7 +115,7 @@
//
// LCD / Controller
//
#define SD_DETECT_PIN PC5
//#define SD_DETECT_PIN PC5
//#define SD_DETECT_PIN PA8 // SDIO SD_DETECT_PIN, external SDIO card reader only
#define BEEPER_PIN PD10
@ -132,3 +131,25 @@
#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
#define SDIO_D3_PIN PC11
#define SDIO_CK_PIN PC12
#define SDIO_CMD_PIN PD2
#if !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

16
Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
View File

@ -181,7 +181,21 @@
//
// Misc. Functions
//
#define SDSS PB12
//
// Onboard SD card
// NOT compatible with LCD
//
#if SDCARD_CONNECTION == ONBOARD && !defined(HAS_SPI_LCD)
#define SOFTWARE_SPI // Use soft SPI for onboard SD
#define SDSS PA4
#define SCK_PIN PA5
#define MISO_PIN PA6
#define MOSI_PIN PB5
#else
#define SDSS PB12
#endif
/**
* _____ _____

24
Marlin/src/pins/stm32/pins_FLYF407ZG.h
View File

@ -152,6 +152,30 @@
#define FAN4_PIN PE13
#define FAN5_PIN PB11
//
// Onboard SD support
//
#define SDIO_D0_PIN PC8
#define SDIO_D1_PIN PC9
//#define SD_CARD_DETECT_PIN PC13
#define SDIO_D2_PIN PC10
#define SDIO_D3_PIN PC11
#define SDIO_CK_PIN PC12
#define SDIO_CMD_PIN PD2
#if !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
//

33
Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
View File

@ -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 SDIO_D0_PIN 23 // PC8 SDIO_D0
#define SDIO_D1_PIN 24 // PC9 SDIO_D1
//#define SD_CARD_DETECT_PIN 25 // PA15 SD_CARD_DETECT
#define SDIO_D2_PIN 26 // PC10 SDIO_D2
#define SDIO_D3_PIN 27 // PC11 SDIO_D3
#define SDIO_CK_PIN 28 // PC12 SDIO_CK
#define SDIO_CMD_PIN 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
#if !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