3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TM: Also clear the status flags when disabling the model

Browse Source 
Disabling the model during a warn/error condition will also stop
updating the warning/error flag, keeping the printer in an error state.

Clear all flags as well when changing model settings.
This commit is contained in:
Yuri D'Elia 2022-12-30 13:49:21 +01:00 committed by DRracer
parent 8bd0d6aeb8
commit 5a89f6934a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/temperature.cpp
View File

@ -2371,11 +2371,18 @@ void model_data::step(uint8_t heater_pwm, uint8_t fan_pwm, float heater_temp, fl
flag_bits.warning = (fabsf(dT_err_f) > warn_s); flag_bits.warning = (fabsf(dT_err_f) > warn_s);
} }
// clear error flags and mark as uninitialized
void reinitialize()
{
data.flags = 1; // shorcut to reset all error flags
warning_state.assert = false; // explicitly clear assertions
}
// verify calibration status and trigger a model reset if valid // verify calibration status and trigger a model reset if valid
void setup() void setup()
{ {
if(!calibrated()) enabled = false; if(!calibrated()) enabled = false;
data.flag_bits.uninitialized = true; reinitialize();
} }
bool calibrated() bool calibrated()
@ -2506,7 +2513,7 @@ static void temp_model_reset_enabled(bool enabled)
{ {
TempMgrGuard temp_mgr_guard; TempMgrGuard temp_mgr_guard;
temp_model::enabled = enabled; temp_model::enabled = enabled;
temp_model::data.flag_bits.uninitialized = true; temp_model::reinitialize();
} }
bool temp_model_enabled() bool temp_model_enabled()
@ -2586,7 +2593,7 @@ void temp_model_reset_settings()
temp_model::data.err = TEMP_MODEL_E; temp_model::data.err = TEMP_MODEL_E;
temp_model::warn_beep = true; temp_model::warn_beep = true;
temp_model::enabled = true; temp_model::enabled = true;
temp_model::data.flag_bits.uninitialized = true; temp_model::reinitialize();
} }
void temp_model_load_settings() void temp_model_load_settings()