装置运行信息报文与装置版本配置信息报文读取
This commit is contained in:
@@ -154,27 +154,27 @@ void* client_manager_thread(void* arg) {
|
||||
printf("Started client connections\n");
|
||||
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
/*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
|
||||
// <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD>б<EFBFBD>
|
||||
/*std::vector<DeviceInfo> devices = {
|
||||
std::vector<DeviceInfo> devices = {
|
||||
{
|
||||
"D001", "Primary Device", "Model-X", "00-B7-8D-01-79-06",
|
||||
1, points1
|
||||
1, points1,true
|
||||
}
|
||||
};*/
|
||||
};
|
||||
|
||||
// <20><><EFBFBD><EFBFBD>100<30><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ<EFBFBD><D7B0>
|
||||
//std::vector<DeviceInfo> test_devices = generate_test_devices(100);
|
||||
|
||||
//lnk<6E><6B>̨<EFBFBD>˶<EFBFBD>ȡ<EFBFBD>豸
|
||||
std::vector<DeviceInfo> devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk<6E><6B><EFBFBD><EFBFBD>
|
||||
//std::vector<DeviceInfo> devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk<6E><6B><EFBFBD><EFBFBD>
|
||||
|
||||
//̨<>˴<EFBFBD>ӡ
|
||||
PrintDevices(devices);
|
||||
//PrintDevices(devices);
|
||||
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD>ͻ<EFBFBD><CDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
start_client_connect(devices);
|
||||
@@ -319,10 +319,10 @@ int main(int argc ,char** argv) {//
|
||||
cleanup_args(args);
|
||||
}
|
||||
|
||||
while(!INITFLAG){
|
||||
/*while(!INITFLAG){
|
||||
std::this_thread::sleep_for(std::chrono::seconds(3));
|
||||
std::cout << "waiting cloudfront initialize ..." << std::endl;
|
||||
}
|
||||
}*/
|
||||
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD>߳<EFBFBD><DFB3><EFBFBD>
|
||||
for (int i = 1; i < THREAD_CONNECTIONS; i++) {
|
||||
@@ -396,7 +396,7 @@ int main(int argc ,char** argv) {//
|
||||
std::vector<DeviceInfo> devices = {
|
||||
{
|
||||
"D002", "Backup Device", "Model-Y", "00-B7-8D-A8-00-D6",
|
||||
1, points2
|
||||
1, points2,true
|
||||
}
|
||||
};
|
||||
|
||||
@@ -405,10 +405,10 @@ int main(int argc ,char** argv) {//
|
||||
//static int count = 3;
|
||||
if (++queue_monitor >= 20) { // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD>豸
|
||||
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);
|
||||
//ClientManager::instance().add_device(device);
|
||||
}
|
||||
|
||||
/*std::vector<DeviceInfo> test_devices = generate_test_devices(count);
|
||||
|
||||
Reference in New Issue
Block a user