diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index fe6174219..3f4090a68 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -2598,7 +2598,7 @@ void MachineObject::reset_update_time() { BOOST_LOG_TRIVIAL(trace) << "reset reset_update_time, dev_id =" << dev_id; last_update_time = std::chrono::system_clock::now(); - subscribe_counter = 3; + subscribe_counter = SUBSCRIBE_RETRY_COUNT; } void MachineObject::reset() @@ -2622,7 +2622,7 @@ void MachineObject::reset() nozzle_diameter = 0.0f; network_wired = false; dev_connection_name = ""; - subscribe_counter = 3; + subscribe_counter = SUBSCRIBE_RETRY_COUNT; job_id_ = ""; m_plate_index = -1; diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index fa89c828b..58d7c525f 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -40,6 +40,7 @@ #define VIRTUAL_TRAY_ID 254 #define START_SEQ_ID 20000 #define END_SEQ_ID 30000 +#define SUBSCRIBE_RETRY_COUNT 5 inline int correct_filament_temperature(int filament_temp) { diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 79bc08aff..205ee1d3a 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -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; } }); - start_subscribe_timer->Start(4000, wxTIMER_ONE_SHOT); + start_subscribe_timer->Start(5000, wxTIMER_ONE_SHOT); } std::string GUI_App::get_local_models_path() diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp index 4e1670f46..e2a6f3e0d 100644 --- a/src/slic3r/GUI/Monitor.cpp +++ b/src/slic3r/GUI/Monitor.cpp @@ -481,8 +481,6 @@ bool MonitorPanel::Show(bool show) if (obj && !obj->dev_id.empty()) { select_machine(obj->dev_id); - } else { - select_machine(""); } return wxPanel::Show(show);