From 57e5f5c4c4fd9d7104d46054d9bd3f38c68419e1 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Fri, 3 Jan 2025 12:14:28 +0800 Subject: [PATCH] FIX: wrong update info about AMS1 jira: [STUDIO-9089] Change-Id: I7ce5b1069abddd8aaa187ade03d0271b0b16dc9e (cherry picked from commit 032b34eded21f452535086f672dd408200461d5a) --- src/slic3r/GUI/DeviceManager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 950071fbc2..4164e481cc 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -3071,6 +3071,8 @@ int MachineObject::parse_json(std::string payload, bool key_field_only) ver_info.product_name = wxString::FromUTF8((*it)["product_name"].get()); if ((*it).contains("sw_ver")) ver_info.sw_ver = (*it)["sw_ver"].get(); + if ((*it).contains("sw_new_ver")) + ver_info.sw_new_ver = (*it)["sw_new_ver"].get(); if ((*it).contains("sn")) ver_info.sn = (*it)["sn"].get(); if ((*it).contains("hw_ver")) @@ -3796,7 +3798,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only) upgrade_progress = jj["upgrade_state"]["progress"].get(); } if (jj["upgrade_state"].contains("new_version_state")) upgrade_new_version = jj["upgrade_state"]["new_version_state"].get() == 1 ? true : false; - if (jj["upgrade_state"].contains("ams_new_version_number")) + if (!check_enable_np(jj) && jj["upgrade_state"].contains("ams_new_version_number"))/* is not used in new np, by AP*/ ams_new_version_number = jj["upgrade_state"]["ams_new_version_number"].get(); if (jj["upgrade_state"].contains("ota_new_version_number")) ota_new_version_number = jj["upgrade_state"]["ota_new_version_number"].get();