From 491ec355d4ffe1601c638733ad628c1d40841cb2 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sat, 10 Aug 2024 22:19:24 +0800
Subject: [PATCH] update

---
 app_protocols/transmit_disfection_protocol             |  2 +-
 src/app/transmit_disinfection/transmitdisinfection.cpp |  6 +++---
 src/app/transmit_disinfection/utils/tabbuilder.cpp     | 18 +++++++++++++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol
index 6bfe740..3cb7df4 160000
--- a/app_protocols/transmit_disfection_protocol
+++ b/app_protocols/transmit_disfection_protocol
@@ -1 +1 @@
-Subproject commit 6bfe740cbf0caae387badd4e7702337d4583f46b
+Subproject commit 3cb7df42d6b6d1a3528def1efb837f4b3af3b60f
diff --git a/src/app/transmit_disinfection/transmitdisinfection.cpp b/src/app/transmit_disinfection/transmitdisinfection.cpp
index 02869be..4a892a9 100644
--- a/src/app/transmit_disinfection/transmitdisinfection.cpp
+++ b/src/app/transmit_disinfection/transmitdisinfection.cpp
@@ -54,7 +54,7 @@ TransmitDisinfection::TransmitDisinfection(QWidget *parent) : QTabWidget(parent)
     } else if (type == kreport) {
       BSHOW("[REPORT   ] [%d->%d],%s %s(%d)", from, to, zhex2str(hex, sizeof(*frame)).c_str(),  //
             zhex2str(frame->params, paramLen).c_str(), paramLen);                               //
-    }
+    } 
     processReportPacket(type, from, to, hex, hexlen);
   });
 }
@@ -88,8 +88,8 @@ void TransmitDisinfection::processReportPacket(packet_type_t type, uint8_t from,
   else if (frame->function_id == kreport_h2o2_sensor_data) {
     report_h2o2_data_t *ack = (report_h2o2_data_t *)frame->params;
     QString             info;
-    info.append(fmt("[H2O2     ][FROM:%03d] err:%d h2o2:%d (x10ppm),hum:%d (x10),temp:%d (x10),sat:%d (x10)",  //
-                    from, ack->sensor_error, ack->h2o2, ack->humid, ack->temp, ack->saturation));
+    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));
     RSHOW(info.toStdString().c_str());
   }
   //
diff --git a/src/app/transmit_disinfection/utils/tabbuilder.cpp b/src/app/transmit_disinfection/utils/tabbuilder.cpp
index 995ac72..a8dd5e8 100644
--- a/src/app/transmit_disinfection/utils/tabbuilder.cpp
+++ b/src/app/transmit_disinfection/utils/tabbuilder.cpp
@@ -39,7 +39,6 @@ static void readSysInfo(int deviceId) {
   ISHOW("=");
 }
 
-
 ZQVTabPage *TabBuilder::getTab(const char *tabname) {
   if (tabMap.find(tabname) == tabMap.end()) {
     ZQVTabPage *tab = new ZQVTabPage(fathertab, tabname);
@@ -115,6 +114,15 @@ void TabBuilder::buildHearterTab(const char *tabname, int boardid) {
     int val = CAN_MASTER->heaterReadTemperature(boardid);
     ISHOW("val:%d", val);
   });
+  box->newSubButton("读取电流ADC", [this, boardid](int argn, const char **args) {
+    int val = CAN_MASTER->heaterReadEIAdcRaw(boardid);
+    ISHOW("val:%d", val);
+  });
+
+  box->newSubButton("读取温度Adc", [this, boardid](int argn, const char **args) {
+    int val = CAN_MASTER->heaterReadTemperatureAdcRaw(boardid);
+    ISHOW("val:%d", val);
+  });
 }
 void TabBuilder::buildH2O2SensorTab(const char *tabname, int boardid) {
   ZQVTabPage        *tab = getTab(tabname);
@@ -183,6 +191,10 @@ void TabBuilder::buildBlowerTab(const char *tabname, int boardid) {
     int val = CAN_MASTER->blowerReadEI(boardid);
     ISHOW("val:%d", val);
   });
+  box->newSubButton("风机读取电流ADC", [this, boardid](int argn, const char **args) {
+    int val = CAN_MASTER->blowerReadEIAdcRaw(boardid);
+    ISHOW("val:%d", val);
+  });
   box->newSubButton("风机是否错误", [this, boardid](int argn, const char **args) {
     bool val = CAN_MASTER->blowerReadElectricIsError(boardid);
     ISHOW("val:%d", val);
@@ -203,6 +215,10 @@ void TabBuilder::buildAirCompressorTab(const char *tabname, int boardid) {
     int val = CAN_MASTER->airCompressorReadEI(boardid);
     ISHOW("val:%d", val);
   });
+  box->newFunc("空压机读取电流ADC", {}, [this, boardid](int argn, const char **args) {
+    int val = CAN_MASTER->airCompressorReadEIAdcRaw(boardid);
+    ISHOW("val:%d", val);
+  });
 }
 
 void TabBuilder::buildAirTightnessTestACTab(const char *tabname, int boardid) {