From 3ffbdfab94e078936e47130fdc6e8df5be003301 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Mon, 2 Sep 2024 09:56:52 +0800
Subject: [PATCH] fix: device can't work when each distru little than 0.8

---
 .settings/language.settings.xml    |  4 ++--
 README.md                          |  3 +++
 stm32components                    |  2 +-
 usrc/apphardware/apphardware.cpp   |  8 ++++----
 usrc/service/pump_ctrl_service.cpp | 10 +++-------
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 1eb30e0..adb54ce 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="1290452739804114664" 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="1534615028576298921" 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="1305946972399269591" 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="1550109261171453848" 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/README.md b/README.md
index b063c72..04045d3 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,9 @@ TODO:
     2. 添加恢复出厂设置按键，且恢复出厂设置按键按下后，需要根用户二次确认。
 
     3. 转换比设置错误可能到只泵机不转
+    4. 设备在工作时，禁止退出首页
+    5. 设备在工作时，首页的任何操作都会停止设备。
+    6. 
 ```
 
 
diff --git a/stm32components b/stm32components
index f45df89..d8826b5 160000
--- a/stm32components
+++ b/stm32components
@@ -1 +1 @@
-Subproject commit f45df89965564db5c5ad518c7a704571726b8a6e
+Subproject commit d8826b58d64f4f69f5d867d110e5a8705b8bcdef
diff --git a/usrc/apphardware/apphardware.cpp b/usrc/apphardware/apphardware.cpp
index efdc31a..31ad22e 100644
--- a/usrc/apphardware/apphardware.cpp
+++ b/usrc/apphardware/apphardware.cpp
@@ -41,10 +41,10 @@ void AppHardware::initialize() {
   TMC51X0Cfg tmc5130cfg3 = {&MOTOR_SPI_INS, MOTO3_CSN_IO, MOTO3_DRV_ENN_IO};
   TMC51X0Cfg tmc5130cfg4 = {&MOTOR_SPI_INS, MOTO4_CSN_IO, MOTO4_DRV_ENN_IO};
 
-  MOTO1.initialize(tmc5130cfg1);
-  MOTO2.initialize(tmc5130cfg2);
-  MOTO3.initialize(tmc5130cfg3);
-  MOTO4.initialize(tmc5130cfg4);
+  MOTO1.initialize(0,tmc5130cfg1);
+  MOTO2.initialize(1,tmc5130cfg2);
+  MOTO3.initialize(2,tmc5130cfg3);
+  MOTO4.initialize(3,tmc5130cfg4);
 
   ZLOGI(TAG, "motor1 initialize TMC51X0:%x", MOTO1.readICVersion());
   ZLOGI(TAG, "motor2 initialize TMC51X0:%x", MOTO2.readICVersion());
diff --git a/usrc/service/pump_ctrl_service.cpp b/usrc/service/pump_ctrl_service.cpp
index c960104..ed1a8ab 100644
--- a/usrc/service/pump_ctrl_service.cpp
+++ b/usrc/service/pump_ctrl_service.cpp
@@ -126,9 +126,7 @@ void PumpCtrlService::acidPrefilling() {
         }
 
         while (!m_thread.getExitFlag()) {
-          if (isAllReachTarget()) {
-            break;
-          }
+          if (isAllReachTarget()) break;
           osDelay(10);
         }
 
@@ -198,16 +196,14 @@ void PumpCtrlService::doMoveOnce() {
     cur_motor->setXACTUAL(0);
     if (pumpselect) {
       ZLOGI(TAG, "pump %d move %f ml", i, distribut_ml);
-      cur_motor->moveBy((int32_t)(distribut_ml + getPumpAppendMl(i)) * 1000, getMxRunRPM(i));
+      //
+      cur_motor->moveBy((int32_t)((distribut_ml + getPumpAppendMl(i)) * 1000), getMxRunRPM(i));
     }
   }
 
   while (!isAllReachTarget() && !m_thread.getExitFlag()) {
-    // ZLOGI(TAG, "wait for motor move to target");
     osDelay(10);
   }
-  ZLOGI(TAG, "do moveOnce finish");
-
   // 回流
   for (size_t i = 0; i < PUMP_NUM; i++) {
     bool pumpselect = GSM->getPumpSelectState(i);