3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX:fixed the issue of IP changes

Browse source 
jira:[fix]

Change-Id: Iff87825ae92effa5a4e473d7282c172c6871c0cf
(cherry picked from commit 6ba6637b34233c3bcc97e218ca8b426d66f989b0)
This commit is contained in:
tao wang 2023-09-13 11:14:50 +08:00 • committed by Lane.Wei
parent ecf1ff52b5
commit b31b7c7727
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/GUI/DeviceManager.cpp
View file

@ -2568,6 +2568,7 @@ void MachineObject::reset()
extruder_axis_status = LOAD; extruder_axis_status = LOAD;
nozzle_diameter = 0.0f; nozzle_diameter = 0.0f;
network_wired = false; network_wired = false;
dev_connection_name = "";
// reset print_json // reset print_json
json empty_j; json empty_j;
@ -4776,13 +4777,24 @@ void DeviceManager::on_machine_alive(std::string json_str)
// update properties // update properties
/* ip changed */ /* ip changed */
obj = it->second; obj = it->second;
if (obj->dev_ip.compare(dev_ip) != 0 && !obj->dev_ip.empty()
&& obj->dev_connection_name.compare(connection_name) != 0 if (obj->dev_ip.compare(dev_ip) != 0) {
) { if ( connection_name.empty() ) {
BOOST_LOG_TRIVIAL(info) << "MachineObject IP changed from " << obj->dev_ip << " to " << dev_ip; BOOST_LOG_TRIVIAL(info) << "MachineObject IP changed from " << obj->dev_ip << " to " << dev_ip;
obj->dev_ip = dev_ip; obj->dev_ip = dev_ip;
}
else {
if ( obj->dev_connection_name.empty() || obj->dev_connection_name.compare(connection_name) == 0) {
BOOST_LOG_TRIVIAL(info) << "MachineObject IP changed from " << obj->dev_ip << " to " << dev_ip << " connection_name is " << connection_name;
if(obj->dev_connection_name.empty()){obj->dev_connection_name = connection_name;}
obj->dev_ip = dev_ip;
}
}
/* ip changed reconnect mqtt */ /* ip changed reconnect mqtt */
} }
obj->wifi_signal = printer_signal; obj->wifi_signal = printer_signal;
obj->dev_connection_type= connect_type; obj->dev_connection_type= connect_type;
obj->bind_state = bind_state; obj->bind_state = bind_state;