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

FIX: [STUDIO-4207] use t_utc from device message 

Change-Id: I380d10fb14621c3dd6cec5001e298e915f221189
Jira: STUDIO-4207
This commit is contained in:
chunmao.guo 2023-09-15 16:06:15 +08:00 committed by Lane.Wei
parent a61efc4da8
commit aa1cbe0388
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2685,6 +2685,10 @@ int MachineObject::parse_json(std::string payload)
j = j_pre;
}
uint64_t t_utc = j.value("t_utc", 0);
if (t_utc > 0)
last_update_time = std::chrono::system_clock::time_point(t_utc * 1ms);
BOOST_LOG_TRIVIAL(trace) << "parse_json: dev_id=" << dev_id << ", playload=" << j.dump(4);
// Parse version info first, as if version arrive or change, 'print' need parse again with new compatible settings
@ -2944,7 +2948,7 @@ int MachineObject::parse_json(std::string payload)
if (jj["command"].get<std::string>() == "push_status") {
m_push_count++;
last_push_time = std::chrono::system_clock::now();
last_push_time = last_update_time;
#pragma region printing
// U0 firmware
if (jj.contains("print_type")) {

11
src/slic3r/GUI/StatusPanel.cpp
View File

@ -1857,6 +1857,17 @@ void StatusPanel::update(MachineObject *obj)
update_subtask(obj);
m_project_task_panel->Thaw();
#if !BBL_RELEASE_TO_PUBLIC
auto delay1 = std::chrono::duration_cast<std::chrono::milliseconds>(obj->last_update_time - std::chrono::system_clock::now()).count();
auto delay2 = std::chrono::duration_cast<std::chrono::milliseconds>(obj->last_push_time - std::chrono::system_clock::now()).count();
auto delay = wxString::Format(" %ld/%ld", delay1, delay2);
m_staticText_timelapse
->SetLabel((obj->is_lan_mode_printer() ? "Local Mqtt" : obj->is_tunnel_mqtt ? "Tunnel Mqtt" : "Cloud Mqtt") + delay);
m_bmToggleBtn_timelapse
->Enable(!obj->is_lan_mode_printer());
m_bmToggleBtn_timelapse
->SetValue(obj->is_tunnel_mqtt);
#endif
m_machine_ctrl_panel->Freeze();