diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index adb54ce..4317995 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 65d7d2b..5867bbb 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 c081e6c..42f0060 100644
--- a/ui/ui.h
+++ b/ui/ui.h
@@ -192,16 +192,13 @@
#define ob_muSettings_pumpCoef3 12
#define ob_muSettings_pipeLenTil 13
#define ob_muSettings_pipeLen0 14
-#define ob_muSettings_pipeLen1 15
-#define ob_muSettings_pipeLen2 16
-#define ob_muSettings_pipeLen3 17
-#define ob_muSettings_addAcidVelTil 18
-#define ob_muSettings_addAcidVel 19
-#define ob_muSettings_bleCliTil 20
-#define ob_muSettings_bleCliName 21
-#define ob_muSettings_bleScan 22
-#define ob_muSettings_pumpTest 23
-#define ob_muSettings_pumpTestTil 24
+#define ob_muSettings_addAcidVelTil 15
+#define ob_muSettings_addAcidVel 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
//muDeviceInfo.objs
#define ob_muDeviceInfo_muDeviceInfo 0
#define ob_muDeviceInfo_bak 1
@@ -242,13 +239,15 @@
#define ob_alert_confirmkey 2
#define ob_alert_info 3
#define ob_alert_frompage 4
+#define ob_alert_t1 5
//confirm.objs
#define ob_confirm_confirm 0
#define ob_confirm_t0 1
-#define ob_confirm_confirmkey 2
+#define ob_confirm_canclekey 2
#define ob_confirm_info 3
-#define ob_confirm_canclekey 4
+#define ob_confirm_confirmkey 4
#define ob_confirm_frompage 5
+#define ob_confirm_t1 6
//keybAcidCh.objs
#define ob_keybAcidCh_keybAcidCh 0
#define ob_keybAcidCh_bak 1
@@ -300,6 +299,7 @@
#define ob_keybdB_b10 24
#define ob_keybdB_b11 25
#define ob_keybdB_loadcmname 26
+#define ob_keybdB_b249 27
//keybdAP.objs
#define ob_keybdAP_keybdAP 0
#define ob_keybdAP_loadpageid 1
@@ -377,8 +377,8 @@
#define ob_keybdAP_bp18 73
#define ob_keybdAP_b10 74
#define ob_keybdAP_b11 75
-#define ob_keybdAP_temp2 76
-#define ob_keybdAP_tempstr 77
+#define ob_keybdAP_tempstr 76
+#define ob_keybdAP_temp2 77
#define ob_keybdAP_loadcmname 78
//keybdA.objs
#define ob_keybdA_keybdA 0
diff --git a/usrc/service/page/submenu/Page_muSettings.cpp b/usrc/service/page/submenu/Page_muSettings.cpp
index 00908ed..6ae4b5f 100644
--- a/usrc/service/page/submenu/Page_muSettings.cpp
+++ b/usrc/service/page/submenu/Page_muSettings.cpp
@@ -6,7 +6,7 @@ using namespace iflytop;
/**
* @brief
- * ËáÀàÐÞ¸ÄÒ³Ãæ
+ * �����޸�ҳ��
*/
#define PAGE pg_muSettings
@@ -42,16 +42,16 @@ void Page_muSettings::initialize() { //
if (packet->cmd == kzble_app_report_key_event) {
int32_t keyEvent = *(int32_t*)packet->data;
if (keyEvent == hand_acid_remoter_kevent_add_liquid) {
- UIS->setTxt(PAGE, ob_muSettings_bleCliName, "¼ÓÒº");
+ UIS->setTxt(PAGE, ob_muSettings_bleCliName, "��Һ");
}
if (keyEvent == hand_acid_remoter_kevent_change_next_mode) {
- UIS->setTxt(PAGE, ob_muSettings_bleCliName, "ģʽÇл»");
+ UIS->setTxt(PAGE, ob_muSettings_bleCliName, "ģʽ�л�");
}
if (keyEvent == hand_acid_remoter_kevent_reflux) {
- UIS->setTxt(PAGE, ob_muSettings_bleCliName, "Һ·»ØÁ÷");
+ UIS->setTxt(PAGE, ob_muSettings_bleCliName, "Һ·����");
}
if (keyEvent == hand_acid_remoter_kevent_preFilling) {
- UIS->setTxt(PAGE, ob_muSettings_bleCliName, "Һ·Ԥ³ä");
+ UIS->setTxt(PAGE, ob_muSettings_bleCliName, "Һ·Ԥ��");
}
return;
}
@@ -70,9 +70,9 @@ void Page_muSettings::updatePage() {
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_pipeLen0, getCfgStr(kcfg_pipeLengthML));
- UIS->setTxt(PAGE, ob_muSettings_pipeLen1, getCfgStr(kcfg_pipeLengthML));
- UIS->setTxt(PAGE, ob_muSettings_pipeLen2, getCfgStr(kcfg_pipeLengthML));
- UIS->setTxt(PAGE, ob_muSettings_pipeLen3, getCfgStr(kcfg_pipeLengthML));
+// UIS->setTxt(PAGE, ob_muSettings_pipeLen1, getCfgStr(kcfg_pipeLengthML));
+// UIS->setTxt(PAGE, ob_muSettings_pipeLen2, getCfgStr(kcfg_pipeLengthML));
+// UIS->setTxt(PAGE, ob_muSettings_pipeLen3, getCfgStr(kcfg_pipeLengthML));
UIS->setTxt(PAGE, ob_muSettings_addAcidVel, getCfgStr(kcfg_pumpDefVel));
}
@@ -82,7 +82,7 @@ void Page_muSettings::OnPageLoad(OnPageLoadContext* cxt) { //
void Page_muSettings::OnAppEvent(AppEvent_t* event) {
if (event->type == kAppEvent_BleConnectEvent) {
ZLOGI(TAG, "ble connect success");
- UIS->setTxt(PAGE, ob_muSettings_bleCliName, "°ó¶¨³É¹¦");
+ UIS->setTxt(PAGE, ob_muSettings_bleCliName, "�󶨳ɹ�");
CS->setcfgAndFlush(kcfg_bleClientName, event->d.bleName);
m_scaning = false;
}
@@ -133,20 +133,21 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
}
- else if (bid == ob_muSettings_pipeLen1) {
- CS->setcfg(kcfg_pipeLengthML, text);
- UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
- }
-
- else if (bid == ob_muSettings_pipeLen2) {
- CS->setcfg(kcfg_pipeLengthML, text);
- UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
- }
-
- else if (bid == ob_muSettings_pipeLen3) {
- CS->setcfg(kcfg_pipeLengthML, text);
- UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
- }
+// else if (bid == ob_muSettings_pipeLen1) {
+// CS->setcfg(kcfg_pipeLengthML, text);
+// UIS->setTxt(b
+ id, getCfgStr(kcfg_pipeLengthML));
+// }
+//
+// else if (bid == ob_muSettings_pipeLen2) {
+// CS->setcfg(kcfg_pipeLengthML, text);
+// UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
+// }
+//
+// else if (bid == ob_muSettings_pipeLen3) {
+// CS->setcfg(kcfg_pipeLengthML, text);
+// UIS->setTxt(bid, getCfgStr(kcfg_pipeLengthML));
+// }
/***********************************************************************************************************************
* addAcidVel *
@@ -165,15 +166,15 @@ void Page_muSettings::OnButton(uint8_t bid, uint8_t val) {
if (bid == ob_muSettings_bak) {
UIS->chpage(GSM->getMenuPage());
if (m_scaning) {
- RCTRL->startScan("XXXXXXXXX", false); // Ï൱ÓÚֹͣɨÃè
+ RCTRL->startScan("XXXXXXXXX", false); // �൱��ֹͣɨ��
}
} else if (bid == ob_muSettings_bleScan) {
ZLOGI(TAG, "bleScan");
bool suc = RCTRL->startScan(BLENAME, true);
- if (suc) UIS->setTxt(PAGE, ob_muSettings_bleCliName, "ɨÃèÖÐ...");
+ if (suc) UIS->setTxt(PAGE, ob_muSettings_bleCliName, "ɨ����...");
m_scaning = true;
}
};
-// muAcidType
\ No newline at end of file
+// muAcidType