|
@@ -287,7 +287,7 @@ Temperature thermalManager;
|
287
|
287
|
float Temperature::redundant_temperature = 0.0;
|
288
|
288
|
#endif
|
289
|
289
|
|
290
|
|
-volatile bool Temperature::temp_meas_ready = false;
|
|
290
|
+volatile bool Temperature::raw_temps_ready = false;
|
291
|
291
|
|
292
|
292
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
293
|
293
|
int32_t Temperature::last_e_position, Temperature::lpq[LPQ_MAX_LEN];
|
|
@@ -435,7 +435,7 @@ volatile bool Temperature::temp_meas_ready = false;
|
435
|
435
|
|
436
|
436
|
const millis_t ms = millis();
|
437
|
437
|
|
438
|
|
- if (temp_meas_ready) { // temp sample ready
|
|
438
|
+ if (raw_temps_ready) { // temp sample ready
|
439
|
439
|
updateTemperaturesFromRawValues();
|
440
|
440
|
|
441
|
441
|
// Get the current temperature and constrain it
|
|
@@ -1053,7 +1053,7 @@ void Temperature::manage_heater() {
|
1053
|
1053
|
if (emergency_parser.killed_by_M112) kill();
|
1054
|
1054
|
#endif
|
1055
|
1055
|
|
1056
|
|
- if (!temp_meas_ready) return;
|
|
1056
|
+ if (!raw_temps_ready) return;
|
1057
|
1057
|
|
1058
|
1058
|
updateTemperaturesFromRawValues(); // also resets the watchdog
|
1059
|
1059
|
|
|
@@ -1090,10 +1090,10 @@ void Temperature::manage_heater() {
|
1090
|
1090
|
|
1091
|
1091
|
#if WATCH_HOTENDS
|
1092
|
1092
|
// Make sure temperature is increasing
|
1093
|
|
- if (watch_hotend[e].next_ms && ELAPSED(ms, watch_hotend[e].next_ms)) { // Time to check this extruder?
|
1094
|
|
- if (degHotend(e) < watch_hotend[e].target) // Failed to increase enough?
|
|
1093
|
+ if (watch_hotend[e].next_ms && ELAPSED(ms, watch_hotend[e].next_ms)) { // Time to check this extruder?
|
|
1094
|
+ if (degHotend(e) < watch_hotend[e].target) // Failed to increase enough?
|
1095
|
1095
|
_temp_error((heater_ind_t)e, PSTR(MSG_T_HEATING_FAILED), GET_TEXT(MSG_HEATING_FAILED_LCD));
|
1096
|
|
- else // Start again if the target is still far off
|
|
1096
|
+ else // Start again if the target is still far off
|
1097
|
1097
|
start_watching_hotend(e);
|
1098
|
1098
|
}
|
1099
|
1099
|
#endif
|
|
@@ -1625,7 +1625,7 @@ void Temperature::updateTemperaturesFromRawValues() {
|
1625
|
1625
|
// Reset the watchdog on good temperature measurement
|
1626
|
1626
|
watchdog_refresh();
|
1627
|
1627
|
|
1628
|
|
- temp_meas_ready = false;
|
|
1628
|
+ raw_temps_ready = false;
|
1629
|
1629
|
}
|
1630
|
1630
|
|
1631
|
1631
|
#if MAX6675_SEPARATE_SPI
|
|
@@ -2304,9 +2304,9 @@ void Temperature::disable_all_heaters() {
|
2304
|
2304
|
#endif // HAS_MAX6675
|
2305
|
2305
|
|
2306
|
2306
|
/**
|
2307
|
|
- * Get raw temperatures
|
|
2307
|
+ * Update raw temperatures
|
2308
|
2308
|
*/
|
2309
|
|
-void Temperature::set_current_temp_raw() {
|
|
2309
|
+void Temperature::update_raw_temperatures() {
|
2310
|
2310
|
|
2311
|
2311
|
#if HAS_TEMP_ADC_0 && DISABLED(HEATER_0_USES_MAX6675)
|
2312
|
2312
|
temp_hotend[0].update();
|
|
@@ -2360,13 +2360,13 @@ void Temperature::set_current_temp_raw() {
|
2360
|
2360
|
joystick.z.update();
|
2361
|
2361
|
#endif
|
2362
|
2362
|
|
2363
|
|
- temp_meas_ready = true;
|
|
2363
|
+ raw_temps_ready = true;
|
2364
|
2364
|
}
|
2365
|
2365
|
|
2366
|
2366
|
void Temperature::readings_ready() {
|
2367
|
2367
|
|
2368
|
2368
|
// Update the raw values if they've been read. Else we could be updating them during reading.
|
2369
|
|
- if (!temp_meas_ready) set_current_temp_raw();
|
|
2369
|
+ if (!raw_temps_ready) update_raw_temperatures();
|
2370
|
2370
|
|
2371
|
2371
|
// Filament Sensor - can be read any time since IIR filtering is used
|
2372
|
2372
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|