From 24fc98407f856804b027801072047367385ce2f1 Mon Sep 17 00:00:00 2001
From: zw <3466561528@qq.com>
Date: Wed, 3 Sep 2025 08:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=BD=AE=E8=BF=90=E8=A1=8C=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8A=A5=E6=96=87=E4=B8=8E=E8=A3=85=E7=BD=AE=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E6=8A=A5=E6=96=87?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LFtid1056/main_thread.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/LFtid1056/main_thread.cpp b/LFtid1056/main_thread.cpp
index 193e58e..8466563 100644
--- a/LFtid1056/main_thread.cpp
+++ b/LFtid1056/main_thread.cpp
@@ -154,23 +154,27 @@ void* client_manager_thread(void* arg) {
     printf("Started client connections\n");
 
     // 创建测点数据
-    std::vector<PointInfo> points1 = {
+    /*std::vector<PointInfo> points1 = {
         {"P001", "Main Voltage", "D001",1 ,1, 1, 1, 1,"0.38k",0},
         {"P002", "Backup Voltage", "D001",2 ,1, 1, 1, 1,"0.38k",0}
     };
     //00B78DA800D6 00-B7-8D-01-79-06
     // 创建装置列表
-    std::vector<DeviceInfo> devices = {
+    /*std::vector<DeviceInfo> devices = {
         {
             "D001", "Primary Device", "Model-X", "00-B7-8D-01-79-06",
             1, points1
         }
-    };
+    };*/
 
     // 生成100个测试装置
-    std::vector<DeviceInfo> test_devices = generate_test_devices(100);
+    //std::vector<DeviceInfo> test_devices = generate_test_devices(100);
 
-    //std::vector<DeviceInfo> devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk添加
+    //lnk从台账读取设备
+    std::vector<DeviceInfo> devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk添加
+
+    //台账打印
+    PrintDevices(devices);
 
     // 启动客户端连接
     start_client_connect(devices);