update protocol

app_protocols/transmit_disfection_protocol

@@ -1 +1 @@
-Subproject commit 9836b9c4356e8cf635be9ab8394d75c8fb301dfe
+Subproject commit aee8641e56d8b337ba7f151e7fc8b216fdc94862

app_protocols/zscanprotocol

@@ -1 +1 @@
-Subproject commit 94c49f650f508e64b9e30e733dbb161c72ae2559
+Subproject commit d11d41c1062568f629d5ec2bc6435319b7ea83e3

src/app/transmit_disinfection/channel/transmit_disinfection_can_master.cpp

@@ -85,7 +85,7 @@ int TransmitDisinfectionCanMaster::airCompressorReadEIAdcRaw(int boardid) {  //
 }
 
 int TransmitDisinfectionCanMaster::airTightnessTestACCtrl(int boardid, int32_t val) {
-  auto rec = m_com->callcmd1(boardid, kfn_air_tightness_test_ac_ctrl, val);
+  auto rec = m_com->callcmd1(boardid, kfn_air_leak_detect_ac_ctrl, val);
   return rec->getContent(0);
 }
 

src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp

@@ -91,7 +91,7 @@ class TransmitDisinfectionCanMaster {
   int  airCompressorIsOpen(int boardid) { return m_com->callcmd0(boardid, kfn_air_compressor_is_open, DEFUALT_OVERTIME)->getContent(0); }
 
   int airTightnessTestACCtrl(int boardid, int32_t val);
-  int airTightnessTestACIsOpen(int boardid) { return m_com->callcmd0(boardid, kfn_air_tightness_test_ac_is_open, DEFUALT_OVERTIME)->getContent(0); }
+  int airTightnessTestACIsOpen(int boardid) { return m_com->callcmd0(boardid, kfn_air_leak_detect_ac_is_open, DEFUALT_OVERTIME)->getContent(0); }
 
   /***********************************************************************************************************************
    *                                                       heater                                                        *
@@ -126,9 +126,9 @@ class TransmitDisinfectionCanMaster {
   int  proportionalIsBusy(int boardid) { return m_com->callcmd0(boardid, kfn_proportional_is_busy, DEFUALT_OVERTIME)->getContent(0); }
 
   // kfn_air_tightness_test_is_cutoff
-  void airTightnessTestCloseOffCh(int boardid) { m_com->callcmd0(boardid, kfn_air_tightness_test_cutoff_ch, DEFUALT_OVERTIME); }
-  void airTightnessTestOpenCh(int boardid) { m_com->callcmd0(boardid, kfn_air_tightness_test_release_ch, DEFUALT_OVERTIME); }
-  int  airTightnessTestIsCutoff(int boardid) { return m_com->callcmd0(boardid, kfn_air_tightness_test_is_cutoff, DEFUALT_OVERTIME)->getContent(0); }
+  void airTightnessTestCloseOffCh(int boardid) { m_com->callcmd1(boardid, kfn_air_leak_detect_test_set_mode,1, DEFUALT_OVERTIME); }
+  void airTightnessTestOpenCh(int boardid) { m_com->callcmd1(boardid, kfn_air_leak_detect_test_set_mode, 0,DEFUALT_OVERTIME); }
+  int  airTightnessTestIsCutoff(int boardid) { return m_com->callcmd0(boardid, kfn_air_tightness_test_get_mode, DEFUALT_OVERTIME)->getContent(0); }
 
   void extChSelectorSetCh(int boardid, int ch) { m_com->callcmd1(boardid, kfn_ext_ch_selector_set_ch, ch, DEFUALT_OVERTIME); }
   int  extChSelectorGetCh(int boardid) { return m_com->callcmd0(boardid, kfn_ext_ch_selector_get_ch, DEFUALT_OVERTIME)->getContent(0); }

src/app/transmit_disinfection/transmitdisinfection.cpp

@@ -89,7 +89,7 @@ void TransmitDisinfection::processReportPacket(packet_type_t type, uint8_t from,
     report_h2o2_data_t *ack = (report_h2o2_data_t *)frame->params;
     QString             info;
     info.append(fmt("[H2O2     ][FROM:%03d] err:%d h2o2:%d ppm (adc:%d) (x10ppm),hum:%d (x10),temp:%d (x10),sat:%d (x10)",  //
-                    from, ack->sensor_error, ack->h2o2,ack->h2o2adc, ack->humid, ack->temp, ack->saturation));
+                    from, ack->sensor_error, ack->h2o2,ack->h2o2adc, ack->rh, ack->temp, ack->rs));
     RSHOW(info.toStdString().c_str());
   }
   //

src/app/transmit_disinfection/utils/errorcode_initializer.cpp

@@ -9,12 +9,22 @@ using namespace app_transmit_disinfection;
 using namespace std;
 
 void ErrorCodeInitializer::regErrorcodeInfo() {
+
+
   EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_reset_error, "kerr_motor_reset_error");
   EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_subdevice_offline, "kerr_motor_subdevice_offline");
   EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_driver_error, "kerr_motor_driver_error");
   EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_undervoltage_error, "kerr_motor_undervoltage_error");
   EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_unkown_error, "kerr_motor_unkown_error");
 
+  EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_overtemperature_flag, "kerr_motor_overtemperature_flag");
+  EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_overtemperature_pre_warning_flag, "kerr_motor_overtemperature_pre_warning_flag");
+  EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_short_to_ground_indicator_phase_A, "kerr_motor_short_to_ground_indicator_phase_A");
+  EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_short_to_ground_indicator_phase_B, "kerr_motor_short_to_ground_indicator_phase_B");
+  EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_open_load_indicator_phase_A, "kerr_motor_open_load_indicator_phase_A");
+  EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_open_load_indicator_phase_B, "kerr_motor_open_load_indicator_phase_B");
+  EcodeInfoMgr::ins().regEcodeInfo(kerr_motor_standstill_indicator, "kerr_motor_standstill_indicator");
+
   EcodeInfoMgr::ins().regEcodeInfo(kerr_AirBlowerError, "kerr_AirBlowerError");
   EcodeInfoMgr::ins().regEcodeInfo(kerr_HeaterError, "kerr_HeaterError");
   EcodeInfoMgr::ins().regEcodeInfo(kerr_BlowerError, "kerr_BlowerError");