Configurable Thermistor (#13888)

2019-05-07 00:51:06 +01:00
parent 172abc305b
commit 23a8707ef1
183 changed files with 4575 additions and 151 deletions
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@ -286,6 +286,11 @@
 /**
 * Temp Sensor defines
 */
+
+#define ANY_TEMP_SENSOR_IS(n) (TEMP_SENSOR_0 == (n) || TEMP_SENSOR_1 == (n) || TEMP_SENSOR_2 == (n) || TEMP_SENSOR_3 == (n) || TEMP_SENSOR_4 == (n) || TEMP_SENSOR_5 == (n) || TEMP_SENSOR_BED == (n) || TEMP_SENSOR_CHAMBER == (n))
+
+#define HAS_USER_THERMISTORS ANY_TEMP_SENSOR_IS(1000)
+
 #if TEMP_SENSOR_0 == -4
  #define HEATER_0_USES_AD8495
 #elif TEMP_SENSOR_0 == -3
@ -299,12 +304,14 @@
  #define HEATER_0_MAX6675_TMAX 1024
 #elif TEMP_SENSOR_0 == -1
  #define HEATER_0_USES_AD595
-#elif TEMP_SENSOR_0 == 0
+#elif TEMP_SENSOR_0 == 1000
+  #define HEATER_0_USER_THERMISTOR
+#elif TEMP_SENSOR_0 > 0
+  #define THERMISTOR_HEATER_0 TEMP_SENSOR_0
+  #define HEATER_0_USES_THERMISTOR
+#else
  #undef HEATER_0_MINTEMP
  #undef HEATER_0_MAXTEMP
-#elif TEMP_SENSOR_0 > 0
-  #define THERMISTORHEATER_0 TEMP_SENSOR_0
-  #define HEATER_0_USES_THERMISTOR
 #endif

 #if TEMP_SENSOR_1 == -4
@ -325,12 +332,14 @@
  #define HEATER_1_MAX6675_TMAX 1024
 #elif TEMP_SENSOR_1 == -1
  #define HEATER_1_USES_AD595
-#elif TEMP_SENSOR_1 == 0
+#elif TEMP_SENSOR_1 == 1000
+  #define HEATER_1_USER_THERMISTOR
+#elif TEMP_SENSOR_1 > 0
+  #define THERMISTOR_HEATER_1 TEMP_SENSOR_1
+  #define HEATER_1_USES_THERMISTOR
+#else
  #undef HEATER_1_MINTEMP
  #undef HEATER_1_MAXTEMP
-#elif TEMP_SENSOR_1 > 0
-  #define THERMISTORHEATER_1 TEMP_SENSOR_1
-  #define HEATER_1_USES_THERMISTOR
 #endif

 #if TEMP_SENSOR_2 == -4
@ -341,12 +350,14 @@
  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_2."
 #elif TEMP_SENSOR_2 == -1
  #define HEATER_2_USES_AD595
-#elif TEMP_SENSOR_2 == 0
+#elif TEMP_SENSOR_2 == 1000
+  #define HEATER_2_USER_THERMISTOR
+#elif TEMP_SENSOR_2 > 0
+  #define THERMISTOR_HEATER_2 TEMP_SENSOR_2
+  #define HEATER_2_USES_THERMISTOR
+#else
  #undef HEATER_2_MINTEMP
  #undef HEATER_2_MAXTEMP
-#elif TEMP_SENSOR_2 > 0
-  #define THERMISTORHEATER_2 TEMP_SENSOR_2
-  #define HEATER_2_USES_THERMISTOR
 #endif

 #if TEMP_SENSOR_3 == -4
@ -357,12 +368,14 @@
  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_3."
 #elif TEMP_SENSOR_3 == -1
  #define HEATER_3_USES_AD595
-#elif TEMP_SENSOR_3 == 0
+#elif TEMP_SENSOR_3 == 1000
+  #define HEATER_3_USER_THERMISTOR
+#elif TEMP_SENSOR_3 > 0
+  #define THERMISTOR_HEATER_3 TEMP_SENSOR_3
+  #define HEATER_3_USES_THERMISTOR
+#else
  #undef HEATER_3_MINTEMP
  #undef HEATER_3_MAXTEMP
-#elif TEMP_SENSOR_3 > 0
-  #define THERMISTORHEATER_3 TEMP_SENSOR_3
-  #define HEATER_3_USES_THERMISTOR
 #endif

 #if TEMP_SENSOR_4 == -4
@ -373,12 +386,14 @@
  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_4."
 #elif TEMP_SENSOR_4 == -1
  #define HEATER_4_USES_AD595
-#elif TEMP_SENSOR_4 == 0
+#elif TEMP_SENSOR_4 == 1000
+  #define HEATER_4_USER_THERMISTOR
+#elif TEMP_SENSOR_4 > 0
+  #define THERMISTOR_HEATER_4 TEMP_SENSOR_4
+  #define HEATER_4_USES_THERMISTOR
+#else
  #undef HEATER_4_MINTEMP
  #undef HEATER_4_MAXTEMP
-#elif TEMP_SENSOR_4 > 0
-  #define THERMISTORHEATER_4 TEMP_SENSOR_4
-  #define HEATER_4_USES_THERMISTOR
 #endif

 #if TEMP_SENSOR_5 == -4
@ -389,12 +404,14 @@
  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_5."
 #elif TEMP_SENSOR_5 == -1
  #define HEATER_5_USES_AD595
-#elif TEMP_SENSOR_5 == 0
+#elif TEMP_SENSOR_5 == 1000
+  #define HEATER_5_USER_THERMISTOR
+#elif TEMP_SENSOR_5 > 0
+  #define THERMISTOR_HEATER_5 TEMP_SENSOR_5
+  #define HEATER_5_USES_THERMISTOR
+#else
  #undef HEATER_5_MINTEMP
  #undef HEATER_5_MAXTEMP
-#elif TEMP_SENSOR_5 > 0
-  #define THERMISTORHEATER_5 TEMP_SENSOR_5
-  #define HEATER_5_USES_THERMISTOR
 #endif

 #if TEMP_SENSOR_BED == -4
@ -405,12 +422,14 @@
  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
 #elif TEMP_SENSOR_BED == -1
  #define HEATER_BED_USES_AD595
-#elif TEMP_SENSOR_BED == 0
-  #undef BED_MINTEMP
-  #undef BED_MAXTEMP
+#elif TEMP_SENSOR_BED == 1000
+  #define BED_USER_THERMISTOR
 #elif TEMP_SENSOR_BED > 0
  #define THERMISTORBED TEMP_SENSOR_BED
  #define HEATER_BED_USES_THERMISTOR
+#else
+  #undef BED_MINTEMP
+  #undef BED_MAXTEMP
 #endif

 #if TEMP_SENSOR_CHAMBER == -4
@ -421,9 +440,14 @@
  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_CHAMBER."
 #elif TEMP_SENSOR_CHAMBER == -1
  #define HEATER_CHAMBER_USES_AD595
+#elif TEMP_SENSOR_CHAMBER == 1000
+  #define CHAMBER_USER_THERMISTOR
 #elif TEMP_SENSOR_CHAMBER > 0
  #define THERMISTORCHAMBER TEMP_SENSOR_CHAMBER
  #define HEATER_CHAMBER_USES_THERMISTOR
+#else
+  #undef CHAMBER_MINTEMP
+  #undef CHAMBER_MAXTEMP
 #endif

 #define HOTEND_USES_THERMISTOR ANY(HEATER_0_USES_THERMISTOR, HEATER_1_USES_THERMISTOR, HEATER_2_USES_THERMISTOR, HEATER_3_USES_THERMISTOR, HEATER_4_USES_THERMISTOR)
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@ -1339,6 +1339,27 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  #error "You cannot set CASE_LIGHT_PIN equal to FAN_PIN."
 #endif

+/**
+ * Required custom thermistor settings
+ */
+#if   ENABLED(HEATER_0_USER_THERMISTOR) && !(defined(HOTEND0_PULLUP_RESISTOR_OHMS) && defined(HOTEND0_RESISTANCE_25C_OHMS) && defined(HOTEND0_BETA))
+  #error "TEMP_SENSOR_0 1000 requires HOTEND0_PULLUP_RESISTOR_OHMS, HOTEND0_RESISTANCE_25C_OHMS and HOTEND0_BETA in Configuration_adv.h."
+#elif ENABLED(HEATER_1_USER_THERMISTOR) && !(defined(HOTEND1_PULLUP_RESISTOR_OHMS) && defined(HOTEND1_RESISTANCE_25C_OHMS) && defined(HOTEND1_BETA))
+  #error "TEMP_SENSOR_1 1000 requires HOTEND1_PULLUP_RESISTOR_OHMS, HOTEND1_RESISTANCE_25C_OHMS and HOTEND1_BETA in Configuration_adv.h."
+#elif ENABLED(HEATER_2_USER_THERMISTOR) && !(defined(HOTEND2_PULLUP_RESISTOR_OHMS) && defined(HOTEND2_RESISTANCE_25C_OHMS) && defined(HOTEND2_BETA))
+  #error "TEMP_SENSOR_2 1000 requires HOTEND2_PULLUP_RESISTOR_OHMS, HOTEND2_RESISTANCE_25C_OHMS and HOTEND2_BETA in Configuration_adv.h."
+#elif ENABLED(HEATER_3_USER_THERMISTOR) && !(defined(HOTEND3_PULLUP_RESISTOR_OHMS) && defined(HOTEND3_RESISTANCE_25C_OHMS) && defined(HOTEND3_BETA))
+  #error "TEMP_SENSOR_3 1000 requires HOTEND3_PULLUP_RESISTOR_OHMS, HOTEND3_RESISTANCE_25C_OHMS and HOTEND3_BETA in Configuration_adv.h."
+#elif ENABLED(HEATER_4_USER_THERMISTOR) && !(defined(HOTEND4_PULLUP_RESISTOR_OHMS) && defined(HOTEND4_RESISTANCE_25C_OHMS) && defined(HOTEND4_BETA))
+  #error "TEMP_SENSOR_4 1000 requires HOTEND4_PULLUP_RESISTOR_OHMS, HOTEND4_RESISTANCE_25C_OHMS and HOTEND4_BETA in Configuration_adv.h."
+#elif ENABLED(HEATER_5_USER_THERMISTOR) && !(defined(HOTEND5_PULLUP_RESISTOR_OHMS) && defined(HOTEND5_RESISTANCE_25C_OHMS) && defined(HOTEND5_BETA))
+  #error "TEMP_SENSOR_5 1000 requires HOTEND5_PULLUP_RESISTOR_OHMS, HOTEND5_RESISTANCE_25C_OHMS and HOTEND5_BETA in Configuration_adv.h."
+#elif ENABLED(BED_USER_THERMISTOR) && !(defined(BED_PULLUP_RESISTOR_OHMS) && defined(BED_RESISTANCE_25C_OHMS) && defined(BED_BETA))
+  #error "TEMP_SENSOR_BED 1000 requires BED_PULLUP_RESISTOR_OHMS, BED_RESISTANCE_25C_OHMS and BED_BETA in Configuration_adv.h."
+#elif ENABLED(CHAMBER_USER_THERMISTOR) && !(defined(CHAMBER_PULLUP_RESISTOR_OHMS) && defined(CHAMBER_RESISTANCE_25C_OHMS) && defined(CHAMBER_BETA))
+  #error "TEMP_SENSOR_CHAMBER 1000 requires CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS and CHAMBER_BETA in Configuration_adv.h."
+#endif
+
 /**
 * Test Heater, Temp Sensor, and Extruder Pins; Sensor Type must also be set.
 */