diff --git a/ui/hand_acid_mainboard_ui upadte.HMI b/ui/hand_acid_mainboard_ui upadte.HMI index 346bb34..ce50721 100644 Binary files a/ui/hand_acid_mainboard_ui upadte.HMI and b/ui/hand_acid_mainboard_ui upadte.HMI differ diff --git a/ui/ui.h b/ui/ui.h index da7625e..217201f 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -12,19 +12,19 @@ #define pg_muAcidType 10 #define pg_changePasswd 11 #define pg_muSettings 12 -#define pg_muDeviceInfo 13 -#define pg_muAudit 14 -#define pg_muPumpTest 15 -#define pg_alert 16 -#define pg_confirm 17 -#define pg_keybAcidCh 18 -#define pg_keybdB 19 -#define pg_keybdAP 20 -#define pg_keybdA 21 -#define pg_keyPasswd 22 -#define pg_muBleHandSett 23 -#define pg_muMotorSett 24 -#define pg_muPumpSett 25 +#define pg_muBleHandSett 13 +#define pg_muMotorSett 14 +#define pg_muPumpSett 15 +#define pg_muDeviceInfo 16 +#define pg_muAudit 17 +#define pg_muPumpTest 18 +#define pg_alert 19 +#define pg_confirm 20 +#define pg_keybAcidCh 21 +#define pg_keybdB 22 +#define pg_keybdAP 23 +#define pg_keybdA 24 +#define pg_keyPasswd 25 //gvar.objs #define ob_gvar_gvar 0 #define ob_gvar_menupageid 1 @@ -80,6 +80,7 @@ #define ob_main_acidname3 22 #define ob_main_acideval3 23 #define ob_main_RunModeValUint 24 +#define ob_main_sysInfo1 25 //menuAdmin.objs #define ob_menuAdmin_menuAdmin 0 #define ob_menuAdmin_home 1 @@ -193,6 +194,48 @@ #define ob_muSettings_pumpSett 4 #define ob_muSettings_motorSett 5 #define ob_muSettings_muBleHandSett 6 +//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 +#define ob_muMotorSett_t0 8 +#define ob_muMotorSett_t1 9 +#define ob_muMotorSett_t2 10 +#define ob_muMotorSett_t3 11 +//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 +#define ob_muPumpSett_t0 18 +#define ob_muPumpSett_t1 19 +#define ob_muPumpSett_t2 20 +#define ob_muPumpSett_t3 21 //muDeviceInfo.objs #define ob_muDeviceInfo_muDeviceInfo 0 #define ob_muDeviceInfo_bak 1 @@ -463,37 +506,3 @@ #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