From ee762704bdb3fc9fbba98132f7ce8f3bbdd4c3fa Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Fri, 17 May 2024 22:13:29 +0800
Subject: [PATCH] v2

---
 .settings/language.settings.xml              | 4 ++--
 usrc/project_configs.h                       | 2 +-
 usrc/protocol_impl/protocol_impl_service.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index fbe7e0a..a979a7e 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="-859640089190887575" 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="1380098844774403941" 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="-897080592784661030" 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="1342658341180630486" 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/usrc/project_configs.h b/usrc/project_configs.h
index e1d8eb7..c37d39c 100644
--- a/usrc/project_configs.h
+++ b/usrc/project_configs.h
@@ -9,7 +9,7 @@
  * @brief 基础配置
  *
  */
-#define SOFTWARE_VERSION 5
+#define SOFTWARE_VERSION 2
 #define HARDWARE_VERSION 1
 #define PROJECT          "dbdb_liquid_path_control"
 #define SN_HEADER        "SN"
diff --git a/usrc/protocol_impl/protocol_impl_service.cpp b/usrc/protocol_impl/protocol_impl_service.cpp
index 57ee982..d1a2b6b 100644
--- a/usrc/protocol_impl/protocol_impl_service.cpp
+++ b/usrc/protocol_impl/protocol_impl_service.cpp
@@ -54,7 +54,8 @@ static void    _zcanbus_on_rx(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t
     if (power < 0 && power > 31) {
       power = 15;
     }
-    auto motor = Hardware::ins().motor(1);
+    auto motor = Hardware::ins().motor(0);
+    ZLOGI(TAG, "pump ctrl %d %d %d %d %d %d", acc_rpm2, rpm, idlepower, power, ppm, acc);
 
     motor->setIHOLD_IRUN(idlepower, power, 10);  // 5W
     motor->setAcceleration(acc);
@@ -77,7 +78,6 @@ static void    _zcanbus_on_rx(CanPacketRxBuffer* rxbuf, uint8_t* packet, size_t
     }
   }
 
-
   if (cmdheader->cmdid == kcmd_dbdb_spray_air_compressor_power_ctrl) {
     int32_t val = *(int32_t*)(&cmdheader->data[0]);
     Hardware::ins().atta_mini_air_compressor_ctrl()->write(val);