mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: always return product for firmware and lifycycle 

JIRA: STUDIO-6282

Change-Id: I1f942babdcb7afee2c9a9076ac539063c5406ad7
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2024-02-18 11:58:29 +08:00 committed by Lane.Wei
parent 2839439cb3
commit a2ee8425ce
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/DeviceManager.cpp
View File

@ -1132,23 +1132,25 @@ MachineObject::LIGHT_EFFECT MachineObject::light_effect_parse(std::string effect
std::string MachineObject::get_firmware_type_str() std::string MachineObject::get_firmware_type_str()
{ {
if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) /*if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER)
return "engineer"; return "engineer";
else if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION) else if (firmware_type == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION)
return "product"; return "product";*/
// return engineer by default; // return product by default;
return "engineer"; // always return product, printer do not push this field
return "product";
} }
std::string MachineObject::get_lifecycle_type_str() std::string MachineObject::get_lifecycle_type_str()
{ {
if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER) /*if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_ENGINEER)
return "engineer"; return "engineer";
else if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION) else if (lifecycle == PrinterFirmwareType::FIRMWARE_TYPE_PRODUCTION)
return "product"; return "product";*/
// return product by default; // return product by default;
// always return product, printer do not push this field
return "product"; 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(); std::string gcode = (boost::format("M106 P%1% S%2% \n") % (int)fan_type % (on_off ? 255 : 0)).str();
try { try {
json j; 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; j["value"] = on_off ? (int)1 : (int)0;
NetworkAgent* agent = GUI::wxGetApp().getAgent(); NetworkAgent* agent = GUI::wxGetApp().getAgent();