From 08ce9fe662ffe13636fafa317e218d4e840d6728 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Tue, 8 Aug 2023 19:47:54 +0800 Subject: [PATCH] ENH: add more print stage values Change-Id: I098eb4bae14cbfd44af2dea7fb108bbc07d47407 Signed-off-by: Stone Li --- src/slic3r/GUI/DeviceManager.cpp | 18 ++++++++++++++++-- src/slic3r/GUI/DeviceManager.hpp | 19 ------------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index e8d6c0c73..cf81109f0 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -21,7 +21,7 @@ namespace pt = boost::property_tree; -const int PRINTING_STAGE_COUNT = 20; +const int PRINTING_STAGE_COUNT = 26; std::string PRINTING_STAGE_STR[PRINTING_STAGE_COUNT] = { "printing", "bed_leveling", @@ -42,7 +42,13 @@ std::string PRINTING_STAGE_STR[PRINTING_STAGE_COUNT] = { "user_pause", "toolhead_shell_off_pause", "scanner_laser_para_cali", - "extruder_absolute_flow_cali" + "extruder_absolute_flow_cali", + "hotend_temperature_error_pause", // 20 + "heated_bed_temperature_error_pause", + "filament_unloading", + "skip_step_pause", + "filament_loading", + "motor_noise_calibration" }; @@ -97,6 +103,14 @@ wxString get_stage_string(int stage) return _L("Paused due to nozzle temperature malfunction"); case 21: return _L("Paused due to heat bed temperature malfunction"); + case 22: + return _L("Filament unloading"); + case 23: + return _L("Skip step pause"); + case 24: + return _L("Filament loading"); + case 25: + return _L("Motor noise calibration"); default: ; } diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 08dadea34..c1f2deb7a 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -58,25 +58,6 @@ enum PrinterSeries { SERIES_UNKNOWN, }; -enum PRINTING_STAGE { - PRINTING_STAGE_PRINTING = 0, - PRINTING_STAGE_BED_LEVELING, - PRINTING_STAGE_HEADBED, - PRINTING_STAGE_XY_MECH_MODE, - PRINTING_STAGE_CHANGE_MATERIAL, - PRINTING_STAGE_M400_PAUSE, - PRINTING_STAGE_FILAMENT_RUNOUT_PAUSE, - PRINTING_STAGE_HOTEND_HEATING, - PRINTING_STAGE_EXTRUDER_SCAN, - PRINTING_STAGE_BED_SCAN, - PRINTING_STAGE_FIRST_LAYER_SCAN, - PRINTING_STAGE_SURFACE_TYPE_IDENT, - PRINTING_STAGE_SCANNER_PARAM_CALI, - PRINTING_STAGE_TOOHEAD_HOMING, - PRINTING_STAGE_NOZZLE_TIP_CLEANING, - PRINTING_STAGE_COUNT -}; - enum PrinterFunction { FUNC_MONITORING = 0, FUNC_TIMELAPSE,