fix some bug

app_protocols/transmit_disfection_protocol

@@ -1 +1 @@
-Subproject commit 330c5b6d619b65ba9043e632b5833a9efd58bf59
+Subproject commit aee8641e56d8b337ba7f151e7fc8b216fdc94862

appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp

@@ -279,15 +279,15 @@ void DisinfectionCtrlService::traceState() {
 
   tracecontent += fmt::format("TRACE [{}] ", string(sm.getState()));
   tracecontent += fmt::format("e:{} ", s_error);
-  if (s_h2o2Snapshot->getSensorDataNum() >= 1) tracecontent += fmt::format("s0:[ho2o2 {} rs {} rh {}]", s_h2o2Snapshot->h2o2[0], s_h2o2Snapshot->rs[0], s_h2o2Snapshot->rh[0]);
-  if (s_h2o2Snapshot->getSensorDataNum() >= 2) tracecontent += fmt::format("s1:[ho2o2 {} rs {} rh {}]", s_h2o2Snapshot->h2o2[1], s_h2o2Snapshot->rs[1], s_h2o2Snapshot->rh[1]);
-  if (s_h2o2Snapshot->getSensorDataNum() >= 3) tracecontent += fmt::format("s2:[ho2o2 {} rs {} rh {}]", s_h2o2Snapshot->h2o2[2], s_h2o2Snapshot->rs[2], s_h2o2Snapshot->rh[2]);
+  if (s_h2o2Snapshot->getSensorDataNum() == 1) tracecontent += fmt::format("s0:[ho2o2 {:>3} rs {:>3} rh {:>3}]", s_h2o2Snapshot->h2o2[0], s_h2o2Snapshot->rs[0], s_h2o2Snapshot->rh[0]);
+  if (s_h2o2Snapshot->getSensorDataNum() == 2) tracecontent += fmt::format("s1:[ho2o2 {:>3} {:>3} rs {:>3} {:>3} rh {:>3} {:>3}]", s_h2o2Snapshot->h2o2[0], s_h2o2Snapshot->h2o2[1], s_h2o2Snapshot->rs[0], s_h2o2Snapshot->rs[1], s_h2o2Snapshot->rh[0], s_h2o2Snapshot->rh[1]);
+  if (s_h2o2Snapshot->getSensorDataNum() == 3) tracecontent += fmt::format("s2:[ho2o2 {:>3} {:>3} {:>3} rs {:>3} {:>3} {:>3} rh {:>3} {:>3} {:>3}]", s_h2o2Snapshot->h2o2[0], s_h2o2Snapshot->h2o2[1], s_h2o2Snapshot->h2o2[2], s_h2o2Snapshot->rs[0], s_h2o2Snapshot->rs[1], s_h2o2Snapshot->rs[2], s_h2o2Snapshot->rh[0], s_h2o2Snapshot->rh[1], s_h2o2Snapshot->rh[2]);
 
   tracecontent += fmt::format("dvalue:{} ", s_dvalue);
   tracecontent += fmt::format("log:{}->{} ", s_nlog, m_tlog);
-  tracecontent += fmt::format("takebreak:{} ", s_isDisinfectionTakeBreak);
-  tracecontent += fmt::format("remaintime:{} ", s_remaintime);
-  tracecontent += fmt::format("heartTemperature:{:.2f} ", dics->Heater_readTemperature());
+  tracecontent += fmt::format("break:{} ", s_isDisinfectionTakeBreak);
+  tracecontent += fmt::format("rtime:{} ", s_remaintime);
+  tracecontent += fmt::format("hTemp:{:.2f} ", dics->Heater_readTemperature());
 
   logger->info(tracecontent);
 }

appsrc/service/hardware/base/h2o2_sensor_data_mgr.cpp

@@ -113,7 +113,7 @@ void H2O2SensorDataMgr::updateH2o2SensorData(uint8_t sensorId, float h2o2, float
 void H2O2SensorDataMgr::statisticsSensorData() {
   lock_guard<recursive_mutex> lock(m_lock);
 
-  m_minH2O2       = 0;
+  m_minH2O2       = -1;
   m_maxH2O2       = 0;
   m_maxHumid      = 0;
   m_maxSaturation = 0;
@@ -123,6 +123,8 @@ void H2O2SensorDataMgr::statisticsSensorData() {
       continue;
     }
 
+    if(m_minH2O2 == -1) m_minH2O2 = sensor_data->h2o2;
+
     if (sensor_data->h2o2 < m_minH2O2) {
       m_minH2O2 = sensor_data->h2o2;
     }
@@ -136,4 +138,5 @@ void H2O2SensorDataMgr::statisticsSensorData() {
       m_maxSaturation = sensor_data->rs;
     }
   }
+  logger->info("statisticsSensorData: minH2O2 = {}, maxH2O2 = {}, maxHumid = {}, maxSaturation = {}", m_minH2O2, m_maxH2O2, m_maxHumid, m_maxSaturation);
 }

appsrc/service/hardware/device_io_ctrl_service.cpp

@@ -135,6 +135,7 @@ int DeviceIoControlService::forceStopDeviceWithoutExc() {
 }
 
 int DeviceIoControlService::processReportMsg(uint8_t from, uint8_t *hex, uint32_t hexlen) {  //
+  if (DS->isTestMode()) return 0;
   zcanbus_packet_t *packet = (zcanbus_packet_t *)hex;
   if (packet->function_id == kreport_h2o2_sensor_data) {
     /*******************************************************************************