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

Fix various errors, warnings in example config builds (#19686)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Jason Smith
2020-10-11 17:06:57 -07:00
committed by GitHub
parent 45731bd022
commit c762b7c91b
11 changed files with 141 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Marlin/src/pins/sensitive_pins.h
View File

@ -608,12 +608,6 @@
#define _Z_PROBE
#endif
#if TEMP_SENSOR_BED && PIN_EXISTS(HEATER_BED)
#define _HEATER_BED HEATER_BED_PIN,
#else
#define _HEATER_BED
#endif
#if PIN_EXISTS(FAN)
#define _FAN0 FAN_PIN,
#else
@ -660,21 +654,26 @@
#define _FANC
#endif
#if PIN_EXISTS(HEATER_BED) && PIN_EXISTS(TEMP_BED)
#if TEMP_SENSOR_BED && PINS_EXIST(TEMP_BED, HEATER_BED)
#define _BED_PINS HEATER_BED_PIN, analogInputToDigitalPin(TEMP_BED_PIN),
#else
#define _BED_PINS
#endif
#if PIN_EXISTS(TEMP_CHAMBER)
#define __CHAMBER_PINS CHAMBER_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_CHAMBER_PIN),
#if TEMP_SENSOR_CHAMBER && PIN_EXISTS(TEMP_CHAMBER)
#define _CHAMBER_TEMP analogInputToDigitalPin(TEMP_CHAMBER_PIN),
#else
#define __CHAMBER_PINS
#define _CHAMBER_TEMP
#endif
#if PIN_EXISTS(HEATER_CHAMBER)
#define _CHAMBER_PINS __CHAMBER_PINS HEATER_CHAMBER_PIN,
#if TEMP_SENSOR_CHAMBER && PINS_EXIST(TEMP_CHAMBER, HEATER_CHAMBER)
#define _CHAMBER_HEATER HEATER_CHAMBER_PIN,
#else
#define _CHAMBER_PINS
#define _CHAMBER_HEATER
#endif
#if TEMP_SENSOR_CHAMBER && PINS_EXIST(TEMP_CHAMBER, CHAMBER_AUTO_FAN)
#define _CHAMBER_FAN CHAMBER_AUTO_FAN_PIN,
#else
#define _CHAMBER_FAN
#endif
#ifndef HAL_SENSITIVE_PINS
@ -685,6 +684,6 @@
_X_PINS _Y_PINS _Z_PINS _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
_E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _E6_PINS _E7_PINS \
_H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS _H6_PINS _H7_PINS \
_PS_ON _HEATER_BED _FAN0 _FAN1 _FAN2 _FAN3 _FAN4 _FAN5 _FAN6 _FAN7 _FANC \
_BED_PINS _CHAMBER_PINS HAL_SENSITIVE_PINS \
_PS_ON _FAN0 _FAN1 _FAN2 _FAN3 _FAN4 _FAN5 _FAN6 _FAN7 _FANC \
_BED_PINS _CHAMBER_TEMP _CHAMBER_HEATER _CHAMBER_FAN HAL_SENSITIVE_PINS \
}

1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View File

@ -200,6 +200,7 @@
#elif SD_CONNECTION_IS(ONBOARD)
#define SDIO_SUPPORT
#define SD_DETECT_PIN PD12
#define ONBOARD_SD_CS_PIN PC11
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif