diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 8909387..8abf670 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -12,7 +12,7 @@ "./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F", "./Drivers/CMSIS/Device/ST/STM32F4xx/Include", "./Drivers/CMSIS/Include", - "C:/ST/STM32CubeIDE_1.13.0/STM32CubeIDE/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.11.3.rel1.win32_1.1.0.202305231506/tools/arm-none-eabi/include", + "./usrc/", "./" ], @@ -21,7 +21,7 @@ "USE_HAL_DRIVER", "STM32F407xx" ], - "compilerPath": "C:/ST/STM32CubeIDE_1.13.0/STM32CubeIDE/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.11.3.rel1.win32_1.1.0.202305231506/tools/bin/arm-none-eabi-g++.exe", + "compilerPath": "C:/ST/STM32CubeIDE_1.13.0/STM32CubeIDE/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.12.3.rel1.win32_1.0.100.202403111256/tools/bin/arm-none-eabi-g++.exe", "intelliSenseMode": "${default}" } ], diff --git a/README.md b/README.md index 78bc9aa..25ee790 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,9 @@ 2.添加看门狗 3.添加复位原因检查和上报 + V114 + 1.添加加液泵,液路,进气电磁阀控制 + ``` ```c diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol index c1c23f5..79904e5 160000 --- a/app_protocols/transmit_disfection_protocol +++ b/app_protocols/transmit_disfection_protocol @@ -1 +1 @@ -Subproject commit c1c23f522c5daa18dc89587ff25310d526aa2ca3 +Subproject commit 79904e587280cccedc0237f2caf84406b374f045 diff --git a/usrc/app/dmapp.cpp b/usrc/app/dmapp.cpp index 9eafdb4..1d4144d 100644 --- a/usrc/app/dmapp.cpp +++ b/usrc/app/dmapp.cpp @@ -170,6 +170,20 @@ void DisinfectionApp::initialize() { zcanbus_send_ack(cxt->packet, mode); }); } + + // 加液泵液路进气阀 + if (PORT::isLiquidCtrlBoard()) { + static ZGPIO valve; + valve.initAsOutput(PB3, kxs_gpio_nopull, true, false); + REG_LAMADA_FN(kfn_add_liquid_pump_air_intake_valve, [&](ProcessContext* cxt) { + if (GET_PARAM(0) == 0) { + valve.write(0); + } else { + valve.write(1); + } + zcanbus_send_ack(cxt->packet, NULL, 0); + }); + } } /*********************************************************************************************************************** diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 4ea2a3e..b3f8a14 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -15,13 +15,13 @@ * @brief 基础配置 * */ -#define SOFTWARE_VERSION 113 // 软件版本 -#define HARDWARE_VERSION 1 // 硬件版本 +#define SOFTWARE_VERSION 114 // 软件版本 +#define HARDWARE_VERSION 1 // 硬件版本 #define PROJECT "transmit_disinfection_micro_re" // 工程名称 -#define SN_HEADER "SN" // SN号前缀 -#define DEBUG_UART huart1 // 调试串口 -#define DEBUG_LIGHT_GPIO PE0 // 调试指示灯 -#define H2O2_SENSOR_BOARD_DEBUG_LIGHT_GPIO PE2 // 过氧化氢板-调试指示灯 +#define SN_HEADER "SN" // SN号前缀 +#define DEBUG_UART huart1 // 调试串口 +#define DEBUG_LIGHT_GPIO PE0 // 调试指示灯 +#define H2O2_SENSOR_BOARD_DEBUG_LIGHT_GPIO PE2 // 过氧化氢板-调试指示灯 #define BOARD_TYPE_ID_FLASH_ADD 0x080E0000 #define SDK_CFG__SN_FLASH_ADDR 0x080E0004 //