fix some bug

uappbase/appcfg/appcfg.hpp

@@ -29,7 +29,7 @@
 #define STEPMOTOR_IHOLDDELAY 100
 #define MOTOR_VSTART         50   // 启动速度
 #define MOTOR_A1             15   // 阶段1_加速度
-#define MOTOR_AMAX           50   // 阶段2_加速度
+#define MOTOR_AMAX           30   // 阶段2_加速度
 #define MOTOR_V1             300  // 阶段2_开始速度
 #define MOTOR_TZEROWAIT      100  // 速度零点点切换时间
 
@@ -65,4 +65,4 @@
 #define ACID_DEFAULT_NAME14 "一氯乙酸"
 #define ACID_DEFAULT_NAME15 "氢氟酸"
 
-#define PUMPDEFVEL "800"  // 100r/min
+#define PUMPDEFVEL "500"  // 100r/min

uappbase/service/config_index.cpp

@@ -70,10 +70,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
     /***********************************************************************************************************************
      *                                                    µç»úĬÈÏÅäÖà                                                     *
      ***********************************************************************************************************************/
-    CFG_ITERM(kcfg_mLPR0, kcfgt_float, "0.6372"),  //
-    CFG_ITERM(kcfg_mLPR1, kcfgt_float, "0.6372"),  //
-    CFG_ITERM(kcfg_mLPR2, kcfgt_float, "0.1538"),  //
-    CFG_ITERM(kcfg_mLPR3, kcfgt_float, "0.1538"),  //
+    CFG_ITERM(kcfg_mLPR0, kcfgt_float, "0.7000"),  //
+    CFG_ITERM(kcfg_mLPR1, kcfgt_float, "0.6800"),  //
+    CFG_ITERM(kcfg_mLPR2, kcfgt_float, "0.1300"),  //
+    CFG_ITERM(kcfg_mLPR3, kcfgt_float, "0.1400"),  //
 
     /***********************************************************************************************************************
      *                                                      ÆäËûÅäÖà                                                       *
@@ -88,10 +88,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
     CFG_ITERM(kcfg_pumpDefVel2, kcfgt_int32, PUMPDEFVEL),  //
     CFG_ITERM(kcfg_pumpDefVel3, kcfgt_int32, PUMPDEFVEL),  //
 
-    CFG_ITERM(kcfg_m0irun, kcfgt_int32, "31"),  //
-    CFG_ITERM(kcfg_m1irun, kcfgt_int32, "31"),  //
-    CFG_ITERM(kcfg_m2irun, kcfgt_int32, "20"),  //
-    CFG_ITERM(kcfg_m3irun, kcfgt_int32, "20"),  //
+    CFG_ITERM(kcfg_m0irun, kcfgt_int32, "22"),  //
+    CFG_ITERM(kcfg_m1irun, kcfgt_int32, "22"),  //
+    CFG_ITERM(kcfg_m2irun, kcfgt_int32, "22"),  //
+    CFG_ITERM(kcfg_m3irun, kcfgt_int32, "22"),  //
 
     CFG_ITERM(kcfg_bleClientName, kcfgt_str, ""),  //
 

uappbase/service/config_service.cpp

@@ -3,7 +3,7 @@
 #include "uappbase\service\app_event_bus.hpp"
 //
 
-#define CFG_HEADER 0x12345670
+#define CFG_HEADER 0x12345671
 /**
  * @brief CFG内存使用
  *

usrc/service/page/submenu/Page_muSettings.cpp

@@ -147,10 +147,7 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
    *                                                      addAcidVel                                                      *
    ***********************************************************************************************************************/
   // TODO改成4个输入框
-  if (bid == ob_muSettings_addAcidVel0 || 
-      bid == ob_muSettings_addAcidVel1 || 
-      bid == ob_muSettings_addAcidVel2 || 
-      bid == ob_muSettings_addAcidVel3) {
+  if (bid == ob_muSettings_addAcidVel0 || bid == ob_muSettings_addAcidVel1 || bid == ob_muSettings_addAcidVel2 || bid == ob_muSettings_addAcidVel3) {
     int rpm = atoi(text);
     if (rpm < 300) {
       UIS->alert("转速不能小于300");
@@ -162,15 +159,21 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
       return;
     }
 
-    switch(bid)
-  {
-    case ob_muSettings_addAcidVel0:setMxRunRPM(0, rpm);break;
-    case ob_muSettings_addAcidVel1:setMxRunRPM(1, rpm);break;
-    case ob_muSettings_addAcidVel2:setMxRunRPM(2, rpm);break;
-    case ob_muSettings_addAcidVel3:setMxRunRPM(3, rpm);break;
-  }
-  UIS->setTxt(bid, zitoa(rpm));
-
+    switch (bid) {
+      case ob_muSettings_addAcidVel0:
+        setMxRunRPM(0, rpm);
+        break;
+      case ob_muSettings_addAcidVel1:
+        setMxRunRPM(1, rpm);
+        break;
+      case ob_muSettings_addAcidVel2:
+        setMxRunRPM(2, rpm);
+        break;
+      case ob_muSettings_addAcidVel3:
+        setMxRunRPM(3, rpm);
+        break;
+    }
+    UIS->setTxt(bid, zitoa(rpm));
   }
 
   updatePage();