From 3527950e14dd888aa170fa69543be59d589a5c5b Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Mon, 18 Dec 2023 15:39:17 +0800 Subject: [PATCH] FIX: use t_utc for debug only Change-Id: Ia05d8969d4de3dd38908980d6e17a3ebb11ca279 Github 3045 Change-Id: I77935df53bbf2772b1146e5c330c537165a3a2e6 --- src/slic3r/GUI/DeviceManager.cpp | 2 +- src/slic3r/GUI/DeviceManager.hpp | 1 + src/slic3r/GUI/StatusPanel.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index b861c4960..b4053ae78 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -2766,7 +2766,7 @@ int MachineObject::parse_json(std::string payload) uint64_t t_utc = j.value("t_utc", 0ULL); if (t_utc > 0) - last_update_time = std::chrono::system_clock::time_point(t_utc * 1ms); + last_utc_time = std::chrono::system_clock::time_point(t_utc * 1ms); BOOST_LOG_TRIVIAL(trace) << "parse_json: dev_id=" << dev_id << ", playload=" << j.dump(4); diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 50387b003..51687eaf3 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -463,6 +463,7 @@ public: int parse_msg_count = 0; int keep_alive_count = 0; std::chrono::system_clock::time_point last_update_time; /* last received print data from machine */ + std::chrono::system_clock::time_point last_utc_time; /* last received print data from machine */ std::chrono::system_clock::time_point last_keep_alive; /* last received print data from machine */ std::chrono::system_clock::time_point last_push_time; /* last received print push from machine */ std::chrono::system_clock::time_point last_request_push; /* last received print push from machine */ diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 33cd58cd4..d2d7358dd 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1944,7 +1944,7 @@ void StatusPanel::update(MachineObject *obj) m_project_task_panel->Thaw(); #if !BBL_RELEASE_TO_PUBLIC - auto delay1 = std::chrono::duration_cast(obj->last_update_time - std::chrono::system_clock::now()).count(); + auto delay1 = std::chrono::duration_cast(obj->last_utc_time - std::chrono::system_clock::now()).count(); auto delay2 = std::chrono::duration_cast(obj->last_push_time - std::chrono::system_clock::now()).count(); auto delay = wxString::Format(" %ld/%ld", delay1, delay2); m_staticText_timelapse