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 points1 = { + /*std::vector 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 devices = { + /*std::vector devices = { { "D001", "Primary Device", "Model-X", "00-B7-8D-01-79-06", 1, points1 } - }; + };*/ // 生成100个测试装置 - std::vector test_devices = generate_test_devices(100); + //std::vector test_devices = generate_test_devices(100); - //std::vector devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk添加 + //lnk从台账读取设备 + std::vector devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk添加 + + //台账打印 + PrintDevices(devices); // 启动客户端连接 start_client_connect(devices);