Browse Source

Update defines for patched temperature macros (#14161)

Ludy 6 years ago
parent
commit
bd494a6bd6

+ 2
- 2
Marlin/src/inc/SanityCheck.h View File

1369
   #error "TEMP_SENSOR_4 1000 requires HOTEND4_PULLUP_RESISTOR_OHMS, HOTEND4_RESISTANCE_25C_OHMS and HOTEND4_BETA in Configuration_adv.h."
1369
   #error "TEMP_SENSOR_4 1000 requires HOTEND4_PULLUP_RESISTOR_OHMS, HOTEND4_RESISTANCE_25C_OHMS and HOTEND4_BETA in Configuration_adv.h."
1370
 #elif ENABLED(HEATER_5_USER_THERMISTOR) && !(defined(HOTEND5_PULLUP_RESISTOR_OHMS) && defined(HOTEND5_RESISTANCE_25C_OHMS) && defined(HOTEND5_BETA))
1370
 #elif ENABLED(HEATER_5_USER_THERMISTOR) && !(defined(HOTEND5_PULLUP_RESISTOR_OHMS) && defined(HOTEND5_RESISTANCE_25C_OHMS) && defined(HOTEND5_BETA))
1371
   #error "TEMP_SENSOR_5 1000 requires HOTEND5_PULLUP_RESISTOR_OHMS, HOTEND5_RESISTANCE_25C_OHMS and HOTEND5_BETA in Configuration_adv.h."
1371
   #error "TEMP_SENSOR_5 1000 requires HOTEND5_PULLUP_RESISTOR_OHMS, HOTEND5_RESISTANCE_25C_OHMS and HOTEND5_BETA in Configuration_adv.h."
1372
-#elif ENABLED(BED_USER_THERMISTOR) && !(defined(BED_PULLUP_RESISTOR_OHMS) && defined(BED_RESISTANCE_25C_OHMS) && defined(BED_BETA))
1372
+#elif ENABLED(HEATER_BED_USER_THERMISTOR) && !(defined(BED_PULLUP_RESISTOR_OHMS) && defined(BED_RESISTANCE_25C_OHMS) && defined(BED_BETA))
1373
   #error "TEMP_SENSOR_BED 1000 requires BED_PULLUP_RESISTOR_OHMS, BED_RESISTANCE_25C_OHMS and BED_BETA in Configuration_adv.h."
1373
   #error "TEMP_SENSOR_BED 1000 requires BED_PULLUP_RESISTOR_OHMS, BED_RESISTANCE_25C_OHMS and BED_BETA in Configuration_adv.h."
1374
-#elif ENABLED(CHAMBER_USER_THERMISTOR) && !(defined(CHAMBER_PULLUP_RESISTOR_OHMS) && defined(CHAMBER_RESISTANCE_25C_OHMS) && defined(CHAMBER_BETA))
1374
+#elif ENABLED(HEATER_CHAMBER_USER_THERMISTOR) && !(defined(CHAMBER_PULLUP_RESISTOR_OHMS) && defined(CHAMBER_RESISTANCE_25C_OHMS) && defined(CHAMBER_BETA))
1375
   #error "TEMP_SENSOR_CHAMBER 1000 requires CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS and CHAMBER_BETA in Configuration_adv.h."
1375
   #error "TEMP_SENSOR_CHAMBER 1000 requires CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS and CHAMBER_BETA in Configuration_adv.h."
1376
 #endif
1376
 #endif
1377
 
1377
 

+ 6
- 6
Marlin/src/module/temperature.cpp View File

1231
       #if ENABLED(HEATER_5_USER_THERMISTOR)
1231
       #if ENABLED(HEATER_5_USER_THERMISTOR)
1232
         { true, 0, 0, HOTEND5_PULLUP_RESISTOR_OHMS, HOTEND5_RESISTANCE_25C_OHMS, 0, 0, HOTEND5_BETA, 0 },
1232
         { true, 0, 0, HOTEND5_PULLUP_RESISTOR_OHMS, HOTEND5_RESISTANCE_25C_OHMS, 0, 0, HOTEND5_BETA, 0 },
1233
       #endif
1233
       #endif
1234
-      #if ENABLED(BED_USER_THERMISTOR)
1234
+      #if ENABLED(HEATER_BED_USER_THERMISTOR)
1235
         { true, 0, 0, BED_PULLUP_RESISTOR_OHMS, BED_RESISTANCE_25C_OHMS, 0, 0, BED_BETA, 0 },
1235
         { true, 0, 0, BED_PULLUP_RESISTOR_OHMS, BED_RESISTANCE_25C_OHMS, 0, 0, BED_BETA, 0 },
1236
       #endif
1236
       #endif
1237
-      #if ENABLED(CHAMBER_USER_THERMISTOR)
1237
+      #if ENABLED(HEATER_CHAMBER_USER_THERMISTOR)
1238
         { true, 0, 0, CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS, 0, 0, CHAMBER_BETA, 0 }
1238
         { true, 0, 0, CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS, 0, 0, CHAMBER_BETA, 0 }
1239
       #endif
1239
       #endif
1240
     };
1240
     };
1276
       #if ENABLED(HEATER_5_USER_THERMISTOR)
1276
       #if ENABLED(HEATER_5_USER_THERMISTOR)
1277
         t_index == CTI_HOTEND_5 ? PSTR("HOTEND 5") :
1277
         t_index == CTI_HOTEND_5 ? PSTR("HOTEND 5") :
1278
       #endif
1278
       #endif
1279
-      #if ENABLED(BED_USER_THERMISTOR)
1279
+      #if ENABLED(HEATER_BED_USER_THERMISTOR)
1280
         t_index == CTI_BED ? PSTR("BED") :
1280
         t_index == CTI_BED ? PSTR("BED") :
1281
       #endif
1281
       #endif
1282
-      #if ENABLED(CHAMBER_USER_THERMISTOR)
1282
+      #if ENABLED(HEATER_CHAMBER_USER_THERMISTOR)
1283
         t_index == CTI_CHAMBER ? PSTR("CHAMBER") :
1283
         t_index == CTI_CHAMBER ? PSTR("CHAMBER") :
1284
       #endif
1284
       #endif
1285
       nullptr
1285
       nullptr
1429
   // Derived from RepRap FiveD extruder::getTemperature()
1429
   // Derived from RepRap FiveD extruder::getTemperature()
1430
   // For bed temperature measurement.
1430
   // For bed temperature measurement.
1431
   float Temperature::analog_to_celsius_bed(const int raw) {
1431
   float Temperature::analog_to_celsius_bed(const int raw) {
1432
-    #if ENABLED(BED_USER_THERMISTOR)
1432
+    #if ENABLED(HEATER_BED_USER_THERMISTOR)
1433
       return user_thermistor_to_deg_c(CTI_BED, raw);
1433
       return user_thermistor_to_deg_c(CTI_BED, raw);
1434
     #elif ENABLED(HEATER_BED_USES_THERMISTOR)
1434
     #elif ENABLED(HEATER_BED_USES_THERMISTOR)
1435
       SCAN_THERMISTOR_TABLE(BED_TEMPTABLE, BED_TEMPTABLE_LEN);
1435
       SCAN_THERMISTOR_TABLE(BED_TEMPTABLE, BED_TEMPTABLE_LEN);
1447
   // Derived from RepRap FiveD extruder::getTemperature()
1447
   // Derived from RepRap FiveD extruder::getTemperature()
1448
   // For chamber temperature measurement.
1448
   // For chamber temperature measurement.
1449
   float Temperature::analog_to_celsius_chamber(const int raw) {
1449
   float Temperature::analog_to_celsius_chamber(const int raw) {
1450
-    #if ENABLED(CHAMBER_USER_THERMISTOR)
1450
+    #if ENABLED(HEATER_CHAMBER_USER_THERMISTOR)
1451
       return user_thermistor_to_deg_c(CTI_CHAMBER, raw);
1451
       return user_thermistor_to_deg_c(CTI_CHAMBER, raw);
1452
     #elif ENABLED(HEATER_CHAMBER_USES_THERMISTOR)
1452
     #elif ENABLED(HEATER_CHAMBER_USES_THERMISTOR)
1453
       SCAN_THERMISTOR_TABLE(CHAMBER_TEMPTABLE, CHAMBER_TEMPTABLE_LEN);
1453
       SCAN_THERMISTOR_TABLE(CHAMBER_TEMPTABLE, CHAMBER_TEMPTABLE_LEN);

+ 2
- 2
Marlin/src/module/temperature.h View File

233
     #if ENABLED(HEATER_5_USER_THERMISTOR)
233
     #if ENABLED(HEATER_5_USER_THERMISTOR)
234
       CTI_HOTEND_5,
234
       CTI_HOTEND_5,
235
     #endif
235
     #endif
236
-    #if ENABLED(BED_USER_THERMISTOR)
236
+    #if ENABLED(HEATER_BED_USER_THERMISTOR)
237
       CTI_BED,
237
       CTI_BED,
238
     #endif
238
     #endif
239
-    #if ENABLED(CHAMBER_USER_THERMISTOR)
239
+    #if ENABLED(HEATER_CHAMBER_USER_THERMISTOR)
240
       CTI_CHAMBER,
240
       CTI_CHAMBER,
241
     #endif
241
     #endif
242
     USER_THERMISTORS
242
     USER_THERMISTORS

Loading…
Cancel
Save