From ecd621afaa0509156795f0784d4773931f021bb8 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 15 May 2024 17:14:51 +0800 Subject: [PATCH] update --- .gitmodules | 3 +++ iflytoplinuxsdk | 2 +- src/service/device_io_control_service.cpp | 9 --------- transmit_disinfection_protocol_v1 | 1 + 4 files changed, 5 insertions(+), 10 deletions(-) create mode 160000 transmit_disinfection_protocol_v1 diff --git a/.gitmodules b/.gitmodules index 38648eb..12804da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "transmit_disinfection_public_code"] path = transmit_disinfection_public_code url = zwsd@192.168.1.3:p_transmit_disinfection/transmit_disinfection_public_code.git +[submodule "transmit_disinfection_protocol_v1"] + path = transmit_disinfection_protocol_v1 + url = zwsd@192.168.1.3:p_transmit_disinfection/transmit_disinfection_protocol_v1.git diff --git a/iflytoplinuxsdk b/iflytoplinuxsdk index 7d03bf6..0035acd 160000 --- a/iflytoplinuxsdk +++ b/iflytoplinuxsdk @@ -1 +1 @@ -Subproject commit 7d03bf6f3d7b4ffe2a73c78b86567f5fe0d59607 +Subproject commit 0035acd2d227a103291b128fdcda9cf3f9531662 diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp index 138860e..e4d0fa7 100644 --- a/src/service/device_io_control_service.cpp +++ b/src/service/device_io_control_service.cpp @@ -3,15 +3,6 @@ using namespace iflytop; using namespace std; -#if 0 -模块 板子 硬件ID ID -空压机-安全电磁阀 3 PC2 0 -空压机-通断电磁阀 3 PC3 1 -鼓风机-安全电磁阀 3 PC4 2 --通断电磁阀 3 PC5 3 -加热片-安全电磁阀 3 PC6 4 --通断电磁阀 3 PC7 5 -#endif #define GPM_TO_SPEED(gpm) (gpm * 14.7) #define SPEED_TO_GPM(speed) (speed / 14.7) diff --git a/transmit_disinfection_protocol_v1 b/transmit_disinfection_protocol_v1 new file mode 160000 index 0000000..a3bc27c --- /dev/null +++ b/transmit_disinfection_protocol_v1 @@ -0,0 +1 @@ +Subproject commit a3bc27ca9ca6c3d636d4a924c5d8bc9f7f4b5fc8