From 88c220c7ffea4ff9ba15025511545f069b7e014b Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Wed, 4 Dec 2024 21:31:29 +0800
Subject: [PATCH] v200

---
 .settings/language.settings.xml            | 4 ++--
 app_protocols/transmit_disfection_protocol | 2 +-
 usrc/app/dmapp.cpp                         | 2 +-
 usrc/project_configs.h                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 02bc15c..179311e 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1604983594999277929" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="548326060430965700" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1497516560337187160" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="597454216292692661" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol
index 79904e5..1ca640c 160000
--- a/app_protocols/transmit_disfection_protocol
+++ b/app_protocols/transmit_disfection_protocol
@@ -1 +1 @@
-Subproject commit 79904e587280cccedc0237f2caf84406b374f045
+Subproject commit 1ca640c0002d226f11ae6463ee63b4db9a05e35d
diff --git a/usrc/app/dmapp.cpp b/usrc/app/dmapp.cpp
index 1d4144d..fcdf167 100644
--- a/usrc/app/dmapp.cpp
+++ b/usrc/app/dmapp.cpp
@@ -175,7 +175,7 @@ void DisinfectionApp::initialize() {
   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) {
+    REG_LAMADA_FN(kfn_set_add_fluid_channel_selector_valve, [&](ProcessContext* cxt) {
       if (GET_PARAM(0) == 0) {
         valve.write(0);
       } else {
diff --git a/usrc/project_configs.h b/usrc/project_configs.h
index b3f8a14..1a1b23a 100644
--- a/usrc/project_configs.h
+++ b/usrc/project_configs.h
@@ -15,7 +15,7 @@
  * @brief 基础配置
  *
  */
-#define SOFTWARE_VERSION                   114                               // 软件版本
+#define SOFTWARE_VERSION                   200                               // 软件版本
 #define HARDWARE_VERSION                   1                                 // 硬件版本
 #define PROJECT                            "transmit_disinfection_micro_re"  // 工程名称
 #define SN_HEADER                          "SN"                              // SN号前缀