diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 8f1daa5..a267726 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -8,7 +8,7 @@ "src", "./", "./app_protocols/", - "../build-IflytopCom-Desktop_Qt_5_12_12_MinGW_64_bit-Debug/IflytopCom_autogen/include" + "./build/TransmitDisinfection_autogen/include" ], "defines": [ "_DEBUG", diff --git a/CMakeLists.txt b/CMakeLists.txt index f3887b1..b79b9ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) -project(IflytopCom VERSION 0.1 LANGUAGES CXX) +project(TransmitDisinfection VERSION 0.1 LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -36,19 +36,19 @@ set(PROJECT_SOURCES app.rc ) -add_executable(IflytopCom WIN32 +add_executable(TransmitDisinfection WIN32 ${PROJECT_SOURCES} ) -target_link_options(IflytopCom PRIVATE -static -static-libgcc -static-libstdc++) +target_link_options(TransmitDisinfection PRIVATE -static -static-libgcc -static-libstdc++) -target_link_libraries(IflytopCom PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32) +target_link_libraries(TransmitDisinfection PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32) -set_target_properties(IflytopCom PROPERTIES +set_target_properties(TransmitDisinfection PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} ) if(QT_VERSION_MAJOR EQUAL 6) - qt_finalize_executable(IflytopCom) + qt_finalize_executable(TransmitDisinfection) endif() diff --git a/IflytopCom/IflytopCom.exe b/IflytopCom/IflytopCom.exe deleted file mode 100644 index c83f38a..0000000 Binary files a/IflytopCom/IflytopCom.exe and /dev/null differ diff --git a/README.md b/README.md index 17cb8de..778a71d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ ``` - v1.0.0 - 支持16路同步盒功能 + v1.0.5 + 支持DT600B + +``` + +``` +初始化CMake环境 ./init.bat +编译 ./build.bat +打包 ./tool/packet.bat ``` \ No newline at end of file diff --git a/IflytopCom/Qt5Core.dll b/TransmitDisinfection/Qt5Core.dll similarity index 100% rename from IflytopCom/Qt5Core.dll rename to TransmitDisinfection/Qt5Core.dll diff --git a/IflytopCom/Qt5Gui.dll b/TransmitDisinfection/Qt5Gui.dll similarity index 100% rename from IflytopCom/Qt5Gui.dll rename to TransmitDisinfection/Qt5Gui.dll diff --git a/IflytopCom/Qt5SerialPort.dll b/TransmitDisinfection/Qt5SerialPort.dll similarity index 100% rename from IflytopCom/Qt5SerialPort.dll rename to TransmitDisinfection/Qt5SerialPort.dll diff --git a/IflytopCom/Qt5Widgets.dll b/TransmitDisinfection/Qt5Widgets.dll similarity index 100% rename from IflytopCom/Qt5Widgets.dll rename to TransmitDisinfection/Qt5Widgets.dll diff --git a/IflytopCom/iconengines/qsvgicond.dll b/TransmitDisinfection/iconengines/qsvgicond.dll similarity index 100% rename from IflytopCom/iconengines/qsvgicond.dll rename to TransmitDisinfection/iconengines/qsvgicond.dll diff --git a/IflytopCom/imageformats/qgifd.dll b/TransmitDisinfection/imageformats/qgifd.dll similarity index 100% rename from IflytopCom/imageformats/qgifd.dll rename to TransmitDisinfection/imageformats/qgifd.dll diff --git a/IflytopCom/imageformats/qicnsd.dll b/TransmitDisinfection/imageformats/qicnsd.dll similarity index 100% rename from IflytopCom/imageformats/qicnsd.dll rename to TransmitDisinfection/imageformats/qicnsd.dll diff --git a/IflytopCom/imageformats/qicod.dll b/TransmitDisinfection/imageformats/qicod.dll similarity index 100% rename from IflytopCom/imageformats/qicod.dll rename to TransmitDisinfection/imageformats/qicod.dll diff --git a/IflytopCom/imageformats/qsvgd.dll b/TransmitDisinfection/imageformats/qsvgd.dll similarity index 100% rename from IflytopCom/imageformats/qsvgd.dll rename to TransmitDisinfection/imageformats/qsvgd.dll diff --git a/IflytopCom/imageformats/qtgad.dll b/TransmitDisinfection/imageformats/qtgad.dll similarity index 100% rename from IflytopCom/imageformats/qtgad.dll rename to TransmitDisinfection/imageformats/qtgad.dll diff --git a/IflytopCom/imageformats/qtiffd.dll b/TransmitDisinfection/imageformats/qtiffd.dll similarity index 100% rename from IflytopCom/imageformats/qtiffd.dll rename to TransmitDisinfection/imageformats/qtiffd.dll diff --git a/IflytopCom/imageformats/qwbmpd.dll b/TransmitDisinfection/imageformats/qwbmpd.dll similarity index 100% rename from IflytopCom/imageformats/qwbmpd.dll rename to TransmitDisinfection/imageformats/qwbmpd.dll diff --git a/IflytopCom/libgcc_s_seh-1.dll b/TransmitDisinfection/libgcc_s_seh-1.dll similarity index 100% rename from IflytopCom/libgcc_s_seh-1.dll rename to TransmitDisinfection/libgcc_s_seh-1.dll diff --git a/IflytopCom/libstdc++-6.dll b/TransmitDisinfection/libstdc++-6.dll similarity index 100% rename from IflytopCom/libstdc++-6.dll rename to TransmitDisinfection/libstdc++-6.dll diff --git a/IflytopCom/libwinpthread-1.dll b/TransmitDisinfection/libwinpthread-1.dll similarity index 100% rename from IflytopCom/libwinpthread-1.dll rename to TransmitDisinfection/libwinpthread-1.dll diff --git a/IflytopCom/platforms/qdirect2d.dll b/TransmitDisinfection/platforms/qdirect2d.dll similarity index 100% rename from IflytopCom/platforms/qdirect2d.dll rename to TransmitDisinfection/platforms/qdirect2d.dll diff --git a/IflytopCom/platforms/qminimal.dll b/TransmitDisinfection/platforms/qminimal.dll similarity index 100% rename from IflytopCom/platforms/qminimal.dll rename to TransmitDisinfection/platforms/qminimal.dll diff --git a/IflytopCom/platforms/qoffscreen.dll b/TransmitDisinfection/platforms/qoffscreen.dll similarity index 100% rename from IflytopCom/platforms/qoffscreen.dll rename to TransmitDisinfection/platforms/qoffscreen.dll diff --git a/IflytopCom/platforms/qwebgl.dll b/TransmitDisinfection/platforms/qwebgl.dll similarity index 100% rename from IflytopCom/platforms/qwebgl.dll rename to TransmitDisinfection/platforms/qwebgl.dll diff --git a/IflytopCom/platforms/qwindows.dll b/TransmitDisinfection/platforms/qwindows.dll similarity index 100% rename from IflytopCom/platforms/qwindows.dll rename to TransmitDisinfection/platforms/qwindows.dll diff --git a/IflytopCom/styles/qwindowsvistastyled.dll b/TransmitDisinfection/styles/qwindowsvistastyled.dll similarity index 100% rename from IflytopCom/styles/qwindowsvistastyled.dll rename to TransmitDisinfection/styles/qwindowsvistastyled.dll diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol index 79904e5..a779858 160000 --- a/app_protocols/transmit_disfection_protocol +++ b/app_protocols/transmit_disfection_protocol @@ -1 +1 @@ -Subproject commit 79904e587280cccedc0237f2caf84406b374f045 +Subproject commit a77985829c2972df6bf04a8a2195431559acff75 diff --git a/build.bat b/build.bat index 8392b86..6ed0d9c 100644 --- a/build.bat +++ b/build.bat @@ -1,4 +1,4 @@ cd build make -j8 cd .. -copy build\IflytopCom.exe IflytopCom\ \ No newline at end of file +copy build\TransmitDisinfection.exe TransmitDisinfection\ \ No newline at end of file diff --git a/src/app/transmit_disinfection/dt600b.cpp b/src/app/transmit_disinfection/dt600b.cpp new file mode 100644 index 0000000..68562dd --- /dev/null +++ b/src/app/transmit_disinfection/dt600b.cpp @@ -0,0 +1,32 @@ +#include "dt600b.hpp" + +#include "dep.hpp" +#include "utils/utils.hpp" + +using namespace iflytop; +using namespace zscanprotocol; +using namespace transmit_disfection_protocol; +using namespace app_transmit_disinfection; +using namespace std; + +/*********************************************************************************************************************** + * UTILS * + ***********************************************************************************************************************/ + +DT600B::DT600B(QWidget *parent) : TransmitDisinfection(parent) { + TabBuilder tabBuilder(this); + + tabBuilder.buildBoardBasicCtrl("功率板", kFixBoardId_PowerControl); + tabBuilder.buildBoardBasicCtrl("液路板", kFixBoardId_LiquidCtrl); + + tabBuilder.buildFnPumpCtrl("液路板", kFixBoardId_LiquidCtrl); + tabBuilder.buildTripleWarningLightTab("液路板", kFixBoardId_LiquidCtrl); + tabBuilder.buildWaterSensorTab("液路板", kFixBoardId_LiquidCtrl); + tabBuilder.buildValveCtrlTab("液路板", kFixBoardId_LiquidCtrl); + tabBuilder.buildLiquidLevelStateReaderTab("液路板", 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/dt600b.hpp b/src/app/transmit_disinfection/dt600b.hpp new file mode 100644 index 0000000..65a549c --- /dev/null +++ b/src/app/transmit_disinfection/dt600b.hpp @@ -0,0 +1,16 @@ +#pragma once +#include + +#include "transmitdisinfection.hpp" +#include "zqui/zqui.hpp" + +namespace iflytop { +class DT600B : public TransmitDisinfection { + Q_OBJECT + + public: + explicit DT600B(QWidget *parent = nullptr); +}; +IMPL_APPBUILDER("DT600B(大空间标准版)", DT600B) + +} // namespace iflytop diff --git a/src/app/transmit_disinfection/utils/tabbuilder.cpp b/src/app/transmit_disinfection/utils/tabbuilder.cpp index edeecde..25f9df5 100644 --- a/src/app/transmit_disinfection/utils/tabbuilder.cpp +++ b/src/app/transmit_disinfection/utils/tabbuilder.cpp @@ -349,7 +349,27 @@ 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); + CAN_MASTER->getCanProtocolCom()->callcmd1(boardid, kfn_set_add_fluid_channel_selector_valve, atoi(args[0]), DEFUALT_OVERTIME); + }); +} + +// 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_set_add_fluid_channel_selector_valve, atoi(args[0]), DEFUALT_OVERTIME); +// }); +// } + + +void TabBuilder::buildLiquidLevelStateReaderTab(const char *tabname, int boardid) { + ZQVTabPage *tab = getTab(tabname); + ZQFunctionListBox *box = new ZQFunctionListBox(tab, "液位(IO版)状态读取", 4); + box->newFunc("读取状态(如果是IO0:低液位,IO1:中液位,IO2:高液位)", {}, [this, boardid](int argn, const char **args) { // + shared_ptr receipt = CAN_MASTER->getCanProtocolCom()->callcmd0(boardid, kfn_liquid_level_read_io_state, DEFUALT_OVERTIME); + ISHOW("IO0:%d", receipt->getContent(0) & 0x01); + ISHOW("IO1:%d", (receipt->getContent(0) >> 1) & 0x01); + ISHOW("IO2:%d", (receipt->getContent(0) >> 2) & 0x01); }); } diff --git a/src/app/transmit_disinfection/utils/tabbuilder.hpp b/src/app/transmit_disinfection/utils/tabbuilder.hpp index 6ee544e..166eaf3 100644 --- a/src/app/transmit_disinfection/utils/tabbuilder.hpp +++ b/src/app/transmit_disinfection/utils/tabbuilder.hpp @@ -37,8 +37,8 @@ class TabBuilder { void buildAirTightnessTestTab(const char *tabname, int boardid); void buildExtChSelectorTab(const char *tabname, int boardid); -void buildValveCtrlTab(const char *tabname, int boardid) ; - + void buildValveCtrlTab(const char *tabname, int boardid); + void buildLiquidLevelStateReaderTab(const char *tabname, int boardid); void buildEnd(); diff --git a/src/app_version.hpp b/src/app_version.hpp index fd4271a..a68f974 100644 --- a/src/app_version.hpp +++ b/src/app_version.hpp @@ -1,7 +1,7 @@ #pragma once #define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0) -#define APP_VERSION VERSION(1, 0, 4) +#define APP_VERSION VERSION(1, 0, 5) #define APP_VERSION_STR "1.0.4" #define APP_VERSION_MAIN VERSION_MAIN(APP_VERSION) diff --git a/src/main.cpp b/src/main.cpp index e67638e..7599213 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,6 +22,7 @@ #include "zqui/zqui/zqui.hpp" // #include "app/transmit_disinfection/draw_bard_dm.hpp" +#include "app/transmit_disinfection/dt600b.hpp" #include "app/transmit_disinfection/exth2o2_sensor.hpp" #include "app/transmit_disinfection/large_space_disinfection_machine.hpp" #include "app/transmit_disinfection/little_space_disinfection_machine.hpp" @@ -49,13 +50,14 @@ int main(int argc, char* argv[]) { QApplication a(argc, argv); REG_APP(LargeSpaceDisinfectionMachine); + REG_APP(DT600B); REG_APP(LittleSpaceDisinfectionMachine); REG_APP(PipeDM); REG_APP(DrawBardDM); REG_APP(ExtH2O2Sensor); ZQUI::ins()->initialize(); - DOINUI([]() { ZQUI::ins()->mainW()->setVersionInfo(1, "APP_VERSION",APP_VERSION_STR ); }); + DOINUI([]() { ZQUI::ins()->mainW()->setVersionInfo(1, "APP_VERSION", APP_VERSION_STR); }); return a.exec(); } diff --git a/src/zqui/ui/z_function_list_box.cpp b/src/zqui/ui/z_function_list_box.cpp index b038532..7529e51 100644 --- a/src/zqui/ui/z_function_list_box.cpp +++ b/src/zqui/ui/z_function_list_box.cpp @@ -12,7 +12,7 @@ ZQFunctionListBox::ZQFunctionListBox(QWidget *parent, const QString &title, int m_layout->setColumnMinimumWidth(column, column); m_column = column; - for (size_t i = 0; i < column; i++) { + for (int i = 0; i < column; i++) { layout->setColumnStretch(i, 1); } @@ -89,7 +89,7 @@ void ZQFunctionListBox::newFunc(QString zh_name, QStringList params, std::functi params.push_back(lineEdits[i]->text().toStdString()); } char *args[params.size()]; - for (int i = 0; i < params.size(); i++) { + for (size_t i = 0; i < params.size(); i++) { args[i] = (char *)params[i].c_str(); } try { diff --git a/src/zqui/ui/z_function_list_box.hpp b/src/zqui/ui/z_function_list_box.hpp index 27b20e4..0d68df1 100644 --- a/src/zqui/ui/z_function_list_box.hpp +++ b/src/zqui/ui/z_function_list_box.hpp @@ -29,11 +29,13 @@ #include #include // -#include #include "zqui/base/zexception.hpp" #include "zqui/base/zworkqueue.hpp" +#include + + namespace iflytop { using namespace std; diff --git a/tools/packet.bat b/tools/packet.bat index 6e1ecb1..8c49040 100644 --- a/tools/packet.bat +++ b/tools/packet.bat @@ -1,2 +1,2 @@ @REM #打包指令 -.\tools\makesfx.exe -ic -mf -ft -we -di -un -oo .\IflytopCom\ .\dist\IflytopCom.exe .\logo.ico .\IflytopCom\IflytopCom.exe \ No newline at end of file +.\tools\makesfx.exe -ic -mf -ft -we -di -un -oo .\TransmitDisinfection\ .\dist\TransmitDisinfection.exe .\logo.ico .\TransmitDisinfection\TransmitDisinfection.exe \ No newline at end of file