diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp index 5513651..9cdaeda 100644 --- a/src/service/device_io_control_service.cpp +++ b/src/service/device_io_control_service.cpp @@ -48,6 +48,7 @@ void DeviceIoControlService::initialize() { m_zcanReceiverHost = m_zcanHost->getZCanReceiverHost(); m_zcanReceiverHost->registerReportMsgListener([this](uint8_t* packet, size_t len) { processReportPacket(packet, len); }); m_workQueue.reset(new WorkQueue("DeviceIoControlServiceWorkQueue")); + m_workQueue->startWork(); startScan(); } @@ -90,7 +91,7 @@ void DeviceIoControlService::startScan() { thisThread.sleepForMs(100); { // - _pa = m_pressure_sensor_data[1].value / 1.0 /*pa*/; + float _pa = m_pressure_sensor_data[1].value / 1.0 /*pa*/; float pa = _pa - 100; // 100当容器中没有液体时的压强 if (pa < 0) pa = 0; @@ -179,6 +180,8 @@ void DeviceIoControlService::processReportPacket(uint8_t* packet, size_t len) { if (cmdpacket->cmdid == kreport_h2o2_sensor_data) { report_h2o2_data_t* h2o2data = (report_h2o2_data_t*)cmdpacket->data; report_h2o2_data_t h2o2datacache = *h2o2data; + // logger->info("[h2o2 sensor] id:{} h2o2:{} temp:{} humid:{} saturation:{}", // + // h2o2data->sensorid, h2o2data->h2o2, h2o2data->temp, h2o2data->humid, h2o2data->saturation); m_workQueue->enQueue([this, h2o2datacache]() { // report_h2o2_data_t h2o2datac_cpy = h2o2datacache; diff --git a/transmit_disinfection_protocol_v1 b/transmit_disinfection_protocol_v1 index 67fd26a..6eb4a87 160000 --- a/transmit_disinfection_protocol_v1 +++ b/transmit_disinfection_protocol_v1 @@ -1 +1 @@ -Subproject commit 67fd26a1a81f0afe4e653f2c40151571f846028e +Subproject commit 6eb4a87eb4bdb1226db1d0e92f277b1c20d49b05 diff --git a/transmit_disinfection_public_code b/transmit_disinfection_public_code index ee1f8ff..d2bec18 160000 --- a/transmit_disinfection_public_code +++ b/transmit_disinfection_public_code @@ -1 +1 @@ -Subproject commit ee1f8ffe4776735553871c6fe2ac8b65377c9fbc +Subproject commit d2bec18ae6ccd19b187062a9e0335cfe9e833c8b