From f310cb49a39109e04cdc2cfcc78e4e0d8bb0aca5 Mon Sep 17 00:00:00 2001
From: zw <3466561528@qq.com>
Date: Fri, 8 Aug 2025 16:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LFtid1056/main_thread.cpp | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/LFtid1056/main_thread.cpp b/LFtid1056/main_thread.cpp
index f3c17c1..e1f20fc 100644
--- a/LFtid1056/main_thread.cpp
+++ b/LFtid1056/main_thread.cpp
@@ -127,20 +127,12 @@ void* client_manager_thread(void* arg) {
         {"P001", "Main Voltage", "D001",1 ,1, 1, 1, 1,"0.38k",0},
         {"P002", "Backup Voltage", "D001",2 ,1, 1, 1, 1,"0.38k",0}
     };
-
-    std::vector<PointInfo> points2 = {
-        {"P101", "Generator Output", "D002",1 ,1, 1, 1, 1,"0.38k",0}
-    };
     //00B78DA800D6 00-B7-8D-01-79-06
     // 创建装置列表
     std::vector<DeviceInfo> devices = {
         {
             "D001", "Primary Device", "Model-X", "00-B7-8D-01-79-06",
             1, points1
-        },
-        {
-            "D002", "Backup Device", "Model-Y", "00-B7-8D-A8-00-D6",
-            1, points2
         }
     };
 
@@ -338,18 +330,33 @@ int main(int argc ,char** argv) {//
             }
         }
 
+        // 创建测点数据
+        std::vector<PointInfo> points2 = {
+            {"P101", "Generator Output", "D002",1 ,1, 1, 1, 1,"0.38k",0}
+        };
+        //00B78DA800D6 00-B7-8D-01-79-06
+        // 创建装置列表
+        std::vector<DeviceInfo> devices = {
+            {
+                "D002", "Backup Device", "Model-Y", "00-B7-8D-A8-00-D6",
+                1, points2
+            }
+        };
+
         // 监控socket队列状态
         static int queue_monitor = 0; 
         //static int count = 3;
-        if (++queue_monitor >= 10) {  // 每10秒报告一次
+        if (++queue_monitor >= 20) {  // 尝试添加一个设备
             printf("Message queue size: %zu\n", message_queue.size());
-            queue_monitor = 0;
+            //queue_monitor = 0;
+
+            for (const auto& device : devices) {
+                ClientManager::instance().add_device(device);
+            }
 
             /*std::vector<DeviceInfo> test_devices = generate_test_devices(count);
             count++;
-            for (const auto& device : test_devices) {
-                ClientManager::instance().add_device(device);
-            }
+            
             for (const auto& device : test_devices) {
                 ClientManager::instance().remove_device("D001");
             }*/