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

ENH: add more retry to subscribe 

Change-Id: If68249408446aace4a83e4b5beeb0643dce8cb87
This commit is contained in:
Stone Li 2025-01-07 11:58:18 +08:00 committed by Lane.Wei
parent 4cda967b0c
commit 8b0f16d3de
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2598,7 +2598,7 @@ void MachineObject::reset_update_time()
{ {
BOOST_LOG_TRIVIAL(trace) << "reset reset_update_time, dev_id =" << dev_id; BOOST_LOG_TRIVIAL(trace) << "reset reset_update_time, dev_id =" << dev_id;
last_update_time = std::chrono::system_clock::now(); last_update_time = std::chrono::system_clock::now();
subscribe_counter = 3; subscribe_counter = SUBSCRIBE_RETRY_COUNT;
} }
void MachineObject::reset() void MachineObject::reset()
@ -2622,7 +2622,7 @@ void MachineObject::reset()
nozzle_diameter = 0.0f; nozzle_diameter = 0.0f;
network_wired = false; network_wired = false;
dev_connection_name = ""; dev_connection_name = "";
subscribe_counter = 3; subscribe_counter = SUBSCRIBE_RETRY_COUNT;
job_id_ = ""; job_id_ = "";
m_plate_index = -1; m_plate_index = -1;

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

@ -40,6 +40,7 @@
#define VIRTUAL_TRAY_ID 254 #define VIRTUAL_TRAY_ID 254
#define START_SEQ_ID 20000 #define START_SEQ_ID 20000
#define END_SEQ_ID 30000 #define END_SEQ_ID 30000
#define SUBSCRIBE_RETRY_COUNT 5
inline int correct_filament_temperature(int filament_temp) inline int correct_filament_temperature(int filament_temp)
{ {

2
src/slic3r/GUI/GUI_App.cpp
View File

@ -2450,7 +2450,7 @@ void GUI_App::on_start_subscribe_again(std::string dev_id)
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": dev_id=" << obj->dev_id; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": dev_id=" << obj->dev_id;
} }
}); });
start_subscribe_timer->Start(4000, wxTIMER_ONE_SHOT); start_subscribe_timer->Start(5000, wxTIMER_ONE_SHOT);
} }
std::string GUI_App::get_local_models_path() std::string GUI_App::get_local_models_path()

2
src/slic3r/GUI/Monitor.cpp
View File

@ -481,8 +481,6 @@ bool MonitorPanel::Show(bool show)
if (obj && !obj->dev_id.empty()) { if (obj && !obj->dev_id.empty()) {
select_machine(obj->dev_id); select_machine(obj->dev_id);
} else {
select_machine("");
} }
return wxPanel::Show(show); return wxPanel::Show(show);