diff --git a/uappbase/service/config_index.cpp b/uappbase/service/config_index.cpp index b6917fb..aacb5b6 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.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"), // /*********************************************************************************************************************** * 其他配置 * @@ -88,8 +88,8 @@ 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_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"), // diff --git a/uappbase/service/config_service.cpp b/uappbase/service/config_service.cpp index 4ebc59b..461e1f1 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 0x12345670 /** * @brief CFG内存使用 * diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index 9139320..aa375cb 100644 Binary files a/ui/hand_acid_mainboard_ui.HMI and b/ui/hand_acid_mainboard_ui.HMI differ diff --git a/usrc/service/page/submenu/Page_muSettings.cpp b/usrc/service/page/submenu/Page_muSettings.cpp index fef49e0..55b8ea7 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))); } /*********************************************************************************************************************** @@ -161,18 +161,16 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { UIS->alert("转速不能大于1000"); 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)); -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); - UIS->setTxt(bid, zitoa(rpm)); } updatePage();