diff --git a/uappbase/appcfg/appcfg.hpp b/uappbase/appcfg/appcfg.hpp index 3b00a8d..79c9dc1 100644 --- a/uappbase/appcfg/appcfg.hpp +++ b/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 // 速度零点点切换时间 @@ -71,4 +71,4 @@ #define CH0APPENDML 2.5 #define CH1APPENDML 2.5 #define CH2APPENDML 1 -#define CH3APPENDML 1 \ No newline at end of file +#define CH3APPENDML 1 diff --git a/uappbase/service/config_index.cpp b/uappbase/service/config_index.cpp index c69872f..a6cc66f 100644 --- a/uappbase/service/config_index.cpp +++ b/uappbase/service/config_index.cpp @@ -70,10 +70,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = { /*********************************************************************************************************************** * 电机默认配置 * ***********************************************************************************************************************/ - CFG_ITERM(kcfg_mLPR0, kcfgt_float, "10"), // - CFG_ITERM(kcfg_mLPR1, kcfgt_float, "10"), // - CFG_ITERM(kcfg_mLPR2, kcfgt_float, "10"), // - CFG_ITERM(kcfg_mLPR3, kcfgt_float, "10"), // + 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, "20"), // - CFG_ITERM(kcfg_m1irun, kcfgt_int32, "20"), // - 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, ""), // diff --git a/uappbase/service/config_service.cpp b/uappbase/service/config_service.cpp index 4ebc59b..78d2c3c 100644 --- a/uappbase/service/config_service.cpp +++ b/uappbase/service/config_service.cpp @@ -3,7 +3,7 @@ #include "uappbase\service\app_event_bus.hpp" // -#define CFG_HEADER 0x12345679 +#define CFG_HEADER 0x12345671 /** * @brief CFG内存使用 * diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index 9139320..144a8fe 100644 Binary files a/ui/hand_acid_mainboard_ui.HMI and b/ui/hand_acid_mainboard_ui.HMI differ diff --git a/ui/ui.h b/ui/ui.h index dd11cd8..6cd15e4 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -191,7 +191,7 @@ #define ob_muSettings_pumpCoef2 11 #define ob_muSettings_pumpCoef3 12 #define ob_muSettings_pipeLenTil 13 -#define ob_muSettings_pipeLen0 14 +#define ob_muSettings_pipeLen3 14 #define ob_muSettings_addAcidVelTil 15 #define ob_muSettings_addAcidVel3 16 #define ob_muSettings_bleCliTil 17 @@ -202,6 +202,9 @@ #define ob_muSettings_addAcidVel0 22 #define ob_muSettings_addAcidVel1 23 #define ob_muSettings_addAcidVel2 24 +#define ob_muSettings_pipeLen0 25 +#define ob_muSettings_pipeLen2 26 +#define ob_muSettings_pipeLen1 27 //muDeviceInfo.objs #define ob_muDeviceInfo_muDeviceInfo 0 #define ob_muDeviceInfo_bak 1 diff --git a/usrc/service/page/submenu/Page_muSettings.cpp b/usrc/service/page/submenu/Page_muSettings.cpp index fef49e0..969590f 100644 --- a/usrc/service/page/submenu/Page_muSettings.cpp +++ b/usrc/service/page/submenu/Page_muSettings.cpp @@ -65,10 +65,10 @@ void Page_muSettings::updatePage() { UIS->setTxt(PAGE, ob_muSettings_irun1, zitoa(getMxIRun(1))); UIS->setTxt(PAGE, ob_muSettings_irun2, zitoa(getMxIRun(2))); UIS->setTxt(PAGE, ob_muSettings_irun3, zitoa(getMxIRun(3))); - UIS->setTxt(PAGE, ob_muSettings_pumpCoef0, zfmt("%.1f", getMotorMLPR(0))); - UIS->setTxt(PAGE, ob_muSettings_pumpCoef1, zfmt("%.1f", getMotorMLPR(1))); - UIS->setTxt(PAGE, ob_muSettings_pumpCoef2, zfmt("%.1f", getMotorMLPR(2))); - UIS->setTxt(PAGE, ob_muSettings_pumpCoef3, zfmt("%.1f", getMotorMLPR(3))); + UIS->setTxt(PAGE, ob_muSettings_pumpCoef0, zfmt("%.4f", getMotorMLPR(0))); + UIS->setTxt(PAGE, ob_muSettings_pumpCoef1, zfmt("%.4f", getMotorMLPR(1))); + UIS->setTxt(PAGE, ob_muSettings_pumpCoef2, zfmt("%.4f", getMotorMLPR(2))); + UIS->setTxt(PAGE, ob_muSettings_pumpCoef3, zfmt("%.4f", getMotorMLPR(3))); UIS->setTxt(PAGE, ob_muSettings_pipeLen0, getCfgStr(kcfg_pipeLengthML)); // TODO:改成4个输入框 UIS->setTxt(PAGE, ob_muSettings_addAcidVel0, zitoa(getMxRunRPM(0))); @@ -122,16 +122,16 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { if (bid == ob_muSettings_pumpCoef0) { setMotorMLPR(0, atof(text)); - UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(0))); + UIS->setTxt(bid, zfmt("%.4f", getMotorMLPR(0))); } else if (bid == ob_muSettings_pumpCoef1) { setMotorMLPR(1, atof(text)); - UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(1))); + UIS->setTxt(bid, zfmt("%.4f", getMotorMLPR(1))); } else if (bid == ob_muSettings_pumpCoef2) { setMotorMLPR(2, atof(text)); - UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(2))); + UIS->setTxt(bid, zfmt("%.4f", getMotorMLPR(2))); } else if (bid == ob_muSettings_pumpCoef3) { setMotorMLPR(3, atof(text)); - UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(3))); + UIS->setTxt(bid, zfmt("%.4f", getMotorMLPR(3))); } /*********************************************************************************************************************** @@ -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"); @@ -161,17 +158,21 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { UIS->alert("转速不能大于1000"); return; } - } -if (bid == ob_muSettings_addAcidVel0 || - bid == ob_muSettings_addAcidVel1 || - bid == ob_muSettings_addAcidVel2 || - bid == ob_muSettings_addAcidVel3) { - int rpm = atoi(text); - setMxRunRPM(0, rpm); - setMxRunRPM(1, rpm); - setMxRunRPM(2, rpm); - setMxRunRPM(3, 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)); }