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

Rename `TempModel` to `ThermalModel`

This commit is contained in:
3d-gussner 2023-05-24 08:39:24 +02:00
parent 600a7a0316
commit 78ed427166
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/ultralcd.cpp
View File

@ -888,7 +888,7 @@ void lcd_commands()
} }
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
if (lcd_commands_type == LcdCommands::TempModel && cmd_buffer_empty()) if (lcd_commands_type == LcdCommands::ThermalModel && cmd_buffer_empty())
{ {
switch (lcd_commands_step) switch (lcd_commands_step)
{ {
@ -3804,7 +3804,7 @@ void lcd_wizard(WizState state)
state = S::Z; state = S::Z;
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
} else if (!calibration_status_get(CALIBRATION_STATUS_THERMAL_MODEL)) { } else if (!calibration_status_get(CALIBRATION_STATUS_THERMAL_MODEL)) {
state = S::TempModel; state = S::ThermalModel;
#endif //THERMAL_MODEL #endif //THERMAL_MODEL
} else if (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) { } else if (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) {
state = S::IsFil; state = S::IsFil;
@ -3848,9 +3848,9 @@ void lcd_wizard(WizState state)
} }
break; break;
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
case S::TempModel: case S::ThermalModel:
lcd_show_fullscreen_message_and_wait_P(_i("Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"));////MSG_TM_CAL c=20 r=4 lcd_show_fullscreen_message_and_wait_P(_i("Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"));////MSG_TM_CAL c=20 r=4
lcd_commands_type = LcdCommands::TempModel; lcd_commands_type = LcdCommands::ThermalModel;
end = true; // Leave wizard temporarily for TM cal. end = true; // Leave wizard temporarily for TM cal.
break; break;
#endif //THERMAL_MODEL #endif //THERMAL_MODEL
@ -5594,7 +5594,7 @@ void lcd_print_stop()
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
void lcd_thermal_model_cal() void lcd_thermal_model_cal()
{ {
lcd_commands_type = LcdCommands::TempModel; lcd_commands_type = LcdCommands::ThermalModel;
lcd_return_to_status(); lcd_return_to_status();
} }
#endif //THERMAL_MODEL #endif //THERMAL_MODEL

4
Firmware/ultralcd.h
View File

@ -118,7 +118,7 @@ enum class LcdCommands : uint_least8_t
PidExtruder, PidExtruder,
Layer1Cal, Layer1Cal,
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
TempModel, ThermalModel,
#endif //THERMAL_MODEL #endif //THERMAL_MODEL
NozzleCNG, NozzleCNG,
}; };
@ -226,7 +226,7 @@ enum class WizState : uint8_t
Xyz, //!< xyz calibration Xyz, //!< xyz calibration
Z, //!< z calibration Z, //!< z calibration
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
TempModel, //!< Thermal Model calibration ThermalModel, //!< Thermal Model calibration
#endif //THERMAL_MODEL #endif //THERMAL_MODEL
IsFil, //!< Is filament loaded? First step of 1st layer calibration IsFil, //!< Is filament loaded? First step of 1st layer calibration
Preheat, //!< Preheat for any material Preheat, //!< Preheat for any material