From 3a7703fc67887606e9f6b78e1132bc3ff3d3a092 Mon Sep 17 00:00:00 2001
From: Stone Li <stone.li@bambulab.com>
Date: Tue, 7 Jan 2025 11:58:18 +0800
Subject: [PATCH] ENH: add more retry to subscribe

Change-Id: If68249408446aace4a83e4b5beeb0643dce8cb87
(cherry picked from commit 8b0f16d3de8ef6816bf5eb068e007d202f9710c9)
---
 src/slic3r/GUI/DeviceManager.cpp | 2 +-
 src/slic3r/GUI/DeviceManager.hpp | 1 +
 src/slic3r/GUI/GUI_App.cpp       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index cffcfc746c..d43b176e2b 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -2981,7 +2981,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()
diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp
index 18b95b4094..af422d536b 100644
--- a/src/slic3r/GUI/DeviceManager.hpp
+++ b/src/slic3r/GUI/DeviceManager.hpp
@@ -58,6 +58,7 @@
 
 #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 99349d3af9..675bf2f0e3 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -2187,7 +2187,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()