diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index adb54ce..cb0df47 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/ui/exp_pages/muBleHandSett.page b/ui/exp_pages/muBleHandSett.page new file mode 100644 index 0000000..694f76e Binary files /dev/null and b/ui/exp_pages/muBleHandSett.page differ diff --git a/ui/exp_pages/muMotorSett.page b/ui/exp_pages/muMotorSett.page new file mode 100644 index 0000000..86d10e8 Binary files /dev/null and b/ui/exp_pages/muMotorSett.page differ diff --git a/ui/exp_pages/muPumpSett.page b/ui/exp_pages/muPumpSett.page new file mode 100644 index 0000000..014ab87 Binary files /dev/null and b/ui/exp_pages/muPumpSett.page differ diff --git a/ui/exp_pages/muSetting.page b/ui/exp_pages/muSetting.page new file mode 100644 index 0000000..8f74f12 Binary files /dev/null and b/ui/exp_pages/muSetting.page differ diff --git a/ui/hand_acid_mainboard_ui upadte.HMI b/ui/hand_acid_mainboard_ui upadte.HMI new file mode 100644 index 0000000..346bb34 Binary files /dev/null and b/ui/hand_acid_mainboard_ui upadte.HMI differ diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index 6735b9b..ad360de 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 b629203..da7625e 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -29,6 +29,7 @@ #define ob_gvar_gvar 0 #define ob_gvar_menupageid 1 #define ob_gvar_bt0 2 +#define ob_gvar_q0 3 //pStart.objs #define ob_pStart_pStart 0 #define ob_pStart_j0 1 @@ -52,6 +53,7 @@ #define ob_login_uen3 15 #define ob_login_uen4 16 #define ob_login_uen5 17 +#define ob_login_t2 18 //main.objs #define ob_main_main 0 #define ob_main_acidch0 1 @@ -140,6 +142,7 @@ #define ob_muUsrMgr_usr3ReName 22 #define ob_muUsrMgr_usr4ReName 23 #define ob_muUsrMgr_usr5ReName 24 +#define ob_muUsrMgr_t2 25 //muTmrMgr.objs #define ob_muTmrMgr_muTmrMgr 0 #define ob_muTmrMgr_select0 1 @@ -151,6 +154,7 @@ #define ob_muTmrMgr_select5 7 #define ob_muTmrMgr_b0 8 #define ob_muTmrMgr_t0 9 +#define ob_muTmrMgr_t2 10 //muAcidType.objs #define ob_muAcidType_muAcidType 0 #define ob_muAcidType_bak 1 @@ -169,6 +173,7 @@ #define ob_muAcidType_t13 14 #define ob_muAcidType_t14 15 #define ob_muAcidType_t15 16 +#define ob_muAcidType_t0 17 //changePasswd.objs #define ob_changePasswd_changePasswd 0 #define ob_changePasswd_newPwdTil 1 @@ -179,38 +184,15 @@ #define ob_changePasswd_bak 6 #define ob_changePasswd_oldPwdTil 7 #define ob_changePasswd_oldPwd 8 +#define ob_changePasswd_t0 9 //muSettings.objs #define ob_muSettings_muSettings 0 -#define ob_muSettings_irunTil 1 -#define ob_muSettings_bak 2 -#define ob_muSettings_irun0 3 -#define ob_muSettings_pageTitle 4 -#define ob_muSettings_irun1 5 -#define ob_muSettings_irun2 6 -#define ob_muSettings_irun3 7 -#define ob_muSettings_pumpCoefTil 8 -#define ob_muSettings_pumpCoef0 9 -#define ob_muSettings_pumpCoef1 10 -#define ob_muSettings_pumpCoef2 11 -#define ob_muSettings_pumpCoef3 12 -#define ob_muSettings_pipeLenTil 13 -#define ob_muSettings_pipeLen3 14 -#define ob_muSettings_addAcidVelTil 15 -#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 -#define ob_muSettings_pipeLen0 25 -#define ob_muSettings_pipeLen2 26 -#define ob_muSettings_pipeLen1 27 -#define ob_muSettings_pumpSett 28 -#define ob_muSettings_motorSett 29 -#define ob_muSettings_muBleHandSett 30 +#define ob_muSettings_bak 1 +#define ob_muSettings_pageTitle 2 +#define ob_muSettings_pumpTest 3 +#define ob_muSettings_pumpSett 4 +#define ob_muSettings_motorSett 5 +#define ob_muSettings_muBleHandSett 6 //muDeviceInfo.objs #define ob_muDeviceInfo_muDeviceInfo 0 #define ob_muDeviceInfo_bak 1 @@ -229,6 +211,7 @@ #define ob_muAudit_t2 4 #define ob_muAudit_b0 5 #define ob_muAudit_b1 6 +#define ob_muAudit_t3 7 //muPumpTest.objs #define ob_muPumpTest_muPumpTest 0 #define ob_muPumpTest_frompage 1 @@ -298,22 +281,22 @@ #define ob_keybdB_b8 11 #define ob_keybdB_b200 12 #define ob_keybdB_b9 13 -#define ob_keybdB_loadpageid 14 -#define ob_keybdB_tm0 15 -#define ob_keybdB_loadcmpid 16 -#define ob_keybdB_input 17 -#define ob_keybdB_temp 18 -#define ob_keybdB_inputlenth 19 -#define ob_keybdB_t2 20 -#define ob_keybdB_b251 21 -#define ob_keybdB_temp2 22 -#define ob_keybdB_tempstr 23 -#define ob_keybdB_b10 24 -#define ob_keybdB_b11 25 -#define ob_keybdB_loadcmname 26 -#define ob_keybdB_b249 27 -#define ob_keybdB_clear 28 -#define ob_keybdB_m0 29 +#define ob_keybdB_t2 14 +#define ob_keybdB_b251 15 +#define ob_keybdB_b10 16 +#define ob_keybdB_b11 17 +#define ob_keybdB_b249 18 +#define ob_keybdB_m0 19 +#define ob_keybdB_loadpageid 20 +#define ob_keybdB_tm0 21 +#define ob_keybdB_loadcmpid 22 +#define ob_keybdB_input 23 +#define ob_keybdB_temp 24 +#define ob_keybdB_inputlenth 25 +#define ob_keybdB_temp2 26 +#define ob_keybdB_tempstr 27 +#define ob_keybdB_loadcmname 28 +#define ob_keybdB_clear 29 //keybdAP.objs #define ob_keybdAP_keybdAP 0 #define ob_keybdAP_loadpageid 1