From 78ed427166045a94a97b496965045433ca5cbfb5 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 08:39:24 +0200 Subject: [PATCH] Rename `TempModel` to `ThermalModel` --- Firmware/ultralcd.cpp | 10 +++++----- Firmware/ultralcd.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e980bf7ff..18b5b8bc5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -888,7 +888,7 @@ void lcd_commands() } #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) { @@ -3804,7 +3804,7 @@ void lcd_wizard(WizState state) state = S::Z; #ifdef THERMAL_MODEL } else if (!calibration_status_get(CALIBRATION_STATUS_THERMAL_MODEL)) { - state = S::TempModel; + state = S::ThermalModel; #endif //THERMAL_MODEL } else if (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) { state = S::IsFil; @@ -3848,9 +3848,9 @@ void lcd_wizard(WizState state) } break; #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_commands_type = LcdCommands::TempModel; + lcd_commands_type = LcdCommands::ThermalModel; end = true; // Leave wizard temporarily for TM cal. break; #endif //THERMAL_MODEL @@ -5594,7 +5594,7 @@ void lcd_print_stop() #ifdef THERMAL_MODEL void lcd_thermal_model_cal() { - lcd_commands_type = LcdCommands::TempModel; + lcd_commands_type = LcdCommands::ThermalModel; lcd_return_to_status(); } #endif //THERMAL_MODEL diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index e74390852..5e5c7dba3 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -118,7 +118,7 @@ enum class LcdCommands : uint_least8_t PidExtruder, Layer1Cal, #ifdef THERMAL_MODEL - TempModel, + ThermalModel, #endif //THERMAL_MODEL NozzleCNG, }; @@ -226,7 +226,7 @@ enum class WizState : uint8_t Xyz, //!< xyz calibration Z, //!< z calibration #ifdef THERMAL_MODEL - TempModel, //!< Thermal Model calibration + ThermalModel, //!< Thermal Model calibration #endif //THERMAL_MODEL IsFil, //!< Is filament loaded? First step of 1st layer calibration Preheat, //!< Preheat for any material