diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index adb54ce..5a79ae1 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/release/V200/hand_acid_mainboard_ui upadte.HMI b/release/V200/hand_acid_mainboard_ui upadte.HMI index e286fae..3218e5d 100644 Binary files a/release/V200/hand_acid_mainboard_ui upadte.HMI and b/release/V200/hand_acid_mainboard_ui upadte.HMI differ diff --git a/uappbase/appcfg/appcfg.hpp b/uappbase/appcfg/appcfg.hpp index 97cbf48..672728d 100644 --- a/uappbase/appcfg/appcfg.hpp +++ b/uappbase/appcfg/appcfg.hpp @@ -27,10 +27,10 @@ #define MOTOR_SHAFT false #define STEPMOTOR_IHOLD 10 #define STEPMOTOR_IHOLDDELAY 100 -#define MOTOR_VSTART 50 // 启动速度 -#define MOTOR_A1 15 // 阶段1_加速度 -#define MOTOR_AMAX 30 // 阶段2_加速度 -#define MOTOR_V1 300 // 阶段2_开始速度 +#define MOTOR_VSTART 150 // 启动速度 +#define MOTOR_A1 5 // 阶段1_加速度 +#define MOTOR_AMAX 20 // 阶段2_加速度 +#define MOTOR_V1 500 // 阶段2_开始速度 #define MOTOR_TZEROWAIT 100 // 速度零点点切换时间 #define BLENAME "AciDisp" // BLE名字 diff --git a/uappbase/bean/config_index_enum.hpp b/uappbase/bean/config_index_enum.hpp index f8c4c2b..06acdac 100644 --- a/uappbase/bean/config_index_enum.hpp +++ b/uappbase/bean/config_index_enum.hpp @@ -16,7 +16,7 @@ typedef enum { kusr_passwd2, // 用户2密码 kusr_name3, // 用户3名字 kusr_enable3, // 用户3是否使能 - kusr_passwd3, // 用户3密码 + kusr_passwd3, // 用Ppa户3密码 kusr_name4, // 用户4名字 kusr_enable4, // 用户4是否使能 kusr_passwd4, // 用户4密码 @@ -46,56 +46,6 @@ typedef enum { kcfg_acidName14, // 酸液中预设名字 kcfg_acidName15, // 酸液中预设名字 - kcfg_usr2AcidChooseName0, // 酸液0 选择的名字 - kcfg_usr2AcidChooseName1, // 酸液1 选择的名字 - kcfg_usr2AcidChooseName2, // 酸液2 选择的名字 - kcfg_usr2AcidChooseName3, // 酸液3 选择的名字 - - kcfg_usr3AcidChooseName0, // 酸液0 选择的名字 - kcfg_usr3AcidChooseName1, // 酸液1 选择的名字 - kcfg_usr3AcidChooseName2, // 酸液2 选择的名字 - kcfg_usr3AcidChooseName3, // 酸液3 选择的名字 - - kcfg_usr4AcidChooseName0, // 酸液0 选择的名字 - kcfg_usr4AcidChooseName1, // 酸液1 选择的名字 - kcfg_usr4AcidChooseName2, // 酸液2 选择的名字 - kcfg_usr4AcidChooseName3, // 酸液3 选择的名字 - - kcfg_usr5AcidChooseName0, // 酸液0 选择的名字 - kcfg_usr5AcidChooseName1, // 酸液1 选择的名字 - kcfg_usr5AcidChooseName2, // 酸液2 选择的名字 - kcfg_usr5AcidChooseName3, // 酸液3 选择的名字 - - kcfg_usr6AcidChooseName0, // 酸液0 选择的名字 - kcfg_usr6AcidChooseName1, // 酸液1 选择的名字 - kcfg_usr6AcidChooseName2, // 酸液2 选择的名字 - kcfg_usr6AcidChooseName3, // 酸液3 选择的名字 - - kcfg_usr2AcidCapacityLimite0, - kcfg_usr2AcidCapacityLimite1, - kcfg_usr2AcidCapacityLimite2, - kcfg_usr2AcidCapacityLimite3, - - kcfg_usr3AcidCapacityLimite0, - kcfg_usr3AcidCapacityLimite1, - kcfg_usr3AcidCapacityLimite2, - kcfg_usr3AcidCapacityLimite3, - - kcfg_usr4AcidCapacityLimite0, - kcfg_usr4AcidCapacityLimite1, - kcfg_usr4AcidCapacityLimite2, - kcfg_usr4AcidCapacityLimite3, - - kcfg_usr5AcidCapacityLimite0, - kcfg_usr5AcidCapacityLimite1, - kcfg_usr5AcidCapacityLimite2, - kcfg_usr5AcidCapacityLimite3, - - kcfg_usr6AcidCapacityLimite0, - kcfg_usr6AcidCapacityLimite1, - kcfg_usr6AcidCapacityLimite2, - kcfg_usr6AcidCapacityLimite3, - /*********************************************************************************************************************** * 酸液通道选择名称 * ***********************************************************************************************************************/ @@ -126,11 +76,11 @@ typedef enum { ***********************************************************************************************************************/ kcfg_lockAcidName, // 锁定酸液名称 kcfg_echDitrUpLi, // 每次分配上限设定值 each distri up-limit + kcfg_distrInterval, // 每次分配间隔时间 kcfg_pumpDefVel0, // 泵机默认速度r/min kcfg_pumpDefVel1, // 泵机默认速度r/min kcfg_pumpDefVel2, // 泵机默认速度r/min kcfg_pumpDefVel3, // 泵机默认速度r/min - kcfg_distrInterval, // 每次分配间隔时间 /*********************************************************************************************************************** * 回流参数配置 * @@ -147,6 +97,37 @@ typedef enum { kcfg_bleClientName, + kcfg_recordNum, + kcfg_grantAcidName0, + kcfg_getAcidUsr0, + kcfg_usrAcidChooseName0, // 酸液0 选择的名字 + kcfg_usrAcidCapacityLimite0, + + kcfg_grantAcidName1, + kcfg_getAcidUsr1, + kcfg_usrAcidChooseName1, + kcfg_usrAcidCapacityLimite1, + + kcfg_grantAcidName2, + kcfg_getAcidUsr2, + kcfg_usrAcidChooseName2, // 酸液0 选择的名字 + kcfg_usrAcidCapacityLimite2, + + kcfg_grantAcidName3, + kcfg_getAcidUsr3, + kcfg_usrAcidChooseName3, // 酸液0 选择的名字 + kcfg_usrAcidCapacityLimite3, + + kcfg_grantAcidName4, + kcfg_getAcidUsr4, + kcfg_usrAcidChooseName4, // 酸液0 选择的名字 + kcfg_usrAcidCapacityLimite4, + + kcfg_grantAcidName5, + kcfg_getAcidUsr5, + kcfg_usrAcidChooseName5, // 酸液0 选择的名字 + kcfg_usrAcidCapacityLimite5, + kcfg_max, } config_index_t; diff --git a/uappbase/service/config_index.cpp b/uappbase/service/config_index.cpp index 46f4268..cb191a4 100644 --- a/uappbase/service/config_index.cpp +++ b/uappbase/service/config_index.cpp @@ -56,44 +56,6 @@ static cfg_iterm_info_t cfg_iterm_infos[] = { CFG_ITERM(kcfg_acidName15, kcfgt_str, ACID_DEFAULT_NAME15), // /*********************************************************************************************************************** - * 不同用户酸液预设名称 * - ***********************************************************************************************************************/ - CFG_ITERM(kcfg_usr2AcidChooseName0, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr2AcidChooseName1, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr2AcidChooseName2, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr2AcidChooseName3, kcfgt_str, "未设置"), // - - CFG_ITERM(kcfg_usr3AcidChooseName0, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr3AcidChooseName1, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr3AcidChooseName2, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr3AcidChooseName3, kcfgt_str, "未设置"), // - - CFG_ITERM(kcfg_usr4AcidChooseName0, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr4AcidChooseName1, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr4AcidChooseName2, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr4AcidChooseName3, kcfgt_str, "未设置"), // - - CFG_ITERM(kcfg_usr5AcidChooseName0, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr5AcidChooseName1, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr5AcidChooseName2, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr5AcidChooseName3, kcfgt_str, "未设置"), // - - CFG_ITERM(kcfg_usr6AcidChooseName0, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr6AcidChooseName1, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr6AcidChooseName2, kcfgt_str, "未设置"), // - CFG_ITERM(kcfg_usr6AcidChooseName3, kcfgt_str, "未设置"), // - - CFG_ITERM(kcfg_usr2AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr2AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr2AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr2AcidCapacityLimite3, kcfgt_str, "0"), - - CFG_ITERM(kcfg_usr3AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr3AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr3AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr3AcidCapacityLimite3, kcfgt_str, "0"), - - CFG_ITERM(kcfg_usr4AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr4AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr4AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr4AcidCapacityLimite3, kcfgt_str, "0"), - - CFG_ITERM(kcfg_usr5AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr5AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr5AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr5AcidCapacityLimite3, kcfgt_str, "0"), - - CFG_ITERM(kcfg_usr6AcidCapacityLimite0, kcfgt_str, "0"), CFG_ITERM(kcfg_usr6AcidCapacityLimite1, kcfgt_str, "0"), CFG_ITERM(kcfg_usr6AcidCapacityLimite2, kcfgt_str, "0"), CFG_ITERM(kcfg_usr6AcidCapacityLimite3, kcfgt_str, "0"), - - /*********************************************************************************************************************** * 酸液通道选择名称 * ***********************************************************************************************************************/ CFG_ITERM(kcfg_acidChooseName0, kcfgt_str, "未设置"), // @@ -116,10 +78,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = { CFG_ITERM(kcfg_mLPR1, kcfgt_float, "0.6900"), // CFG_ITERM(kcfg_mLPR2, kcfgt_float, "0.1350"), // CFG_ITERM(kcfg_mLPR3, kcfgt_float, "0.1350"), // */ - CFG_ITERM(kcfg_mLPR1, kcfgt_float, "1"), // - CFG_ITERM(kcfg_mLPR0, kcfgt_float, "1"), // - CFG_ITERM(kcfg_mLPR2, kcfgt_float, "1"), // - CFG_ITERM(kcfg_mLPR3, kcfgt_float, "1"), // + CFG_ITERM(kcfg_mLPR1, kcfgt_float, "1.0"), // + CFG_ITERM(kcfg_mLPR0, kcfgt_float, "1.0"), // + CFG_ITERM(kcfg_mLPR2, kcfgt_float, "1.0"), // + CFG_ITERM(kcfg_mLPR3, kcfgt_float, "1.0"), // /*********************************************************************************************************************** * 其他配置 * @@ -134,13 +96,6 @@ static cfg_iterm_info_t cfg_iterm_infos[] = { CFG_ITERM(kcfg_pumpDefVel2, kcfgt_int32, PUMPDEFVEL), // CFG_ITERM(kcfg_pumpDefVel3, kcfgt_int32, PUMPDEFVEL), // - CFG_ITERM(kcfg_m0irun, kcfgt_int32, "22"), // - CFG_ITERM(kcfg_m1irun, kcfgt_int32, "22"), // - CFG_ITERM(kcfg_m2irun, kcfgt_int32, "22"), // - CFG_ITERM(kcfg_m3irun, kcfgt_int32, "22"), // - - CFG_ITERM(kcfg_bleClientName, kcfgt_str, ""), // - /*********************************************************************************************************************** * 回流参数配置 * ***********************************************************************************************************************/ @@ -153,6 +108,44 @@ static cfg_iterm_info_t cfg_iterm_infos[] = { CFG_ITERM(kcfg_pipeLengthML1, kcfgt_float, "35.5"), // CFG_ITERM(kcfg_pipeLengthML2, kcfgt_float, "35.5"), // CFG_ITERM(kcfg_pipeLengthML3, kcfgt_float, "35.5"), // + // + + CFG_ITERM(kcfg_m0irun, kcfgt_int32, "22"), // + CFG_ITERM(kcfg_m1irun, kcfgt_int32, "22"), // + CFG_ITERM(kcfg_m2irun, kcfgt_int32, "22"), // + CFG_ITERM(kcfg_m3irun, kcfgt_int32, "22"), // + + CFG_ITERM(kcfg_bleClientName, kcfgt_str, " "), + /*********************************************************************************************************************** + * 领酸记录 * + ***********************************************************************************************************************/ + + CFG_ITERM(kcfg_recordNum, kcfgt_int32, "0"), // + CFG_ITERM(kcfg_grantAcidName0, kcfgt_str, ""), // + CFG_ITERM(kcfg_getAcidUsr0, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidChooseName0, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidCapacityLimite0, kcfgt_str, ""), // + CFG_ITERM(kcfg_grantAcidName1, kcfgt_str, ""), // + CFG_ITERM(kcfg_getAcidUsr1, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidChooseName1, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidCapacityLimite1, kcfgt_str, ""), // + CFG_ITERM(kcfg_grantAcidName2, kcfgt_str, ""), // + CFG_ITERM(kcfg_getAcidUsr2, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidChooseName2, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidCapacityLimite2, kcfgt_str, ""), // + CFG_ITERM(kcfg_grantAcidName3, kcfgt_str, ""), // + CFG_ITERM(kcfg_getAcidUsr3, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidChooseName3, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidCapacityLimite3, kcfgt_str, ""), // + CFG_ITERM(kcfg_grantAcidName4, kcfgt_str, ""), // + CFG_ITERM(kcfg_getAcidUsr4, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidChooseName4, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidCapacityLimite4, kcfgt_str, ""), // + CFG_ITERM(kcfg_grantAcidName5, kcfgt_str, ""), // + CFG_ITERM(kcfg_getAcidUsr5, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidChooseName5, kcfgt_str, ""), // + CFG_ITERM(kcfg_usrAcidCapacityLimite5, kcfgt_str, ""), // + }; const char *cfgName(int32_t index) { diff --git a/uappbase/service/config_index.hpp b/uappbase/service/config_index.hpp index eb6cf20..12bd09e 100644 --- a/uappbase/service/config_index.hpp +++ b/uappbase/service/config_index.hpp @@ -19,7 +19,7 @@ typedef struct { const char *initval; } cfg_iterm_info_t; -#define CFG_MAX_INDEX 104 +#define CFG_MAX_INDEX 89 const char *cfgName(int32_t index); cfg_iterm_type_t cfgType(int32_t index); diff --git a/uappbase/service/config_service.cpp b/uappbase/service/config_service.cpp index d6c6fef..18f6782 100644 --- a/uappbase/service/config_service.cpp +++ b/uappbase/service/config_service.cpp @@ -3,7 +3,7 @@ #include "uappbase\service\app_event_bus.hpp" // -#define CFG_HEADER 0x12345672 +#define CFG_HEADER 0x12345676 /** * @brief CFG内存使用 * diff --git a/uappbase/service/config_service_utils.cpp b/uappbase/service/config_service_utils.cpp index a41ebef..df35b5c 100644 --- a/uappbase/service/config_service_utils.cpp +++ b/uappbase/service/config_service_utils.cpp @@ -4,7 +4,7 @@ namespace iflytop { float getPumpAppendMl(int chid) { switch (chid) { case 0: - return CH0APPENDML; // + return CH0APPENDML; // case 1: return CH1APPENDML; case 2: @@ -194,6 +194,12 @@ const char* getPasswd(const char* usrname, CfgItermCache* cache) { memcpy(cache, &cfgcache, sizeof(CfgItermCache)); return cache->buf; } + + if (strcmp(usrname, getCfgStr(kusr_name6)) == 0) { + getCfgStr(kusr_passwd6); + memcpy(cache, &cfgcache, sizeof(CfgItermCache)); + return cache->buf; + } return NULL; } diff --git a/ui/ui.h b/ui/ui.h index f7933a9..93ac743 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -1,540 +1,564 @@ -// pages -#define pg_gvar 0 -#define pg_pStart 1 -#define pg_login 2 -#define pg_main 3 -#define pg_menuAdmin 4 -#define pg_menuAdmin2 5 -#define pg_muneWarehouse 6 -#define pg_menuUsr 7 -#define pg_muInterval 8 -#define pg_muUsrMgr 9 -#define pg_muTmrMgr 10 -#define pg_muAcidType 11 -#define pg_changePasswd 12 -#define pg_muSettings 13 -#define pg_muBleHandSett 14 -#define pg_muMotorSett 15 -#define pg_muPumpSett 16 -#define pg_muDeviceInfo 17 -#define pg_muAudit 18 -#define pg_muGetAcidMgr 19 -#define pg_muPumpTest 20 -#define pg_alert 21 -#define pg_confirm 22 -#define pg_keybAcidCh 23 -#define pg_keybdB 24 -#define pg_keybdAP 25 -#define pg_keybdA 26 -#define pg_keyPasswd 27 -// gvar.objs -#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 -#define ob_pStart_tm0 2 -// login.objs -#define ob_login_login 0 -#define ob_login_blogin 1 -#define ob_login_txtPasswd 2 -#define ob_login_txtUser0 3 -#define ob_login_txtUser1 4 -#define ob_login_txtUser2 5 -#define ob_login_txtUser3 6 -#define ob_login_txtUser4 7 -#define ob_login_txtUser5 8 -#define ob_login_m0 9 -#define ob_login_chooseUsr 10 -#define ob_login_cUsrName 11 -#define ob_login_uen0 12 -#define ob_login_uen1 13 -#define ob_login_uen2 14 -#define ob_login_uen3 15 -#define ob_login_uen4 16 -#define ob_login_uen5 17 -#define ob_login_t2 18 -#define ob_login_txtUser6 19 -#define ob_login_uen6 20 -// main.objs -#define ob_main_main 0 -#define ob_main_RunMode 1 -#define ob_main_acidch0 2 -#define ob_main_MenuButton 3 -#define ob_main_acidname0 4 -#define ob_main_acideval0 5 -#define ob_main_sysInfo 6 -#define ob_main_clock 7 -#define ob_main_acidname0id 8 -#define ob_main_acidname1id 9 -#define ob_main_acidname2id 10 -#define ob_main_acidname3id 11 -#define ob_main_RemoterS 12 -#define ob_main_AcidState 13 -#define ob_main_RunModeVal 14 -#define ob_main_acidch1 15 -#define ob_main_acidname1 16 -#define ob_main_acideval1 17 -#define ob_main_acidch2 18 -#define ob_main_acidname2 19 -#define ob_main_acideval2 20 -#define ob_main_acidch3 21 -#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 -#define ob_menuAdmin_muInterval 2 -#define ob_menuAdmin_changePasswd 3 -#define ob_menuAdmin_muTmrMgr 4 -#define ob_menuAdmin_muAcidType 5 -#define ob_menuAdmin_muUsrMgr 6 -#define ob_menuAdmin_muSettings 7 -#define ob_menuAdmin_muAudit 8 -#define ob_menuAdmin_muDeviceInfo 9 -#define ob_menuAdmin_unlogin 10 -// menuAdmin2.objs -#define ob_menuAdmin2_menuAdmin2 0 -#define ob_menuAdmin2_home 1 -#define ob_menuAdmin2_muInterval 2 -#define ob_menuAdmin2_changePasswd 3 -#define ob_menuAdmin2_muAcidType 4 -#define ob_menuAdmin2_muUsrMgr 5 -#define ob_menuAdmin2_muSettings 6 -#define ob_menuAdmin2_muDeviceInfo 7 -#define ob_menuAdmin2_unlogin 8 -// muneWarehouse.objs -#define ob_muneWarehouse_muneWarehouse 0 -#define ob_muneWarehouse_muAudit 1 -#define ob_muneWarehouse_changePasswd 2 -#define ob_muneWarehouse_muDeviceInfo 3 -#define ob_muneWarehouse_unlogin 4 -#define ob_muneWarehouse_getAcidMgr 5 -// menuUsr.objs -#define ob_menuUsr_menuUsr 0 -#define ob_menuUsr_home 1 -#define ob_menuUsr_muInterval 2 -#define ob_menuUsr_changePasswd 3 -#define ob_menuUsr_muDeviceInfo 4 -#define ob_menuUsr_unlogin 5 -// muInterval.objs -#define ob_muInterval_muInterval 0 -#define ob_muInterval_t0 1 -#define ob_muInterval_t1 2 -#define ob_muInterval_bak 3 -#define ob_muInterval_stAcidInte 4 -#define ob_muInterval_t2 5 -// muUsrMgr.objs -#define ob_muUsrMgr_muUsrMgr 0 -#define ob_muUsrMgr_bak 1 -#define ob_muUsrMgr_usr0name 2 -#define ob_muUsrMgr_unameCol 3 -#define ob_muUsrMgr_usr1name 4 -#define ob_muUsrMgr_usr2name 5 -#define ob_muUsrMgr_usr2en 6 -#define ob_muUsrMgr_usr3name 7 -#define ob_muUsrMgr_usr3en 8 -#define ob_muUsrMgr_usr4name 9 -#define ob_muUsrMgr_usr4en 10 -#define ob_muUsrMgr_usr1Rest 11 -#define ob_muUsrMgr_usr2Rest 12 -#define ob_muUsrMgr_usr3Rest 13 -#define ob_muUsrMgr_usr4Rest 14 -#define ob_muUsrMgr_usr5name 15 -#define ob_muUsrMgr_usr5en 16 -#define ob_muUsrMgr_usr5Rest 17 -#define ob_muUsrMgr_OperaCol 18 -#define ob_muUsrMgr_usr1ReName 19 -#define ob_muUsrMgr_usr2ReName 20 -#define ob_muUsrMgr_usr3ReName 21 -#define ob_muUsrMgr_usr4ReName 22 -#define ob_muUsrMgr_usr5ReName 23 -#define ob_muUsrMgr_t2 24 -#define ob_muUsrMgr_usr6name 25 -#define ob_muUsrMgr_usr6Rest 26 -#define ob_muUsrMgr_usr6ReName 27 -#define ob_muUsrMgr_usr6en 28 -// muTmrMgr.objs -#define ob_muTmrMgr_muTmrMgr 0 -#define ob_muTmrMgr_select0 1 -#define ob_muTmrMgr_select1 2 -#define ob_muTmrMgr_select2 3 -#define ob_muTmrMgr_bak 4 -#define ob_muTmrMgr_select3 5 -#define ob_muTmrMgr_select4 6 -#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 -#define ob_muAcidType_t1 2 -#define ob_muAcidType_t2 3 -#define ob_muAcidType_t3 4 -#define ob_muAcidType_t4 5 -#define ob_muAcidType_t5 6 -#define ob_muAcidType_t6 7 -#define ob_muAcidType_t7 8 -#define ob_muAcidType_t8 9 -#define ob_muAcidType_t9 10 -#define ob_muAcidType_t10 11 -#define ob_muAcidType_t11 12 -#define ob_muAcidType_t12 13 -#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 -#define ob_changePasswd_newPwd 2 -#define ob_changePasswd_newPwdCfmTil 3 -#define ob_changePasswd_newPwdCfm 4 -#define ob_changePasswd_confirm 5 -#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_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 -// 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 -#define ob_muDeviceInfo_softVersTil 2 -#define ob_muDeviceInfo_softVers 3 -#define ob_muDeviceInfo_deviceIdTil 4 -#define ob_muDeviceInfo_deviceId 5 -#define ob_muDeviceInfo_manufaTil 6 -#define ob_muDeviceInfo_manufa 7 -#define ob_muDeviceInfo_t0 8 -// muAudit.objs -#define ob_muAudit_muAudit 0 -#define ob_muAudit_bak 1 -#define ob_muAudit_t0 2 -#define ob_muAudit_t1 3 -#define ob_muAudit_t2 4 -#define ob_muAudit_b0 5 -#define ob_muAudit_b1 6 -#define ob_muAudit_t3 7 -#define ob_muAudit_t4 8 -#define ob_muAudit_b2 9 -// muGetAcidMgr.objs -#define ob_muGetAcidMgr_muGetAcidMgr 0 -#define ob_muGetAcidMgr_UsrName 1 -#define ob_muGetAcidMgr_AcidName 2 -#define ob_muGetAcidMgr_Capacity 3 -#define ob_muGetAcidMgr_acidname2 4 -#define ob_muGetAcidMgr_acidname3 5 -#define ob_muGetAcidMgr_acidname4 6 -#define ob_muGetAcidMgr_acidname5 7 -#define ob_muGetAcidMgr_acideval2 8 -#define ob_muGetAcidMgr_acideval3 9 -#define ob_muGetAcidMgr_acideval4 10 -#define ob_muGetAcidMgr_acideval5 11 -#define ob_muGetAcidMgr_bak 12 -#define ob_muGetAcidMgr_usrName 13 -#define ob_muGetAcidMgr_b1 14 -// muPumpTest.objs -#define ob_muPumpTest_muPumpTest 0 -#define ob_muPumpTest_frompage 1 -#define ob_muPumpTest_fromPopUpWin 2 -#define ob_muPumpTest_bak 3 -#define ob_muPumpTest_statiTrun 4 -#define ob_muPumpTest_t0 5 -#define ob_muPumpTest_statiVolum 6 -#define ob_muPumpTest_statiTrunTil 7 -#define ob_muPumpTest_statiVolumTil 8 -#define ob_muPumpTest_clearStati 9 -#define ob_muPumpTest_forward 10 -#define ob_muPumpTest_bakward 11 -#define ob_muPumpTest_stop 12 -#define ob_muPumpTest_pumpId 13 -#define ob_muPumpTest_pumpIdTil 14 -// alert.objs -#define ob_alert_alert 0 -#define ob_alert_t0 1 -#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_canclekey 2 -#define ob_confirm_info 3 -#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 -#define ob_keybAcidCh_b0 2 -#define ob_keybAcidCh_b1 3 -#define ob_keybAcidCh_b2 4 -#define ob_keybAcidCh_b3 5 -#define ob_keybAcidCh_b4 6 -#define ob_keybAcidCh_b5 7 -#define ob_keybAcidCh_b6 8 -#define ob_keybAcidCh_b7 9 -#define ob_keybAcidCh_b8 10 -#define ob_keybAcidCh_b9 11 -#define ob_keybAcidCh_b10 12 -#define ob_keybAcidCh_b11 13 -#define ob_keybAcidCh_b12 14 -#define ob_keybAcidCh_b13 15 -#define ob_keybAcidCh_b14 16 -#define ob_keybAcidCh_loadpageid 17 -#define ob_keybAcidCh_loadcmpid 18 -#define ob_keybAcidCh_loadcmname 19 -#define ob_keybAcidCh_txt 20 -#define ob_keybAcidCh_fn0 21 -// keybdB.objs -#define ob_keybdB_keybdB 0 -#define ob_keybdB_b0 1 -#define ob_keybdB_show 2 -#define ob_keybdB_b210 3 -#define ob_keybdB_b1 4 -#define ob_keybdB_b2 5 -#define ob_keybdB_b3 6 -#define ob_keybdB_b4 7 -#define ob_keybdB_b5 8 -#define ob_keybdB_b6 9 -#define ob_keybdB_b7 10 -#define ob_keybdB_b8 11 -#define ob_keybdB_b200 12 -#define ob_keybdB_b9 13 -#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 -#define ob_keybdAP_loadcmpid 2 -#define ob_keybdAP_b0 3 -#define ob_keybdAP_b251 4 -#define ob_keybdAP_b210 5 -#define ob_keybdAP_b1 6 -#define ob_keybdAP_b2 7 -#define ob_keybdAP_b3 8 -#define ob_keybdAP_b4 9 -#define ob_keybdAP_b5 10 -#define ob_keybdAP_b6 11 -#define ob_keybdAP_b7 12 -#define ob_keybdAP_b8 13 -#define ob_keybdAP_b200 14 -#define ob_keybdAP_b20 15 -#define ob_keybdAP_b21 16 -#define ob_keybdAP_b22 17 -#define ob_keybdAP_b23 18 -#define ob_keybdAP_b24 19 -#define ob_keybdAP_b25 20 -#define ob_keybdAP_b26 21 -#define ob_keybdAP_b27 22 -#define ob_keybdAP_b28 23 -#define ob_keybdAP_b220 24 -#define ob_keybdAP_b40 25 -#define ob_keybdAP_b41 26 -#define ob_keybdAP_b42 27 -#define ob_keybdAP_b43 28 -#define ob_keybdAP_b44 29 -#define ob_keybdAP_b45 30 -#define ob_keybdAP_b46 31 -#define ob_keybdAP_b230 32 -#define ob_keybdAP_b240 33 -#define ob_keybdAP_b242 34 -#define ob_keybdAP_b241 35 -#define ob_keybdAP_b244 36 -#define ob_keybdAP_b231 37 -#define ob_keybdAP_b245 38 -#define ob_keybdAP_refshowbu 39 -#define ob_keybdAP_tm0 40 -#define ob_keybdAP_input 41 -#define ob_keybdAP_show 42 -#define ob_keybdAP_temp 43 -#define ob_keybdAP_inputlenth 44 -#define ob_keybdAP_b249 45 -#define ob_keybdAP_b201 46 -#define ob_keybdAP_b9 47 -#define ob_keybdAP_b232 48 -#define ob_keybdAP_b243 49 -#define ob_keybdAP_pa_z 50 -#define ob_keybdAP_pa_d 51 -#define ob_keybdAP_pastr1 52 -#define ob_keybdAP_ii 53 -#define ob_keybdAP_loadpa 54 -#define ob_keybdAP_pastr0 55 -#define ob_keybdAP_bp1 56 -#define ob_keybdAP_bp2 57 -#define ob_keybdAP_bp3 58 -#define ob_keybdAP_bp4 59 -#define ob_keybdAP_bp5 60 -#define ob_keybdAP_bp6 61 -#define ob_keybdAP_bp7 62 -#define ob_keybdAP_bp8 63 -#define ob_keybdAP_bp9 64 -#define ob_keybdAP_bp10 65 -#define ob_keybdAP_bp11 66 -#define ob_keybdAP_bp12 67 -#define ob_keybdAP_bp13 68 -#define ob_keybdAP_bp14 69 -#define ob_keybdAP_bp15 70 -#define ob_keybdAP_bp16 71 -#define ob_keybdAP_bp17 72 -#define ob_keybdAP_bp18 73 -#define ob_keybdAP_b10 74 -#define ob_keybdAP_b11 75 -#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 -#define ob_keybdA_loadcmpid 2 -#define ob_keybdA_b0 3 -#define ob_keybdA_b251 4 -#define ob_keybdA_b210 5 -#define ob_keybdA_b1 6 -#define ob_keybdA_b2 7 -#define ob_keybdA_b3 8 -#define ob_keybdA_b4 9 -#define ob_keybdA_b5 10 -#define ob_keybdA_b6 11 -#define ob_keybdA_b7 12 -#define ob_keybdA_b8 13 -#define ob_keybdA_b200 14 -#define ob_keybdA_b20 15 -#define ob_keybdA_b21 16 -#define ob_keybdA_b22 17 -#define ob_keybdA_b23 18 -#define ob_keybdA_b24 19 -#define ob_keybdA_b25 20 -#define ob_keybdA_b26 21 -#define ob_keybdA_b27 22 -#define ob_keybdA_b28 23 -#define ob_keybdA_b220 24 -#define ob_keybdA_b40 25 -#define ob_keybdA_b41 26 -#define ob_keybdA_b42 27 -#define ob_keybdA_b43 28 -#define ob_keybdA_b44 29 -#define ob_keybdA_b45 30 -#define ob_keybdA_b46 31 -#define ob_keybdA_b230 32 -#define ob_keybdA_b240 33 -#define ob_keybdA_b242 34 -#define ob_keybdA_b241 35 -#define ob_keybdA_b243 36 -#define ob_keybdA_b231 37 -#define ob_keybdA_b244 38 -#define ob_keybdA_refshow 39 -#define ob_keybdA_tm0 40 -#define ob_keybdA_input 41 -#define ob_keybdA_show 42 -#define ob_keybdA_temp 43 -#define ob_keybdA_inputlenth 44 -#define ob_keybdA_b249 45 -#define ob_keybdA_b201 46 -#define ob_keybdA_b9 47 -#define ob_keybdA_b232 48 -#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 -#define ob_keyPasswd_show 2 -#define ob_keyPasswd_b210 3 -#define ob_keyPasswd_b1 4 -#define ob_keyPasswd_b2 5 -#define ob_keyPasswd_b3 6 -#define ob_keyPasswd_b4 7 -#define ob_keyPasswd_b5 8 -#define ob_keyPasswd_b6 9 -#define ob_keyPasswd_b7 10 -#define ob_keyPasswd_b8 11 -#define ob_keyPasswd_b200 12 -#define ob_keyPasswd_b9 13 -#define ob_keyPasswd_loadpageid 14 -#define ob_keyPasswd_tm0 15 -#define ob_keyPasswd_loadcmpid 16 -#define ob_keyPasswd_input 17 -#define ob_keyPasswd_temp 18 -#define ob_keyPasswd_inputlenth 19 -#define ob_keyPasswd_t2 20 -#define ob_keyPasswd_b251 21 -#define ob_keyPasswd_temp2 22 -#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 +//pages +#define pg_gvar 0 +#define pg_pStart 1 +#define pg_login 2 +#define pg_main 3 +#define pg_menuAdmin 4 +#define pg_menuAdmin2 5 +#define pg_muneWarehouse 6 +#define pg_menuUsr 7 +#define pg_muInterval 8 +#define pg_muUsrMgr 9 +#define pg_muTmrMgr 10 +#define pg_muAcidType 11 +#define pg_changePasswd 12 +#define pg_muSettings 13 +#define pg_muBleHandSett 14 +#define pg_muMotorSett 15 +#define pg_muPumpSett 16 +#define pg_muDeviceInfo 17 +#define pg_muAudit 18 +#define pg_muGetAcidRcod 19 +#define pg_muGetAcidMgr 20 +#define pg_muPumpTest 21 +#define pg_alert 22 +#define pg_confirm 23 +#define pg_keybAcidCh 24 +#define pg_keybdB 25 +#define pg_keybdAP 26 +#define pg_keybdA 27 +#define pg_keyPasswd 28 +//gvar.objs +#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 +#define ob_pStart_tm0 2 +//login.objs +#define ob_login_login 0 +#define ob_login_blogin 1 +#define ob_login_txtPasswd 2 +#define ob_login_txtUser0 3 +#define ob_login_txtUser1 4 +#define ob_login_txtUser2 5 +#define ob_login_txtUser3 6 +#define ob_login_txtUser4 7 +#define ob_login_txtUser5 8 +#define ob_login_m0 9 +#define ob_login_chooseUsr 10 +#define ob_login_cUsrName 11 +#define ob_login_uen0 12 +#define ob_login_uen1 13 +#define ob_login_uen2 14 +#define ob_login_uen3 15 +#define ob_login_uen4 16 +#define ob_login_uen5 17 +#define ob_login_t2 18 +#define ob_login_txtUser6 19 +#define ob_login_uen6 20 +//main.objs +#define ob_main_main 0 +#define ob_main_RunMode 1 +#define ob_main_acidch0 2 +#define ob_main_MenuButton 3 +#define ob_main_acidname0 4 +#define ob_main_acideval0 5 +#define ob_main_sysInfo 6 +#define ob_main_clock 7 +#define ob_main_acidname0id 8 +#define ob_main_acidname1id 9 +#define ob_main_acidname2id 10 +#define ob_main_acidname3id 11 +#define ob_main_RemoterS 12 +#define ob_main_AcidState 13 +#define ob_main_RunModeVal 14 +#define ob_main_acidch1 15 +#define ob_main_acidname1 16 +#define ob_main_acideval1 17 +#define ob_main_acidch2 18 +#define ob_main_acidname2 19 +#define ob_main_acideval2 20 +#define ob_main_acidch3 21 +#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 +#define ob_menuAdmin_muInterval 2 +#define ob_menuAdmin_changePasswd 3 +#define ob_menuAdmin_muTmrMgr 4 +#define ob_menuAdmin_muAcidType 5 +#define ob_menuAdmin_muUsrMgr 6 +#define ob_menuAdmin_muSettings 7 +#define ob_menuAdmin_muAudit 8 +#define ob_menuAdmin_muDeviceInfo 9 +#define ob_menuAdmin_unlogin 10 +//menuAdmin2.objs +#define ob_menuAdmin2_menuAdmin2 0 +#define ob_menuAdmin2_home 1 +#define ob_menuAdmin2_muInterval 2 +#define ob_menuAdmin2_changePasswd 3 +#define ob_menuAdmin2_muAcidType 4 +#define ob_menuAdmin2_muUsrMgr 5 +#define ob_menuAdmin2_muSettings 6 +#define ob_menuAdmin2_muDeviceInfo 7 +#define ob_menuAdmin2_unlogin 8 +//muneWarehouse.objs +#define ob_muneWarehouse_muneWarehouse 0 +#define ob_muneWarehouse_muAudit 1 +#define ob_muneWarehouse_changePasswd 2 +#define ob_muneWarehouse_muDeviceInfo 3 +#define ob_muneWarehouse_unlogin 4 +#define ob_muneWarehouse_getAcidMgr 5 +//menuUsr.objs +#define ob_menuUsr_menuUsr 0 +#define ob_menuUsr_home 1 +#define ob_menuUsr_muInterval 2 +#define ob_menuUsr_changePasswd 3 +#define ob_menuUsr_muDeviceInfo 4 +#define ob_menuUsr_unlogin 5 +//muInterval.objs +#define ob_muInterval_muInterval 0 +#define ob_muInterval_t0 1 +#define ob_muInterval_t1 2 +#define ob_muInterval_bak 3 +#define ob_muInterval_stAcidInte 4 +#define ob_muInterval_t2 5 +//muUsrMgr.objs +#define ob_muUsrMgr_muUsrMgr 0 +#define ob_muUsrMgr_bak 1 +#define ob_muUsrMgr_usr0name 2 +#define ob_muUsrMgr_unameCol 3 +#define ob_muUsrMgr_usr1name 4 +#define ob_muUsrMgr_usr2name 5 +#define ob_muUsrMgr_usr2en 6 +#define ob_muUsrMgr_usr3name 7 +#define ob_muUsrMgr_usr3en 8 +#define ob_muUsrMgr_usr4name 9 +#define ob_muUsrMgr_usr4en 10 +#define ob_muUsrMgr_usr1Rest 11 +#define ob_muUsrMgr_usr2Rest 12 +#define ob_muUsrMgr_usr3Rest 13 +#define ob_muUsrMgr_usr4Rest 14 +#define ob_muUsrMgr_usr5name 15 +#define ob_muUsrMgr_usr5en 16 +#define ob_muUsrMgr_usr5Rest 17 +#define ob_muUsrMgr_OperaCol 18 +#define ob_muUsrMgr_usr1ReName 19 +#define ob_muUsrMgr_usr2ReName 20 +#define ob_muUsrMgr_usr3ReName 21 +#define ob_muUsrMgr_usr4ReName 22 +#define ob_muUsrMgr_usr5ReName 23 +#define ob_muUsrMgr_t2 24 +#define ob_muUsrMgr_usr6name 25 +#define ob_muUsrMgr_usr6Rest 26 +#define ob_muUsrMgr_usr6ReName 27 +#define ob_muUsrMgr_usr6en 28 +//muTmrMgr.objs +#define ob_muTmrMgr_muTmrMgr 0 +#define ob_muTmrMgr_select0 1 +#define ob_muTmrMgr_select1 2 +#define ob_muTmrMgr_select2 3 +#define ob_muTmrMgr_bak 4 +#define ob_muTmrMgr_select3 5 +#define ob_muTmrMgr_select4 6 +#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 +#define ob_muAcidType_t1 2 +#define ob_muAcidType_t2 3 +#define ob_muAcidType_t3 4 +#define ob_muAcidType_t4 5 +#define ob_muAcidType_t5 6 +#define ob_muAcidType_t6 7 +#define ob_muAcidType_t7 8 +#define ob_muAcidType_t8 9 +#define ob_muAcidType_t9 10 +#define ob_muAcidType_t10 11 +#define ob_muAcidType_t11 12 +#define ob_muAcidType_t12 13 +#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 +#define ob_changePasswd_newPwd 2 +#define ob_changePasswd_newPwdCfmTil 3 +#define ob_changePasswd_newPwdCfm 4 +#define ob_changePasswd_confirm 5 +#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_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 +//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 +#define ob_muDeviceInfo_softVersTil 2 +#define ob_muDeviceInfo_softVers 3 +#define ob_muDeviceInfo_deviceIdTil 4 +#define ob_muDeviceInfo_deviceId 5 +#define ob_muDeviceInfo_manufaTil 6 +#define ob_muDeviceInfo_manufa 7 +#define ob_muDeviceInfo_t0 8 +//muAudit.objs +#define ob_muAudit_muAudit 0 +#define ob_muAudit_bak 1 +#define ob_muAudit_t0 2 +#define ob_muAudit_t1 3 +#define ob_muAudit_t2 4 +#define ob_muAudit_b0 5 +#define ob_muAudit_b1 6 +#define ob_muAudit_t3 7 +#define ob_muAudit_t4 8 +#define ob_muAudit_b2 9 +//muGetAcidRcod.objs +#define ob_muGetAcidRcod_muGetAcidRcod 0 +#define ob_muGetAcidRcod_name0 1 +#define ob_muGetAcidRcod_usrname0 2 +#define ob_muGetAcidRcod_acidname0 3 +#define ob_muGetAcidRcod_acideval0 4 +#define ob_muGetAcidRcod_bak 5 +#define ob_muGetAcidRcod_t1 6 +#define ob_muGetAcidRcod_t2 7 +#define ob_muGetAcidRcod_t4 8 +#define ob_muGetAcidRcod_t0 9 +#define ob_muGetAcidRcod_acidname1 10 +#define ob_muGetAcidRcod_acidname2 11 +#define ob_muGetAcidRcod_acidname3 12 +#define ob_muGetAcidRcod_acideval1 13 +#define ob_muGetAcidRcod_acideval2 14 +#define ob_muGetAcidRcod_acideval3 15 +#define ob_muGetAcidRcod_usrname1 16 +#define ob_muGetAcidRcod_usrname2 17 +#define ob_muGetAcidRcod_usrname3 18 +#define ob_muGetAcidRcod_usrname4 19 +#define ob_muGetAcidRcod_name1 20 +#define ob_muGetAcidRcod_name2 21 +#define ob_muGetAcidRcod_name3 22 +#define ob_muGetAcidRcod_name4 23 +#define ob_muGetAcidRcod_acidname4 24 +#define ob_muGetAcidRcod_acideval4 25 +#define ob_muGetAcidRcod_clear 26 +//muGetAcidMgr.objs +#define ob_muGetAcidMgr_muGetAcidMgr 0 +#define ob_muGetAcidMgr_UsrName 1 +#define ob_muGetAcidMgr_AcidName 2 +#define ob_muGetAcidMgr_Cap 3 +#define ob_muGetAcidMgr_acidname0 4 +#define ob_muGetAcidMgr_acideval0 5 +#define ob_muGetAcidMgr_bak 6 +#define ob_muGetAcidMgr_usrName 7 +#define ob_muGetAcidMgr_choose_flag 8 +#define ob_muGetAcidMgr_sure 9 +//muPumpTest.objs +#define ob_muPumpTest_muPumpTest 0 +#define ob_muPumpTest_frompage 1 +#define ob_muPumpTest_fromPopUpWin 2 +#define ob_muPumpTest_statiTrun 3 +#define ob_muPumpTest_t0 4 +#define ob_muPumpTest_statiVolum 5 +#define ob_muPumpTest_statiTrunTil 6 +#define ob_muPumpTest_statiVolumTil 7 +#define ob_muPumpTest_clearStati 8 +#define ob_muPumpTest_forward 9 +#define ob_muPumpTest_bakward 10 +#define ob_muPumpTest_stop 11 +#define ob_muPumpTest_pumpId 12 +#define ob_muPumpTest_pumpIdTil 13 +#define ob_muPumpTest_bak 14 +//alert.objs +#define ob_alert_alert 0 +#define ob_alert_t0 1 +#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_canclekey 2 +#define ob_confirm_info 3 +#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 +#define ob_keybAcidCh_b0 2 +#define ob_keybAcidCh_b1 3 +#define ob_keybAcidCh_b2 4 +#define ob_keybAcidCh_b3 5 +#define ob_keybAcidCh_b4 6 +#define ob_keybAcidCh_b5 7 +#define ob_keybAcidCh_b6 8 +#define ob_keybAcidCh_b7 9 +#define ob_keybAcidCh_b8 10 +#define ob_keybAcidCh_b9 11 +#define ob_keybAcidCh_b10 12 +#define ob_keybAcidCh_b11 13 +#define ob_keybAcidCh_b12 14 +#define ob_keybAcidCh_b13 15 +#define ob_keybAcidCh_b14 16 +#define ob_keybAcidCh_loadpageid 17 +#define ob_keybAcidCh_loadcmpid 18 +#define ob_keybAcidCh_loadcmname 19 +#define ob_keybAcidCh_txt 20 +#define ob_keybAcidCh_fn0 21 +//keybdB.objs +#define ob_keybdB_keybdB 0 +#define ob_keybdB_b0 1 +#define ob_keybdB_show 2 +#define ob_keybdB_b210 3 +#define ob_keybdB_b1 4 +#define ob_keybdB_b2 5 +#define ob_keybdB_b3 6 +#define ob_keybdB_b4 7 +#define ob_keybdB_b5 8 +#define ob_keybdB_b6 9 +#define ob_keybdB_b7 10 +#define ob_keybdB_b8 11 +#define ob_keybdB_b200 12 +#define ob_keybdB_b9 13 +#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 +#define ob_keybdAP_loadcmpid 2 +#define ob_keybdAP_b0 3 +#define ob_keybdAP_b251 4 +#define ob_keybdAP_b210 5 +#define ob_keybdAP_b1 6 +#define ob_keybdAP_b2 7 +#define ob_keybdAP_b3 8 +#define ob_keybdAP_b4 9 +#define ob_keybdAP_b5 10 +#define ob_keybdAP_b6 11 +#define ob_keybdAP_b7 12 +#define ob_keybdAP_b8 13 +#define ob_keybdAP_b200 14 +#define ob_keybdAP_b20 15 +#define ob_keybdAP_b21 16 +#define ob_keybdAP_b22 17 +#define ob_keybdAP_b23 18 +#define ob_keybdAP_b24 19 +#define ob_keybdAP_b25 20 +#define ob_keybdAP_b26 21 +#define ob_keybdAP_b27 22 +#define ob_keybdAP_b28 23 +#define ob_keybdAP_b220 24 +#define ob_keybdAP_b40 25 +#define ob_keybdAP_b41 26 +#define ob_keybdAP_b42 27 +#define ob_keybdAP_b43 28 +#define ob_keybdAP_b44 29 +#define ob_keybdAP_b45 30 +#define ob_keybdAP_b46 31 +#define ob_keybdAP_b230 32 +#define ob_keybdAP_b240 33 +#define ob_keybdAP_b242 34 +#define ob_keybdAP_b241 35 +#define ob_keybdAP_b244 36 +#define ob_keybdAP_b231 37 +#define ob_keybdAP_b245 38 +#define ob_keybdAP_refshowbu 39 +#define ob_keybdAP_tm0 40 +#define ob_keybdAP_input 41 +#define ob_keybdAP_show 42 +#define ob_keybdAP_temp 43 +#define ob_keybdAP_inputlenth 44 +#define ob_keybdAP_b249 45 +#define ob_keybdAP_b201 46 +#define ob_keybdAP_b9 47 +#define ob_keybdAP_b232 48 +#define ob_keybdAP_b243 49 +#define ob_keybdAP_pa_z 50 +#define ob_keybdAP_pa_d 51 +#define ob_keybdAP_pastr1 52 +#define ob_keybdAP_ii 53 +#define ob_keybdAP_loadpa 54 +#define ob_keybdAP_pastr0 55 +#define ob_keybdAP_bp1 56 +#define ob_keybdAP_bp2 57 +#define ob_keybdAP_bp3 58 +#define ob_keybdAP_bp4 59 +#define ob_keybdAP_bp5 60 +#define ob_keybdAP_bp6 61 +#define ob_keybdAP_bp7 62 +#define ob_keybdAP_bp8 63 +#define ob_keybdAP_bp9 64 +#define ob_keybdAP_bp10 65 +#define ob_keybdAP_bp11 66 +#define ob_keybdAP_bp12 67 +#define ob_keybdAP_bp13 68 +#define ob_keybdAP_bp14 69 +#define ob_keybdAP_bp15 70 +#define ob_keybdAP_bp16 71 +#define ob_keybdAP_bp17 72 +#define ob_keybdAP_bp18 73 +#define ob_keybdAP_b10 74 +#define ob_keybdAP_b11 75 +#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 +#define ob_keybdA_loadcmpid 2 +#define ob_keybdA_b0 3 +#define ob_keybdA_b251 4 +#define ob_keybdA_b210 5 +#define ob_keybdA_b1 6 +#define ob_keybdA_b2 7 +#define ob_keybdA_b3 8 +#define ob_keybdA_b4 9 +#define ob_keybdA_b5 10 +#define ob_keybdA_b6 11 +#define ob_keybdA_b7 12 +#define ob_keybdA_b8 13 +#define ob_keybdA_b200 14 +#define ob_keybdA_b20 15 +#define ob_keybdA_b21 16 +#define ob_keybdA_b22 17 +#define ob_keybdA_b23 18 +#define ob_keybdA_b24 19 +#define ob_keybdA_b25 20 +#define ob_keybdA_b26 21 +#define ob_keybdA_b27 22 +#define ob_keybdA_b28 23 +#define ob_keybdA_b220 24 +#define ob_keybdA_b40 25 +#define ob_keybdA_b41 26 +#define ob_keybdA_b42 27 +#define ob_keybdA_b43 28 +#define ob_keybdA_b44 29 +#define ob_keybdA_b45 30 +#define ob_keybdA_b46 31 +#define ob_keybdA_b230 32 +#define ob_keybdA_b240 33 +#define ob_keybdA_b242 34 +#define ob_keybdA_b241 35 +#define ob_keybdA_b243 36 +#define ob_keybdA_b231 37 +#define ob_keybdA_b244 38 +#define ob_keybdA_refshow 39 +#define ob_keybdA_tm0 40 +#define ob_keybdA_input 41 +#define ob_keybdA_show 42 +#define ob_keybdA_temp 43 +#define ob_keybdA_inputlenth 44 +#define ob_keybdA_b249 45 +#define ob_keybdA_b201 46 +#define ob_keybdA_b9 47 +#define ob_keybdA_b232 48 +#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 +#define ob_keyPasswd_show 2 +#define ob_keyPasswd_b210 3 +#define ob_keyPasswd_b1 4 +#define ob_keyPasswd_b2 5 +#define ob_keyPasswd_b3 6 +#define ob_keyPasswd_b4 7 +#define ob_keyPasswd_b5 8 +#define ob_keyPasswd_b6 9 +#define ob_keyPasswd_b7 10 +#define ob_keyPasswd_b8 11 +#define ob_keyPasswd_b200 12 +#define ob_keyPasswd_b9 13 +#define ob_keyPasswd_loadpageid 14 +#define ob_keyPasswd_tm0 15 +#define ob_keyPasswd_loadcmpid 16 +#define ob_keyPasswd_input 17 +#define ob_keyPasswd_temp 18 +#define ob_keyPasswd_inputlenth 19 +#define ob_keyPasswd_t2 20 +#define ob_keyPasswd_b251 21 +#define ob_keyPasswd_temp2 22 +#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 diff --git a/ui/usrui.h b/ui/usrui.h index a3f1cd9..6e6209b 100644 --- a/ui/usrui.h +++ b/ui/usrui.h @@ -1,4 +1,4 @@ #pragma once -#define pic_jog_mode 26 -#define pic_continuous_mode 27 +#define pic_jog_mode 27 +#define pic_continuous_mode 28 diff --git a/usrc/service/app_core.cpp b/usrc/service/app_core.cpp index 5d4597b..16b8550 100644 --- a/usrc/service/app_core.cpp +++ b/usrc/service/app_core.cpp @@ -90,8 +90,9 @@ void AppCore::appsetup() { Page_muSettings::ins()->initialize(); Page_muUsrMgr::ins()->initialize(); Page_muDeviceInfo::ins()->initialize(); - Page_muAudit::ins()->initialize(); + // Page_muAudit::ins()->initialize(); Page_muGetAcidMgr::ins()->initialize(); + Page_muGetAcidRcord::ins()->initialize(); Page_muPumpTest::ins()->initialize(); // EventProcesser Page_muPumpSett::ins()->initialize(); diff --git a/usrc/service/page/Page_login.cpp b/usrc/service/page/Page_login.cpp index 83d7422..8c804f0 100644 --- a/usrc/service/page/Page_login.cpp +++ b/usrc/service/page/Page_login.cpp @@ -8,7 +8,7 @@ using namespace iflytop; #define OBJ(name) ob_login_##name #define TAG "Page_login" static CfgItermCache cfgcache; - +// UIS->sendcmd("p[%d].b[%d].picc=%d", PAGE, OBJ(txtUser##i), 2); #define EN_USR(i, enable) \ if (enable) { \ UIS->setTxt(PAGE, OBJ(txtUser##i), usrName[i]); \ @@ -52,6 +52,8 @@ void Page_login::OnPageLoad(OnPageLoadContext* cxt) { UIS->setTxt(PAGE, OBJ(cUsrName), getCfgStr((config_index_t)(kusr_name0))); UIS->setTxt(PAGE, OBJ(txtPasswd), ""); } + + UIS->sendcmd("click m0,0"); } void Page_login::OnInputFieldContentChange(uint8_t bid, const char* text) { if (bid == OBJ(txtPasswd)) { diff --git a/usrc/service/page/page.hpp b/usrc/service/page/page.hpp index 40da6f4..68facda 100644 --- a/usrc/service/page/page.hpp +++ b/usrc/service/page/page.hpp @@ -9,11 +9,13 @@ #include "submenu/Page_muAudit.hpp" #include "submenu/Page_muDeviceInfo.hpp" #include "submenu/Page_muGetAcidMgr.hpp" +#include "submenu/Page_muGetAcidRcord.hpp" #include "submenu/Page_muInterval.hpp" #include "submenu/Page_muPumpTest.hpp" #include "submenu/Page_muSettings.hpp" #include "submenu/Page_muUsrMgr.hpp" + // #include "submenu/Page_muBleHandSett.hpp" #include "submenu/Page_muMotorSett.hpp" diff --git a/usrc/service/page/submenu/Page_muDeviceInfo.cpp b/usrc/service/page/submenu/Page_muDeviceInfo.cpp index 1efd4fa..d558232 100644 --- a/usrc/service/page/submenu/Page_muDeviceInfo.cpp +++ b/usrc/service/page/submenu/Page_muDeviceInfo.cpp @@ -6,8 +6,8 @@ using namespace iflytop; #define TAG "Page_muDeviceInfo" bool Page_muDeviceInfo::isBelongThisPage(int page) { return page == PAGE; } -void Page_muDeviceInfo::OnPageLoad(OnPageLoadContext*cxt) { - UIS->setTxt(PAGE, ob_muDeviceInfo_deviceId, "SN000000"); +void Page_muDeviceInfo::OnPageLoad(OnPageLoadContext* cxt) { + UIS->setTxt(PAGE, ob_muDeviceInfo_deviceId, "SN000001"); UIS->setTxt(PAGE, ob_muDeviceInfo_manufa, "中国黄金"); UIS->setTxt(PAGE, ob_muDeviceInfo_softVers, APP_VERSION); } diff --git a/usrc/service/page/submenu/Page_muGetAcidMgr.cpp b/usrc/service/page/submenu/Page_muGetAcidMgr.cpp index f93d892..a159242 100644 --- a/usrc/service/page/submenu/Page_muGetAcidMgr.cpp +++ b/usrc/service/page/submenu/Page_muGetAcidMgr.cpp @@ -1,100 +1,157 @@ #include "Page_muGetAcidMgr.hpp" using namespace iflytop; -#define PAGE pg_muGetAcidMgr -#define OBJ(name) ob_muGetAcidMgr_##name -#define TAG "Page_muGetAcidMgr" -static CfgItermCache cfgcache; +#define PAGE pg_muGetAcidMgr +#define TAG "Page_muGetAcidMgr" + +typedef struct { + char usrName[20]; + char usr_acid_name[20]; + char usr_acid_cap[20]; +} usr_acid_record_t; -static uint8_t id; +static const char* fmt(const char* fmt, ...) { + static char buf[128]; + va_list args; + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + return buf; +} +static CfgItermCache cfgcache; -bool Page_muGetAcidMgr::isBelongThisPage(int page) { return page == PAGE; } +static int32_t num; +static usr_acid_record_t usr; +static char buf[2] = {0x5c, 0x72}; +bool Page_muGetAcidMgr::isBelongThisPage(int page) { return page == PAGE; } void Page_muGetAcidMgr::OnPageLoad(OnPageLoadContext* cxt) { // - if (id == 1) { - UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr2AcidChooseName0)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr2AcidChooseName1)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr2AcidChooseName2)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr2AcidChooseName3)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval2, getCfgStr(kcfg_usr2AcidCapacityLimite0)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval3, getCfgStr(kcfg_usr2AcidCapacityLimite1)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval4, getCfgStr(kcfg_usr2AcidCapacityLimite2)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval5, getCfgStr(kcfg_usr2AcidCapacityLimite3)); + UIS->sendcmd("b[%d].path=\"\"", ob_muGetAcidMgr_usrName); + if (CS->getBool(kusr_enable2)) { + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name2)); + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf); + } + if (CS->getBool(kusr_enable3)) { + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name3)); + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf); + } + if (CS->getBool(kusr_enable4)) { + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name4)); + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf); + } + if (CS->getBool(kusr_enable5)) { + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name5)); + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf); + } + if (CS->getBool(kusr_enable6)) { + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, getCfgStr(kusr_name6)); + UIS->sendcmd("b[%d].path+=\"%s\"", ob_muGetAcidMgr_usrName, buf); + } + + UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname0, usr.usr_acid_name); + UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval0, usr.usr_acid_cap); + if (strcmp(usr.usrName, getCfgStr(kusr_name2)) == 0 || // + strcmp(usr.usrName, getCfgStr(kusr_name3)) == 0 || // + strcmp(usr.usrName, getCfgStr(kusr_name4)) == 0 || // + strcmp(usr.usrName, getCfgStr(kusr_name5)) == 0 || // + strcmp(usr.usrName, getCfgStr(kusr_name6)) == 0) { + UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, usr.usrName); } - // UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name2)); - // UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName, buf); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name3), buf); - // UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name4), buf); - // UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name5), buf); - // UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_usrName, getCfgStr(kusr_name6), buf); - // UIS->sendcmd("b[%d].path+=%s", ob_muGetAcidMgr_usrName); }; void Page_muGetAcidMgr::OnInputFieldContentChange(uint8_t bid, const char* text) { // if (bid == ob_muGetAcidMgr_usrName) { - if (atoi(text) == 1) { - id = 1; - UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr2AcidChooseName0)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr2AcidChooseName1)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr2AcidChooseName2)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr2AcidChooseName3)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval2, getCfgStr(kcfg_usr2AcidCapacityLimite0)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval3, getCfgStr(kcfg_usr2AcidCapacityLimite1)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval4, getCfgStr(kcfg_usr2AcidCapacityLimite2)); - UIS->setTxt(PAGE, ob_muGetAcidMgr_acideval5, getCfgStr(kcfg_usr2AcidCapacityLimite3)); - // } else if (atoi(text) == 2) { - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr3AcidChooseName0)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr3AcidChooseName1)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr3AcidChooseName2)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr3AcidChooseName3)); - // } else if (atoi(text) == 3) { - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr4AcidChooseName0)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr4AcidChooseName1)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr4AcidChooseName2)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr4AcidChooseName3)); - // } else if (atoi(text) == 4) { - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr5AcidChooseName0)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr5AcidChooseName1)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr5AcidChooseName2)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr5AcidChooseName3)); - // } else if (atoi(text) == 5) { - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname2, getCfgStr(kcfg_usr6AcidChooseName0)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname3, getCfgStr(kcfg_usr6AcidChooseName1)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname4, getCfgStr(kcfg_usr6AcidChooseName2)); - // UIS->setTxt(PAGE, ob_muGetAcidMgr_acidname5, getCfgStr(kcfg_usr6AcidChooseName3)); - // } - } + usrSwitching(text); } - if (id == 1) { - if (bid == ob_muGetAcidMgr_acidname2) { - UIS->setTxt(PAGE, bid, text); - CS->setcfgAndFlush(kcfg_usr2AcidChooseName0, text); - } else if (bid == ob_muGetAcidMgr_acidname3) { - UIS->setTxt(PAGE, bid, text); - CS->setcfgAndFlush(kcfg_usr2AcidChooseName1, text); - } else if (bid == ob_muGetAcidMgr_acidname4) { - UIS->setTxt(PAGE, bid, text); - CS->setcfgAndFlush(kcfg_usr2AcidChooseName2, text); - } else if (bid == ob_muGetAcidMgr_acidname5) { - UIS->setTxt(PAGE, bid, text); - CS->setcfgAndFlush(kcfg_usr2AcidChooseName3, text); - } else if (bid == ob_muGetAcidMgr_acideval2) { - UIS->setTxt(PAGE, bid, text); - CS->setcfgAndFlush(kcfg_usr2AcidCapacityLimite0, text); - } else if (bid == ob_muGetAcidMgr_acideval3) { - CS->setcfgAndFlush(kcfg_usr2AcidCapacityLimite1, text); - } else if (bid == ob_muGetAcidMgr_acideval4) { - CS->setcfgAndFlush(kcfg_usr2AcidCapacityLimite2, text); - } else if (bid == ob_muGetAcidMgr_acideval5) { - CS->setcfgAndFlush(kcfg_usr2AcidCapacityLimite3, text); + if (bid == ob_muGetAcidMgr_acideval0) { + float add_ml = atof(text); + if (add_ml < 0.009) { + UIS->alert("设定值不能小于0"); + return; + } else if (add_ml > 5000) { + UIS->alert("设定值不能大于5000"); + return; } } + + if (bid == ob_muGetAcidMgr_acidname0) { + UIS->setTxt(PAGE, bid, text); + memcpy(usr.usr_acid_name, text, 20); + } else if (bid == ob_muGetAcidMgr_acideval0) { + UIS->setTxt(PAGE, bid, text); + memcpy(usr.usr_acid_cap, text, 20); + } } void Page_muGetAcidMgr::OnButton(uint8_t bid, uint8_t val) { // - // if (bid == OBJ(bak)) { - // UIS->chpage(GSM->getMenuPage()); - // } -}; \ No newline at end of file + if (bid == ob_muGetAcidMgr_bak) { + memcpy(usr.usrName, 0, 20); + memcpy(usr.usr_acid_name, 0, 20); + memcpy(usr.usr_acid_cap, 0, 20); + UIS->setVal(PAGE, ob_muGetAcidMgr_choose_flag, 0); + UIS->chpage(GSM->getMenuPage()); + } + if (bid == ob_muGetAcidMgr_sure) { + ZLOGI(TAG, "%d", getCfgInt(kcfg_recordNum)); + switch (getCfgInt(kcfg_recordNum)) { + case 0: + CS->setcfgAndFlush(kcfg_grantAcidName0, getCfgStr(kusr_name1)); + CS->setcfgAndFlush(kcfg_getAcidUsr0, usr.usrName); + CS->setcfgAndFlush(kcfg_usrAcidChooseName0, usr.usr_acid_name); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite0, usr.usr_acid_cap); + break; + case 1: + CS->setcfgAndFlush(kcfg_grantAcidName1, getCfgStr(kusr_name1)); + CS->setcfgAndFlush(kcfg_getAcidUsr1, usr.usrName); + CS->setcfgAndFlush(kcfg_usrAcidChooseName1, usr.usr_acid_name); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite1, usr.usr_acid_cap); + break; + case 2: + CS->setcfgAndFlush(kcfg_grantAcidName2, getCfgStr(kusr_name1)); + CS->setcfgAndFlush(kcfg_getAcidUsr2, usr.usrName); + CS->setcfgAndFlush(kcfg_usrAcidChooseName2, usr.usr_acid_name); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite2, usr.usr_acid_cap); + break; + case 3: + CS->setcfgAndFlush(kcfg_grantAcidName3, getCfgStr(kusr_name1)); + CS->setcfgAndFlush(kcfg_getAcidUsr3, usr.usrName); + CS->setcfgAndFlush(kcfg_usrAcidChooseName3, usr.usr_acid_name); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite3, usr.usr_acid_cap); + break; + case 4: + CS->setcfgAndFlush(kcfg_grantAcidName4, getCfgStr(kusr_name1)); + CS->setcfgAndFlush(kcfg_getAcidUsr4, usr.usrName); + CS->setcfgAndFlush(kcfg_usrAcidChooseName4, usr.usr_acid_name); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite4, usr.usr_acid_cap); + break; + } + UIS->confirmNoCancle("领取成功"); + num++; + CS->setcfgAndFlush(kcfg_recordNum, num); + } +}; + +int32_t Page_muGetAcidMgr::getUsrName(uint8_t id) { + switch (id) {} +} + +void Page_muGetAcidMgr::usrSwitching(const char* usrname) { + if (strcmp(usrname, getCfgStr(kusr_name2)) == 0) { + memcpy(usr.usrName, usrname, 20); + + } else if (strcmp(usrname, getCfgStr(kusr_name3)) == 0) { + memcpy(usr.usrName, usrname, 20); + + } else if (strcmp(usrname, getCfgStr(kusr_name4)) == 0) { + memcpy(usr.usrName, usrname, 20); + + } else if (strcmp(usrname, getCfgStr(kusr_name5)) == 0) { + memcpy(usr.usrName, usrname, 20); + + } else if (strcmp(usrname, getCfgStr(kusr_name6)) == 0) { + memcpy(usr.usrName, usrname, 20); + } + + if (strcmp(usrname, "未选择") != 0) { + UIS->setVal(PAGE, ob_muGetAcidMgr_choose_flag, 1); + } +} \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_muGetAcidMgr.hpp b/usrc/service/page/submenu/Page_muGetAcidMgr.hpp index d2be647..6f4908e 100644 --- a/usrc/service/page/submenu/Page_muGetAcidMgr.hpp +++ b/usrc/service/page/submenu/Page_muGetAcidMgr.hpp @@ -21,5 +21,9 @@ class Page_muGetAcidMgr : public IPageProcesser { virtual void OnPageLoad(OnPageLoadContext* cxt) override; virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override; virtual void OnButton(uint8_t bid, uint8_t val) override; + + private: + int32_t getUsrName(uint8_t id); + void usrSwitching(const char* usrname); }; } // namespace iflytop \ No newline at end of file diff --git a/usrc/service/page/submenu/Page_muGetAcidRcord.cpp b/usrc/service/page/submenu/Page_muGetAcidRcord.cpp new file mode 100644 index 0000000..b0d51a6 --- /dev/null +++ b/usrc/service/page/submenu/Page_muGetAcidRcord.cpp @@ -0,0 +1,98 @@ +#include "Page_muGetAcidRcord.hpp" +using namespace iflytop; + +#define PAGE pg_muGetAcidRcod +#define TAG "Page_muGetAcidRcord" + +typedef struct { + char usrName[20]; + int32_t usr_acid_name[5]; + int32_t usr_acid_cap[5]; +} usr_acid_record_t; + +static const char* fmt(const char* fmt, ...) { + static char buf[128]; + va_list args; + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + return buf; +} +static CfgItermCache cfgcache; + +static int32_t id; +static usr_acid_record_t usr; +static char buf[2] = {0x5c, 0x72}; // "\r" + +bool Page_muGetAcidRcord::isBelongThisPage(int page) { return page == PAGE; } + +void Page_muGetAcidRcord::OnPageLoad(OnPageLoadContext* cxt) { // + + UIS->setTxt(PAGE, ob_muGetAcidRcod_name0, getCfgStr(kcfg_grantAcidName0)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname0, getCfgStr(kcfg_getAcidUsr0)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname0, getCfgStr(kcfg_usrAcidChooseName0)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval0, getCfgStr(kcfg_usrAcidCapacityLimite0)); + + UIS->setTxt(PAGE, ob_muGetAcidRcod_name1, getCfgStr(kcfg_grantAcidName1)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname1, getCfgStr(kcfg_getAcidUsr1)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname1, getCfgStr(kcfg_usrAcidChooseName1)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval1, getCfgStr(kcfg_usrAcidCapacityLimite1)); + + UIS->setTxt(PAGE, ob_muGetAcidRcod_name2, getCfgStr(kcfg_grantAcidName2)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname2, getCfgStr(kcfg_getAcidUsr2)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname2, getCfgStr(kcfg_usrAcidChooseName2)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval2, getCfgStr(kcfg_usrAcidCapacityLimite2)); + + UIS->setTxt(PAGE, ob_muGetAcidRcod_name3, getCfgStr(kcfg_grantAcidName3)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname3, getCfgStr(kcfg_getAcidUsr3)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname3, getCfgStr(kcfg_usrAcidChooseName3)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval3, getCfgStr(kcfg_usrAcidCapacityLimite3)); + + UIS->setTxt(PAGE, ob_muGetAcidRcod_name4, getCfgStr(kcfg_grantAcidName4)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_usrname4, getCfgStr(kcfg_getAcidUsr4)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acidname4, getCfgStr(kcfg_usrAcidChooseName4)); + UIS->setTxt(PAGE, ob_muGetAcidRcod_acideval4, getCfgStr(kcfg_usrAcidCapacityLimite4)); +} + +void Page_muGetAcidRcord::OnInputFieldContentChange(uint8_t bid, const char* text) { // +} +void Page_muGetAcidRcord::OnButton(uint8_t bid, uint8_t val) { // + if (bid == ob_muGetAcidRcod_bak) { + UIS->chpage(GSM->getMenuPage()); + } + if (bid == ob_muGetAcidRcod_clear) { + UIS->alertNoConfirm("清除中...."); + CS->setcfgAndFlush(kcfg_recordNum, "0"); + CS->setcfgAndFlush(kcfg_grantAcidName0, ""); + CS->setcfgAndFlush(kcfg_getAcidUsr0, ""); + CS->setcfgAndFlush(kcfg_usrAcidChooseName0, ""); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite0, ""); + + CS->setcfgAndFlush(kcfg_grantAcidName1, ""); + CS->setcfgAndFlush(kcfg_getAcidUsr1, ""); + CS->setcfgAndFlush(kcfg_usrAcidChooseName1, ""); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite1, ""); + + CS->setcfgAndFlush(kcfg_grantAcidName2, ""); + CS->setcfgAndFlush(kcfg_getAcidUsr2, ""); + CS->setcfgAndFlush(kcfg_usrAcidChooseName2, ""); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite2, ""); + + CS->setcfgAndFlush(kcfg_grantAcidName3, ""); + CS->setcfgAndFlush(kcfg_getAcidUsr3, ""); + CS->setcfgAndFlush(kcfg_usrAcidChooseName3, ""); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite3, ""); + + CS->setcfgAndFlush(kcfg_grantAcidName4, ""); + CS->setcfgAndFlush(kcfg_getAcidUsr4, ""); + CS->setcfgAndFlush(kcfg_usrAcidChooseName4, ""); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite4, ""); + + CS->setcfgAndFlush(kcfg_grantAcidName5, ""); + CS->setcfgAndFlush(kcfg_getAcidUsr5, ""); + CS->setcfgAndFlush(kcfg_usrAcidChooseName5, ""); + CS->setcfgAndFlush(kcfg_usrAcidCapacityLimite5, ""); + UIS->chpage(pg_muGetAcidRcod); + UIS->sendcmd("sendme"); + } +}; diff --git a/usrc/service/page/submenu/Page_muGetAcidRcord.hpp b/usrc/service/page/submenu/Page_muGetAcidRcord.hpp new file mode 100644 index 0000000..cc0b32d --- /dev/null +++ b/usrc/service/page/submenu/Page_muGetAcidRcord.hpp @@ -0,0 +1,25 @@ +#pragma once +// +#include "../page_processer.hpp" + +namespace iflytop { +using namespace std; +// page: keybAcidCh +class Page_muGetAcidRcord : public IPageProcesser { + private: + /* data */ + + public: + static Page_muGetAcidRcord* ins() { + static Page_muGetAcidRcord instance; + return &instance; + } + + private: + virtual bool isBelongThisPage(int page) override; + + virtual void OnPageLoad(OnPageLoadContext* cxt) override; + virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override; + virtual void OnButton(uint8_t bid, uint8_t val) override; +}; +} // namespace iflytop \ No newline at end of file diff --git a/usrc/service/pump_ctrl_service.cpp b/usrc/service/pump_ctrl_service.cpp index d4fcf96..53bc3c5 100644 --- a/usrc/service/pump_ctrl_service.cpp +++ b/usrc/service/pump_ctrl_service.cpp @@ -33,7 +33,7 @@ void PumpCtrlService::initialize() { } } }); -m_monitor_thread.init("PumpCtrlServiceMonitor", 1024); + m_monitor_thread.init("PumpCtrlServiceMonitor", 1024); m_monitor_thread.start([this]() { for (size_t i = 0; i < 4; i++) { TMC51X0* motor = m_motors[i]; @@ -76,7 +76,6 @@ m_monitor_thread.init("PumpCtrlServiceMonitor", 1024); } } }); - } #define WAIT_FOR_MOTOR_STOP() \ @@ -245,11 +244,11 @@ void PumpCtrlService::rotate(int32_t mid, int32_t direction) { ZLOGE(TAG, "rotate fail, PumpCtrlService isWorking"); return; } - + tryUpdateMotorSetting(); ValveStateSyncService::ins()->setValveState(1); TMC51X0* cur_motor = m_motors[mid]; // cur_motor->rotate(direction > 0 ? getMxRunRPM(mid) : -getMxRunRPM(mid)); - cur_motor->moveToEnd(direction > 0 ? 1 : -1,getMxRunRPM(mid)); + cur_motor->moveToEnd(direction > 0 ? 1 : -1, getMxRunRPM(mid)); } void PumpCtrlService::stopRotate() { if (isWorking()) {