From a2ee8425ceaee263afcdd798f519e232eb1fd486 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Sun, 18 Feb 2024 11:58:29 +0800 Subject: [PATCH] ENH: always return product for firmware and lifycycle JIRA: STUDIO-6282 Change-Id: I1f942babdcb7afee2c9a9076ac539063c5406ad7 Signed-off-by: Stone Li --- src/slic3r/GUI/DeviceManager.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 2280c270b..c26e32fb3 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1132,23 +1132,25 @@ MachineObject::LIGHT_EFFECT MachineObject::light_effect_parse(std::string effect std::string MachineObject::get_firmware_type_str() { - if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) + /*if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) return "engineer"; else if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION) - return "product"; + return "product";*/ - // return engineer by default; - return "engineer"; + // return product by default; + // always return product, printer do not push this field + return "product"; } std::string MachineObject::get_lifecycle_type_str() { - if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) + /*if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) return "engineer"; else if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION) - return "product"; + return "product";*/ // return product by default; + // always return product, printer do not push this field return "product"; } @@ -1641,7 +1643,7 @@ int MachineObject::command_control_fan(FanType fan_type, bool on_off) std::string gcode = (boost::format("M106 P%1% S%2% \n") % (int)fan_type % (on_off ? 255 : 0)).str(); try { json j; - j["crtl_type"] = get_string_from_fantype(fan_type); + j["ctrl_type"] = get_string_from_fantype(fan_type); j["value"] = on_off ? (int)1 : (int)0; NetworkAgent* agent = GUI::wxGetApp().getAgent();