andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #3398 from thinkyhead/rc_sensor_per_extruder 

Catch a TEMP_SENSOR error before a pins issue
pull/1/head
Scott Lahteine 9 years ago
parent
90f6f02aca da2ff4a6d3
commit
9536e28978
1 changed files with 11 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      Marlin/SanityCheck.h

24
Marlin/SanityCheck.h
View File

@ -368,27 +368,29 @@
* Test Heater, Temp Sensor, and Extruder Pins; Sensor Type must also be set. * Test Heater, Temp Sensor, and Extruder Pins; Sensor Type must also be set.
*/ */
#if EXTRUDERS > 3 #if EXTRUDERS > 3
#if !HAS_HEATER_3 #if TEMP_SENSOR_3 == 0
#error TEMP_SENSOR_3 is required with 4 EXTRUDERS.
#elif !HAS_HEATER_3
#error HEATER_3_PIN not defined for this board. #error HEATER_3_PIN not defined for this board.
#elif !PIN_EXISTS(TEMP_3) #elif !PIN_EXISTS(TEMP_3)
#error TEMP_3_PIN not defined for this board. #error TEMP_3_PIN not defined for this board.
#elif !PIN_EXISTS(E3_STEP) || !PIN_EXISTS(E3_DIR) || !PIN_EXISTS(E3_ENABLE) #elif !PIN_EXISTS(E3_STEP) || !PIN_EXISTS(E3_DIR) || !PIN_EXISTS(E3_ENABLE)
#error E3_STEP_PIN, E3_DIR_PIN, or E3_ENABLE_PIN not defined for this board. #error E3_STEP_PIN, E3_DIR_PIN, or E3_ENABLE_PIN not defined for this board.
#elif TEMP_SENSOR_3 == 0
#error TEMP_SENSOR_3 is required with 4 EXTRUDERS.
#endif #endif
#elif EXTRUDERS > 2 #elif EXTRUDERS > 2
#if !HAS_HEATER_2 #if TEMP_SENSOR_2 == 0
#error TEMP_SENSOR_2 is required with 3 or more EXTRUDERS.
#elif !HAS_HEATER_2
#error HEATER_2_PIN not defined for this board. #error HEATER_2_PIN not defined for this board.
#elif !PIN_EXISTS(TEMP_2) #elif !PIN_EXISTS(TEMP_2)
#error TEMP_2_PIN not defined for this board. #error TEMP_2_PIN not defined for this board.
#elif !PIN_EXISTS(E2_STEP) || !PIN_EXISTS(E2_DIR) || !PIN_EXISTS(E2_ENABLE) #elif !PIN_EXISTS(E2_STEP) || !PIN_EXISTS(E2_DIR) || !PIN_EXISTS(E2_ENABLE)
#error E2_STEP_PIN, E2_DIR_PIN, or E2_ENABLE_PIN not defined for this board. #error E2_STEP_PIN, E2_DIR_PIN, or E2_ENABLE_PIN not defined for this board.
#elif TEMP_SENSOR_2 == 0
#error TEMP_SENSOR_2 is required with 3 or more EXTRUDERS.
#endif #endif
#elif EXTRUDERS > 1 #elif EXTRUDERS > 1
#if !PIN_EXISTS(TEMP_1) #if TEMP_SENSOR_1 == 0
#error TEMP_SENSOR_1 is required with 2 or more EXTRUDERS.
#elif !PIN_EXISTS(TEMP_1)
#error TEMP_1_PIN not defined for this board. #error TEMP_1_PIN not defined for this board.
#elif !PIN_EXISTS(E1_STEP) || !PIN_EXISTS(E1_DIR) || !PIN_EXISTS(E1_ENABLE) #elif !PIN_EXISTS(E1_STEP) || !PIN_EXISTS(E1_DIR) || !PIN_EXISTS(E1_ENABLE)
#error E1_STEP_PIN, E1_DIR_PIN, or E1_ENABLE_PIN not defined for this board. #error E1_STEP_PIN, E1_DIR_PIN, or E1_ENABLE_PIN not defined for this board.
@ -401,12 +403,8 @@
#endif #endif
#endif #endif
#if TEMP_SENSOR_1 == 0 #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) && TEMP_SENSOR_1 == 0
#if EXTRUDERS > 1 #error TEMP_SENSOR_1 is required with TEMP_SENSOR_1_AS_REDUNDANT.
#error TEMP_SENSOR_1 is required with 2 or more EXTRUDERS.
#elif ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
#error TEMP_SENSOR_1 is required with TEMP_SENSOR_1_AS_REDUNDANT.
#endif
#endif #endif
#if !HAS_HEATER_0 #if !HAS_HEATER_0

Write Preview
Loading…
Cancel
Save