diff --git a/LFtid1056/main_thread.cpp b/LFtid1056/main_thread.cpp index 2ca393c..193e58e 100644 --- a/LFtid1056/main_thread.cpp +++ b/LFtid1056/main_thread.cpp @@ -154,35 +154,23 @@ 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} }; - - std::vector points2 = { - {"P101", "Generator Output", "D002",1 ,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 - }, - { - "D002", "Backup Device", "Model-Y", "00-B7-8D-A8-00-D6", - 1, points2 } - };*/ + }; // 生成100个测试装置 - //std::vector test_devices = generate_test_devices(100); + std::vector test_devices = generate_test_devices(100); - //lnk从台账读取设备 - std::vector devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk添加 - - //台账打印 - PrintDevices(devices); + //std::vector devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk添加 // 启动客户端连接 start_client_connect(devices); @@ -395,18 +383,33 @@ int main(int argc ,char** argv) {// } } + // 创建测点数据 + std::vector points2 = { + {"P101", "Generator Output", "D002",1 ,1, 1, 1, 1,"0.38k",0} + }; + //00B78DA800D6 00-B7-8D-01-79-06 + // 创建装置列表 + std::vector 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 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"); }*/