QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-01-30 16:38:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'QIDITECH:main' into CI

Browse Source
This commit is contained in:
Rudokhvist
2025-12-22 13:29:21 +02:00
committed by GitHub
parent 07f3f57ff9 97dcb7faee
commit 984eab839f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,6 +505,8 @@ void MachineObject::reload_printer_settings()
MachineObject::MachineObject(std::string name)
:dev_name(name)
{
m_dev_info = DevInfo::Create(this);
m_dev_info->SetDevId("");
}
// y40
@@ -518,6 +520,8 @@ MachineObject::MachineObject(std::string name, std::string url, std::string ip,
slice_info(nullptr),
m_is_online(false)
{
m_dev_info = DevInfo::Create(this);
m_dev_info->SetDevId("");
}
MachineObject::MachineObject(DeviceManager* manager, NetworkAgent* agent, std::string name, std::string id, std::string ip)
@@ -779,7 +783,9 @@ std::string MachineObject::get_lifecycle_type_str()
bool MachineObject::is_in_upgrading() const
{
return m_upgrade->IsUpgrading();
//y75
//return m_upgrade->IsUpgrading();
return false;
}
std::string MachineObject::get_ota_version()

8
src/slic3r/GUI/DeviceManager.hpp
View File

@@ -100,10 +100,10 @@ private:
std::shared_ptr<int> m_token = std::make_shared<int>(1);
/* properties */
std::string dev_name;
std::string dev_ip;
std::string access_code;
std::string user_access_code;
std::string dev_name = "";
std::string dev_ip = "";
std::string access_code = "";
std::string user_access_code = "";
std::shared_ptr<DevInfo> m_dev_info;
// type, time stamp, delay