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

FIX: prevent the dirty data 

jira: [STUDIO-10413]
Change-Id: Ie7f65c1a49f12dc049bbec5697d037ad79dd7699
This commit is contained in:
xin.zhang 2025-02-17 10:11:13 +08:00 committed by lane.wei
parent 63b7c02219
commit 068ec1e63f
1 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5196,20 +5196,32 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
if (j.contains("camera")) { if (j.contains("camera")) {
if (j["camera"].contains("command")) { if (j["camera"].contains("command")) {
if (j["camera"]["command"].get<std::string>() == "ipcam_timelapse") { if (j["camera"]["command"].get<std::string>() == "ipcam_timelapse") {
if (j["camera"]["control"].get<std::string>() == "enable") if (camera_timelapse_hold_count > 0) {
this->camera_timelapse = true; camera_timelapse_hold_count--;
if (j["camera"]["control"].get<std::string>() == "disable") }
this->camera_timelapse = false; else
BOOST_LOG_TRIVIAL(info) << "ack of timelapse = " << camera_timelapse; {
if (j["camera"]["control"].get<std::string>() == "enable") this->camera_timelapse = true;
if (j["camera"]["control"].get<std::string>() == "disable") this->camera_timelapse = false;
BOOST_LOG_TRIVIAL(info) << "ack of timelapse = " << camera_timelapse;
}
} else if (j["camera"]["command"].get<std::string>() == "ipcam_record_set") { } else if (j["camera"]["command"].get<std::string>() == "ipcam_record_set") {
if (j["camera"]["control"].get<std::string>() == "enable") if (camera_recording_hold_count > 0) {
this->camera_recording_when_printing = true; camera_recording_hold_count--;
if (j["camera"]["control"].get<std::string>() == "disable") } else {
this->camera_recording_when_printing = false; if (j["camera"]["control"].get<std::string>() == "enable") this->camera_recording_when_printing = true;
BOOST_LOG_TRIVIAL(info) << "ack of ipcam_record_set " << camera_recording_when_printing; if (j["camera"]["control"].get<std::string>() == "disable") this->camera_recording_when_printing = false;
BOOST_LOG_TRIVIAL(info) << "ack of ipcam_record_set " << camera_recording_when_printing;
}
} else if (j["camera"]["command"].get<std::string>() == "ipcam_resolution_set") { } else if (j["camera"]["command"].get<std::string>() == "ipcam_resolution_set") {
this->camera_resolution = j["camera"]["resolution"].get<std::string>(); if (camera_resolution_hold_count > 0) {
BOOST_LOG_TRIVIAL(info) << "ack of resolution = " << camera_resolution; camera_resolution_hold_count--;
}
else
{
this->camera_resolution = j["camera"]["resolution"].get<std::string>();
BOOST_LOG_TRIVIAL(info) << "ack of resolution = " << camera_resolution;
}
} }
} }
} }
@ -5852,9 +5864,34 @@ void MachineObject::parse_new_info(json print)
} }
upgrade_force_upgrade = get_flag_bits(cfg, 2); upgrade_force_upgrade = get_flag_bits(cfg, 2);
camera_recording_when_printing = get_flag_bits(cfg, 3);
camera_resolution = get_flag_bits(cfg, 4) == 0 ? "720p" : "1080p"; if (camera_recording_hold_count > 0)
camera_timelapse = get_flag_bits(cfg, 5); {
camera_recording_hold_count--;
}
else
{
camera_recording_when_printing = get_flag_bits(cfg, 3);
}
if (camera_resolution_hold_count > 0)
{
camera_resolution_hold_count--;
}
else
{
camera_resolution = get_flag_bits(cfg, 4) == 0 ? "720p" : "1080p";
}
if (camera_timelapse_hold_count > 0)
{
camera_timelapse_hold_count--;
}
else
{
camera_timelapse = get_flag_bits(cfg, 5);
}
tutk_state = get_flag_bits(cfg, 6) == 1 ? "disable" : ""; tutk_state = get_flag_bits(cfg, 6) == 1 ? "disable" : "";
chamber_light = get_flag_bits(cfg, 7) == 1 ? LIGHT_EFFECT::LIGHT_EFFECT_ON : LIGHT_EFFECT::LIGHT_EFFECT_OFF; chamber_light = get_flag_bits(cfg, 7) == 1 ? LIGHT_EFFECT::LIGHT_EFFECT_ON : LIGHT_EFFECT::LIGHT_EFFECT_OFF;
printing_speed_lvl = (PrintingSpeedLevel)get_flag_bits(cfg, 8, 3); printing_speed_lvl = (PrintingSpeedLevel)get_flag_bits(cfg, 8, 3);