update

app_protocols/transmit_disfection_protocol

@@ -1 +1 @@
-Subproject commit 058ea4cf80c30868271212b80b97a86539339ea1
+Subproject commit 9836b9c4356e8cf635be9ab8394d75c8fb301dfe

src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp

@@ -105,13 +105,21 @@ class TransmitDisinfectionCanMaster {
   int  heaterIsOpen(int boardid) { return m_com->callcmd0(boardid, kfn_heater_is_open, DEFUALT_OVERTIME)->getContent(0); }
 
   void warningLightSetState(int boardid, int r, int g, int b, int warning);
-  void warningLightReadState(int boardid, int *r, int *g, int *b, int *warning);
+  void warningLightReadState(int boardid, int *r, int *g, int *b, int *warning) {
+    auto ret = m_com->callcmd0(boardid, kfn_triple_warning_light_read_state);
+    *r       = ret->getContent(0);
+    *g       = ret->getContent(1);
+    *b       = ret->getContent(2);
+    *warning = ret->getContent(3);
+  }
 
   int evaporationTankWSReadState(int boardid);
   int bottomWSReadState(int boardid);
 
   int32_t          psBusReadData(int boardid, int subid);
   ack_psbus_scan_t psBusScan(int boardid);
+  void             psBusStartReport(int boardid, int period) { m_com->callcmd1(boardid, kfn_psbus_start_report, period, DEFUALT_OVERTIME); }
+  void             psBusStopReport(int boardid) { m_com->callcmd0(boardid, kfn_psbus_stop_report, DEFUALT_OVERTIME); }
 
   void proportionalSetValve(int boardid, int valveId, int valveValue) { m_com->callcmd2(boardid, kfn_proportional_set_valve, valveId, valveValue, DEFUALT_OVERTIME); }
   int  proportionalReadPos(int boardid) { return m_com->callcmd0(boardid, kfn_proportional_read_pos, DEFUALT_OVERTIME)->getContent(0); }

src/app/transmit_disinfection/transmitdisinfection.cpp

@@ -80,7 +80,7 @@ void TransmitDisinfection::processReportPacket(packet_type_t type, uint8_t from,
     QString                 info;
     info.append(fmt("[Pressure][FROM:%03d](%d)", from, ack->sensorDataNum));
     for (int i = 0; i < ack->sensorDataNum; i++) {
-      info.append(fmt(" %d:%d,", ack->data[i].subid, ack->data[i].pressureVal));
+      info.append(fmt(" %2d:%10d,  ", ack->data[i].subid, ack->data[i].pressureVal));
     }
     RSHOW(info.toStdString().c_str());
   }

src/app/transmit_disinfection/utils/tabbuilder.cpp

@@ -282,12 +282,21 @@ void TabBuilder::buildPSBusTab(const char *tabname, int boardid) {
     ISHOW("val:%d", val);
   });
 
-  box->newSubButton("扫描", [this, boardid](int argn, const char **args) {
+  box->newSubButton("读取扫描结果", [this, boardid](int argn, const char **args) {
     auto result = CAN_MASTER->psBusScan(boardid);
-    for (int i = 0; i < result.numOnlineId; i++) {
-      ISHOW("%d", result.onlineId);
+    for (int i = 0; i < 10; i++) {
+      if (result.sensor[i].isOnline) {
+        ISHOW("id %d, subid %d, ptype %s, uint %s, precision %d, zero %d, full %d",  //
+              i, result.sensor[i].subid, PSType2Str(result.sensor[i].ptype), p100uint2Str(result.sensor[i].uint), result.sensor[i].precision, result.sensor[i].zero, result.sensor[i].full);
+      } else {
+        ISHOW("id %d, offline", i);
+      }
     }
   });
+
+  box->newSubButtonEnd();
+  box->newSubButton("开始上报", [this, boardid](int argn, const char **args) { CAN_MASTER->psBusStartReport(boardid, 1000); });
+  box->newSubButton("停止上报", [this, boardid](int argn, const char **args) { CAN_MASTER->psBusStopReport(boardid); });
 }
 
 void TabBuilder::buildProportionalTab(const char *tabname, int boardid) {