diff --git a/.gitignore b/.gitignore index f9259fe..f6bde6b 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,7 @@ Thumbs.db # Binaries # -------- -*.dll + build CMakeLists.txt.user diff --git a/IflytopCom/IflytopCom.exe b/IflytopCom/IflytopCom.exe new file mode 100644 index 0000000..daeec09 Binary files /dev/null and b/IflytopCom/IflytopCom.exe differ diff --git a/IflytopCom/Qt5Core.dll b/IflytopCom/Qt5Core.dll new file mode 100644 index 0000000..4712ed1 Binary files /dev/null and b/IflytopCom/Qt5Core.dll differ diff --git a/IflytopCom/Qt5Gui.dll b/IflytopCom/Qt5Gui.dll new file mode 100644 index 0000000..0a557c1 Binary files /dev/null and b/IflytopCom/Qt5Gui.dll differ diff --git a/IflytopCom/Qt5SerialPort.dll b/IflytopCom/Qt5SerialPort.dll new file mode 100644 index 0000000..1c5b2d0 Binary files /dev/null and b/IflytopCom/Qt5SerialPort.dll differ diff --git a/IflytopCom/Qt5Widgets.dll b/IflytopCom/Qt5Widgets.dll new file mode 100644 index 0000000..63cd78d Binary files /dev/null and b/IflytopCom/Qt5Widgets.dll differ diff --git a/IflytopCom/iconengines/qsvgicond.dll b/IflytopCom/iconengines/qsvgicond.dll new file mode 100644 index 0000000..0b8f5ad Binary files /dev/null and b/IflytopCom/iconengines/qsvgicond.dll differ diff --git a/IflytopCom/imageformats/qgifd.dll b/IflytopCom/imageformats/qgifd.dll new file mode 100644 index 0000000..c194f92 Binary files /dev/null and b/IflytopCom/imageformats/qgifd.dll differ diff --git a/IflytopCom/imageformats/qicnsd.dll b/IflytopCom/imageformats/qicnsd.dll new file mode 100644 index 0000000..ab08ec6 Binary files /dev/null and b/IflytopCom/imageformats/qicnsd.dll differ diff --git a/IflytopCom/imageformats/qicod.dll b/IflytopCom/imageformats/qicod.dll new file mode 100644 index 0000000..4bf5c3b Binary files /dev/null and b/IflytopCom/imageformats/qicod.dll differ diff --git a/IflytopCom/imageformats/qsvgd.dll b/IflytopCom/imageformats/qsvgd.dll new file mode 100644 index 0000000..8f2031f Binary files /dev/null and b/IflytopCom/imageformats/qsvgd.dll differ diff --git a/IflytopCom/imageformats/qtgad.dll b/IflytopCom/imageformats/qtgad.dll new file mode 100644 index 0000000..e60b83e Binary files /dev/null and b/IflytopCom/imageformats/qtgad.dll differ diff --git a/IflytopCom/imageformats/qtiffd.dll b/IflytopCom/imageformats/qtiffd.dll new file mode 100644 index 0000000..b210d4b Binary files /dev/null and b/IflytopCom/imageformats/qtiffd.dll differ diff --git a/IflytopCom/imageformats/qwbmpd.dll b/IflytopCom/imageformats/qwbmpd.dll new file mode 100644 index 0000000..5d68aae Binary files /dev/null and b/IflytopCom/imageformats/qwbmpd.dll differ diff --git a/IflytopCom/libgcc_s_seh-1.dll b/IflytopCom/libgcc_s_seh-1.dll new file mode 100644 index 0000000..4ec945b Binary files /dev/null and b/IflytopCom/libgcc_s_seh-1.dll differ diff --git a/IflytopCom/libstdc++-6.dll b/IflytopCom/libstdc++-6.dll new file mode 100644 index 0000000..8e55acc Binary files /dev/null and b/IflytopCom/libstdc++-6.dll differ diff --git a/IflytopCom/libwinpthread-1.dll b/IflytopCom/libwinpthread-1.dll new file mode 100644 index 0000000..d9f4e1a Binary files /dev/null and b/IflytopCom/libwinpthread-1.dll differ diff --git a/IflytopCom/platforms/qdirect2d.dll b/IflytopCom/platforms/qdirect2d.dll new file mode 100644 index 0000000..0aa3253 Binary files /dev/null and b/IflytopCom/platforms/qdirect2d.dll differ diff --git a/IflytopCom/platforms/qminimal.dll b/IflytopCom/platforms/qminimal.dll new file mode 100644 index 0000000..6116a86 Binary files /dev/null and b/IflytopCom/platforms/qminimal.dll differ diff --git a/IflytopCom/platforms/qoffscreen.dll b/IflytopCom/platforms/qoffscreen.dll new file mode 100644 index 0000000..c8f5790 Binary files /dev/null and b/IflytopCom/platforms/qoffscreen.dll differ diff --git a/IflytopCom/platforms/qwebgl.dll b/IflytopCom/platforms/qwebgl.dll new file mode 100644 index 0000000..75e55d2 Binary files /dev/null and b/IflytopCom/platforms/qwebgl.dll differ diff --git a/IflytopCom/platforms/qwindows.dll b/IflytopCom/platforms/qwindows.dll new file mode 100644 index 0000000..4227915 Binary files /dev/null and b/IflytopCom/platforms/qwindows.dll differ diff --git a/IflytopCom/styles/qwindowsvistastyled.dll b/IflytopCom/styles/qwindowsvistastyled.dll new file mode 100644 index 0000000..d46051e Binary files /dev/null and b/IflytopCom/styles/qwindowsvistastyled.dll differ diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol index 6fb781e..79904e5 160000 --- a/app_protocols/transmit_disfection_protocol +++ b/app_protocols/transmit_disfection_protocol @@ -1 +1 @@ -Subproject commit 6fb781e6b5fe8f4f44c7046b30cbee47512f5bd9 +Subproject commit 79904e587280cccedc0237f2caf84406b374f045 diff --git a/app_protocols/zscanprotocol b/app_protocols/zscanprotocol index d11d41c..81529a1 160000 --- a/app_protocols/zscanprotocol +++ b/app_protocols/zscanprotocol @@ -1 +1 @@ -Subproject commit d11d41c1062568f629d5ec2bc6435319b7ea83e3 +Subproject commit 81529a15c57000f73cc5bd4b7276f567099b9988 diff --git a/release/IflytopCom.exe b/release/IflytopCom.exe new file mode 100644 index 0000000..f1fee66 Binary files /dev/null and b/release/IflytopCom.exe differ diff --git a/release/V9/CameraLightingController.exe b/release/V9/CameraLightingController.exe deleted file mode 100644 index 7182bf0..0000000 Binary files a/release/V9/CameraLightingController.exe and /dev/null differ diff --git a/release/v3.0/CameraLightingController.exe b/release/v3.0/CameraLightingController.exe deleted file mode 100644 index 6a9be8e..0000000 Binary files a/release/v3.0/CameraLightingController.exe and /dev/null differ diff --git a/release/v6/CameraLightingControllerV6.exe b/release/v6/CameraLightingControllerV6.exe deleted file mode 100644 index 610172f..0000000 Binary files a/release/v6/CameraLightingControllerV6.exe and /dev/null differ diff --git a/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp b/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp index fd55345..3ea7ff0 100644 --- a/src/app/transmit_disinfection/channel/transmit_disinfection_can_master.hpp +++ b/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); } diff --git a/src/app/transmit_disinfection/large_space_disinfection_machine.cpp b/src/app/transmit_disinfection/large_space_disinfection_machine.cpp index da83c94..60ab70d 100644 --- a/src/app/transmit_disinfection/large_space_disinfection_machine.cpp +++ b/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); diff --git a/src/app/transmit_disinfection/little_space_disinfection_machine.cpp b/src/app/transmit_disinfection/little_space_disinfection_machine.cpp index f760652..5944aa6 100644 --- a/src/app/transmit_disinfection/little_space_disinfection_machine.cpp +++ b/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); + + } diff --git a/src/app/transmit_disinfection/pipe_dm.cpp b/src/app/transmit_disinfection/pipe_dm.cpp index ad169ec..8cb89b8 100644 --- a/src/app/transmit_disinfection/pipe_dm.cpp +++ b/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); + } diff --git a/src/app/transmit_disinfection/transmitdisinfection.hpp b/src/app/transmit_disinfection/transmitdisinfection.hpp index 1188d1e..f01a582 100644 --- a/src/app/transmit_disinfection/transmitdisinfection.hpp +++ b/src/app/transmit_disinfection/transmitdisinfection.hpp @@ -3,10 +3,12 @@ #include #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 diff --git a/src/app/transmit_disinfection/utils/tabbuilder.cpp b/src/app/transmit_disinfection/utils/tabbuilder.cpp index f83ec79..77b85e0 100644 --- a/src/app/transmit_disinfection/utils/tabbuilder.cpp +++ b/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(); diff --git a/src/app/transmit_disinfection/utils/tabbuilder.hpp b/src/app/transmit_disinfection/utils/tabbuilder.hpp index 6e96914..6ee544e 100644 --- a/src/app/transmit_disinfection/utils/tabbuilder.hpp +++ b/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: diff --git a/src/protocol/zscanprotocol_com/zscanprotocol_com.cpp b/src/protocol/zscanprotocol_com/zscanprotocol_com.cpp index 89fd978..6cc861c 100644 --- a/src/protocol/zscanprotocol_com/zscanprotocol_com.cpp +++ b/src/protocol/zscanprotocol_com/zscanprotocol_com.cpp @@ -1,12 +1,12 @@ #include "zscanprotocol_com.hpp" - +#include "app_protocols\ecode\publicecode.hpp" #include #include "db/ecode_info_mgr.hpp" using namespace iflytop; using namespace zscanprotocol; -using namespace err; + #define TAG "ZScanProtocolCom" diff --git a/src/protocol/zscanprotocol_com/zscanprotocol_com.hpp b/src/protocol/zscanprotocol_com/zscanprotocol_com.hpp index 390c7a1..bf320c4 100644 --- a/src/protocol/zscanprotocol_com/zscanprotocol_com.hpp +++ b/src/protocol/zscanprotocol_com/zscanprotocol_com.hpp @@ -13,7 +13,9 @@ #include // -#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" diff --git a/单文件制作_x64.exe b/单文件制作_x64.exe new file mode 100644 index 0000000..0e66444 Binary files /dev/null and b/单文件制作_x64.exe differ