diff --git a/ui/hand_acid_mainboard_zhaohe_edit.HMI b/ui/hand_acid_mainboard_zhaohe_edit.HMI index 105c134..0dbad61 100644 Binary files a/ui/hand_acid_mainboard_zhaohe_edit.HMI and b/ui/hand_acid_mainboard_zhaohe_edit.HMI differ diff --git a/ui/ui.h b/ui/ui.h index 6cd15e4..b629203 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -22,6 +22,9 @@ #define pg_keybdAP 20 #define pg_keybdA 21 #define pg_keyPasswd 22 +#define pg_muBleHandSett 23 +#define pg_muMotorSett 24 +#define pg_muPumpSett 25 //gvar.objs #define ob_gvar_gvar 0 #define ob_gvar_menupageid 1 @@ -205,6 +208,9 @@ #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 //muDeviceInfo.objs #define ob_muDeviceInfo_muDeviceInfo 0 #define ob_muDeviceInfo_bak 1 @@ -306,6 +312,8 @@ #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 //keybdAP.objs #define ob_keybdAP_keybdAP 0 #define ob_keybdAP_loadpageid 1 @@ -386,6 +394,8 @@ #define ob_keybdAP_tempstr 76 #define ob_keybdAP_temp2 77 #define ob_keybdAP_loadcmname 78 +#define ob_keybdAP_clear 79 +#define ob_keybdAP_m0 80 //keybdA.objs #define ob_keybdA_keybdA 0 #define ob_keybdA_loadpageid 1 @@ -439,6 +449,8 @@ #define ob_keybdA_tempstr 49 #define ob_keybdA_temp2 50 #define ob_keybdA_loadcmname 51 +#define ob_keybdA_clear 52 +#define ob_keybdA_m0 53 //keyPasswd.objs #define ob_keyPasswd_keyPasswd 0 #define ob_keyPasswd_b0 1 @@ -466,3 +478,39 @@ #define ob_keyPasswd_tempstr 23 #define ob_keyPasswd_b249 24 #define ob_keyPasswd_loadcmname 25 +#define ob_keyPasswd_m0 26 +#define ob_keyPasswd_clear 27 +//muBleHandSett.objs +#define ob_muBleHandSett_muBleHandSett 0 +#define ob_muBleHandSett_bak 1 +#define ob_muBleHandSett_pageTitle 2 +#define ob_muBleHandSett_bleCliName 3 +#define ob_muBleHandSett_bleScan 4 +//muMotorSett.objs +#define ob_muMotorSett_muMotorSett 0 +#define ob_muMotorSett_irunTil 1 +#define ob_muMotorSett_bak 2 +#define ob_muMotorSett_irun0 3 +#define ob_muMotorSett_pageTitle 4 +#define ob_muMotorSett_irun1 5 +#define ob_muMotorSett_irun2 6 +#define ob_muMotorSett_irun3 7 +//muPumpSett.objs +#define ob_muPumpSett_muPumpSett 0 +#define ob_muPumpSett_bak 1 +#define ob_muPumpSett_pageTitle 2 +#define ob_muPumpSett_pumpCoefTil 3 +#define ob_muPumpSett_pumpCoef0 4 +#define ob_muPumpSett_pumpCoef1 5 +#define ob_muPumpSett_pumpCoef2 6 +#define ob_muPumpSett_pumpCoef3 7 +#define ob_muPumpSett_pipeLenTil 8 +#define ob_muPumpSett_pipeLen3 9 +#define ob_muPumpSett_addAcidVelTil 10 +#define ob_muPumpSett_addAcidVel3 11 +#define ob_muPumpSett_addAcidVel0 12 +#define ob_muPumpSett_addAcidVel1 13 +#define ob_muPumpSett_addAcidVel2 14 +#define ob_muPumpSett_pipeLen0 15 +#define ob_muPumpSett_pipeLen2 16 +#define ob_muPumpSett_pipeLen1 17