diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 1eb30e0..bd97006 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index 5867bbb..9139320 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 42f0060..dd11cd8 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -193,12 +193,15 @@ #define ob_muSettings_pipeLenTil 13 #define ob_muSettings_pipeLen0 14 #define ob_muSettings_addAcidVelTil 15 -#define ob_muSettings_addAcidVel 16 +#define ob_muSettings_addAcidVel3 16 #define ob_muSettings_bleCliTil 17 #define ob_muSettings_bleCliName 18 #define ob_muSettings_bleScan 19 #define ob_muSettings_pumpTest 20 #define ob_muSettings_pumpTestTil 21 +#define ob_muSettings_addAcidVel0 22 +#define ob_muSettings_addAcidVel1 23 +#define ob_muSettings_addAcidVel2 24 //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 8bf72f3..bea6b80 100644 --- a/usrc/service/page/submenu/Page_muSettings.cpp +++ b/usrc/service/page/submenu/Page_muSettings.cpp @@ -71,10 +71,10 @@ void Page_muSettings::updatePage() { UIS->setTxt(PAGE, ob_muSettings_pumpCoef3, zfmt("%.1f", getMotorMLPR(3))); UIS->setTxt(PAGE, ob_muSettings_pipeLen0, getCfgStr(kcfg_pipeLengthML)); // TODO:改成4个输入框 - UIS->setTxt(PAGE, ob_muSettings_addAcidVel, zitoa(getMxRunRPM(0))); - UIS->setTxt(PAGE, ob_muSettings_addAcidVel, zitoa(getMxRunRPM(1))); - UIS->setTxt(PAGE, ob_muSettings_addAcidVel, zitoa(getMxRunRPM(2))); - UIS->setTxt(PAGE, ob_muSettings_addAcidVel, zitoa(getMxRunRPM(3))); + UIS->setTxt(PAGE, ob_muSettings_addAcidVel0, zitoa(getMxRunRPM(0))); + UIS->setTxt(PAGE, ob_muSettings_addAcidVel1, zitoa(getMxRunRPM(1))); + UIS->setTxt(PAGE, ob_muSettings_addAcidVel2, zitoa(getMxRunRPM(2))); + UIS->setTxt(PAGE, ob_muSettings_addAcidVel3, zitoa(getMxRunRPM(3))); } void Page_muSettings::OnPageLoad(OnPageLoadContext* cxt) { // @@ -147,7 +147,7 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { * addAcidVel * ***********************************************************************************************************************/ // TODO改成4个输入框 - if (bid == ob_muSettings_addAcidVel) { + if (bid == ob_muSettings_addAcidVel0) { int rpm = atoi(text); if (rpm < 300) { UIS->alert("转速不能小于300"); @@ -160,7 +160,7 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { } } - if (bid == ob_muSettings_addAcidVel) { + if (bid == ob_muSettings_addAcidVel1) { int rpm = atoi(text); setMxRunRPM(0, rpm); setMxRunRPM(1, rpm);