update

.gitignore

@@ -68,7 +68,7 @@ Thumbs.db
 
 # Binaries
 # --------
-*.dll
+
 
 build
 CMakeLists.txt.user

app_protocols/transmit_disfection_protocol

@@ -1 +1 @@
-Subproject commit 6fb781e6b5fe8f4f44c7046b30cbee47512f5bd9
+Subproject commit 79904e587280cccedc0237f2caf84406b374f045

app_protocols/zscanprotocol

@@ -1 +1 @@
-Subproject commit d11d41c1062568f629d5ec2bc6435319b7ea83e3
+Subproject commit 81529a15c57000f73cc5bd4b7276f567099b9988

src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp

@@ -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->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 airTightnessTestCloseOffCh(int boardid) { m_com->callcmd1(boardid, kfn_air_leak_detect_ac_ctrl,1, DEFUALT_OVERTIME); }
+  void airTightnessTestOpenCh(int boardid) { m_com->callcmd1(boardid, kfn_air_leak_detect_ac_ctrl, 0,DEFUALT_OVERTIME); }
+  int  airTightnessTestIsCutoff(int boardid) { return m_com->callcmd0(boardid, kfn_air_leak_detect_ac_is_open, 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/large_space_disinfection_machine.cpp

@@ -23,6 +23,8 @@ LargeSpaceDisinfectionMachine::LargeSpaceDisinfectionMachine(QWidget *parent) :
   tabBuilder.buildTripleWarningLightTab("液路板", kFixBoardId_LiquidCtrl);
   tabBuilder.buildWaterSensorTab("液路板", kFixBoardId_LiquidCtrl);
   tabBuilder.buildPSBusTab("液路板", kFixBoardId_LiquidCtrl);
+  tabBuilder.buildValveCtrlTab("液路板", kFixBoardId_LiquidCtrl);
+
 
   tabBuilder.buildHearterTab("功率板", kFixBoardId_PowerControl);
   tabBuilder.buildBlowerTab("功率板", kFixBoardId_PowerControl);

src/app/transmit_disinfection/little_space_disinfection_machine.cpp

@@ -23,9 +23,12 @@ LittleSpaceDisinfectionMachine::LittleSpaceDisinfectionMachine(QWidget *parent)
   tabBuilder.buildTripleWarningLightTab("液路板", kFixBoardId_LiquidCtrl);
   tabBuilder.buildWaterSensorTab("液路板", kFixBoardId_LiquidCtrl);
   tabBuilder.buildPSBusTab("液路板", kFixBoardId_LiquidCtrl);
+  tabBuilder.buildValveCtrlTab("液路板", kFixBoardId_LiquidCtrl);
 
   tabBuilder.buildHearterTab("功率板", kFixBoardId_PowerControl);
   tabBuilder.buildBlowerTab("功率板", kFixBoardId_PowerControl);
   tabBuilder.buildAirCompressorTab("功率板", kFixBoardId_PowerControl);
   tabBuilder.buildH2O2SensorTab("功率板", kFixBoardId_PowerControl);
+
+  
 }

src/app/transmit_disinfection/pipe_dm.cpp

@@ -30,4 +30,6 @@ PipeDM::PipeDM(QWidget *parent) : TransmitDisinfection(parent) {
   tabBuilder.buildPSBusTab("液路板", kFixBoardId_LiquidCtrl);
   tabBuilder.buildProportionalTab("液路板", kFixBoardId_LiquidCtrl);
   tabBuilder.buildAirTightnessTestTab("液路板", kFixBoardId_LiquidCtrl);
+  tabBuilder.buildValveCtrlTab("液路板", kFixBoardId_LiquidCtrl);
+
 }

src/app/transmit_disinfection/transmitdisinfection.hpp

@@ -3,10 +3,12 @@
 #include <QTabWidget>
 
 #include "zqui/zqui.hpp"
-#include "zscanprotocol/zscanprotocol.hpp"
+extern "C"{
+#include "zscanprotocol/zscanprotocol.h"
+}
 
 namespace iflytop {
-using namespace zscanprotocol;
+
 class TransmitDisinfection : public QTabWidget {
   Q_OBJECT
 

src/app/transmit_disinfection/utils/tabbuilder.cpp

@@ -343,6 +343,14 @@ void TabBuilder::buildExtChSelectorTab(const char *tabname, int boardid) {
   });
 }
 
+void TabBuilder::buildValveCtrlTab(const char *tabname, int boardid) {
+  ZQVTabPage        *tab = getTab(tabname);
+  ZQFunctionListBox *box = new ZQFunctionListBox(tab, "电磁阀", 4);
+  box->newFunc("加液进气电磁阀(打开，可以正常加液排液，关闭后加液泵倒转可以排空管路)", {"open(1)/cloce(0)"}, [this, boardid](int argn, const char **args) {  //
+    CAN_MASTER->getCanProtocolCom()->callcmd1(boardid, kfn_add_liquid_pump_air_intake_valve, atoi(args[0]), DEFUALT_OVERTIME);
+  });
+}
+
 void TabBuilder::buildEnd() {
   for (auto &it : tabMap) {
     it.second->addSpacer();

src/app/transmit_disinfection/utils/tabbuilder.hpp

@@ -37,6 +37,9 @@ class TabBuilder {
   void buildAirTightnessTestTab(const char *tabname, int boardid);
   void buildExtChSelectorTab(const char *tabname, int boardid);
 
+void buildValveCtrlTab(const char *tabname, int boardid) ;
+
+
   void buildEnd();
 
  private:

src/protocol/zscanprotocol_com/zscanprotocol_com.cpp

@@ -1,12 +1,12 @@
 #include "zscanprotocol_com.hpp"
-
+#include "app_protocols\ecode\publicecode.hpp"
 #include <stdarg.h>
 
 #include "db/ecode_info_mgr.hpp"
 
 using namespace iflytop;
 using namespace zscanprotocol;
-using namespace err;
+
 
 #define TAG "ZScanProtocolCom"
 

src/protocol/zscanprotocol_com/zscanprotocol_com.hpp

@@ -13,7 +13,9 @@
 #include <vector>
 
 //
-#include "app_protocols/zscanprotocol/zscanprotocol.hpp"
+extern "C"{
+#include "app_protocols/zscanprotocol/zscanprotocol.h"
+}
 #include "protocol/waveshare_can/waveshare_can.hpp"
 #include "zqui/zqui/zqui.hpp"