diff --git a/.cproject b/.cproject
index 8c4f0f0..65c01f3 100644
--- a/.cproject
+++ b/.cproject
@@ -134,34 +134,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -177,7 +177,7 @@
-
+
diff --git a/README.md b/README.md
index 45bc3f0..d6d60f0 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ UI
1. 将confirm功能提取出来，单独有一个confirm页面进行处理
2. 添加返回按键事件
3. 添加page_init事件，去掉page_load事件
-
+ 4. 修改键盘逻辑，中文输入时，显示中，英文输入时显示英
```
@@ -55,4 +55,5 @@ UI
```
量产时注意事项:
1. 量产时，需要注意注意掉显示密码的相关日志
+
```
diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI
index ad360de..a812382 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 b1f4b2b..409d721 100644
--- a/ui/ui.h
+++ b/ui/ui.h
@@ -1,522 +1,464 @@
-// 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_muPumpTest 19
-#define pg_alert 20
-#define pg_confirm 21
-#define pg_keybAcidCh 22
-#define pg_keybdB 23
-#define pg_keybdAP 24
-#define pg_keybdA 25
-#define pg_keyPasswd 26
-// 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_uen6 19
-// 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
-// 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_menuUsr 6
+#define pg_muInterval 7
+#define pg_muUsrMgr 8
+#define pg_muTmrMgr 9
+#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
+//gvar.objs
+#define ob_gvar_gvar 0
+#define ob_gvar_menupageid 1
+#define ob_gvar_bt0 2
+//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_pwd 2
+#define ob_login_uName 3
+#define ob_login_uNameEMsg 4
+#define ob_login_pwdEMsg 5
+//main.objs
+#define ob_main_main 0
+#define ob_main_acidch0 1
+#define ob_main_MenuButton 2
+#define ob_main_acidname0 3
+#define ob_main_acideval0 4
+#define ob_main_sysInfo 5
+#define ob_main_clock 6
+#define ob_main_acidname0id 7
+#define ob_main_acidname1id 8
+#define ob_main_acidname2id 9
+#define ob_main_acidname3id 10
+#define ob_main_RemoterS 11
+#define ob_main_AcidState 12
+#define ob_main_RunMode 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
+//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
+//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_usr1en 5
+#define ob_muUsrMgr_usr2name 6
+#define ob_muUsrMgr_usr2en 7
+#define ob_muUsrMgr_usr3name 8
+#define ob_muUsrMgr_usr3en 9
+#define ob_muUsrMgr_usr4name 10
+#define ob_muUsrMgr_usr4en 11
+#define ob_muUsrMgr_usr1Rest 12
+#define ob_muUsrMgr_usr2Rest 13
+#define ob_muUsrMgr_usr3Rest 14
+#define ob_muUsrMgr_usr4Rest 15
+#define ob_muUsrMgr_usr5name 16
+#define ob_muUsrMgr_usr5en 17
+#define ob_muUsrMgr_usr5Rest 18
+#define ob_muUsrMgr_OperaCol 19
+#define ob_muUsrMgr_usr1ReName 20
+#define ob_muUsrMgr_usr2ReName 21
+#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
+#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_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_addAcidVel0 21
+#define ob_muSettings_addAcidVel1 22
+#define ob_muSettings_addAcidVel2 23
+#define ob_muSettings_pipeLen0 24
+#define ob_muSettings_pipeLen2 25
+#define ob_muSettings_pipeLen1 26
+//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
+//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_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
+//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
+//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
+//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/usrc/apphardware/apphardware.cpp b/usrc/apphardware/apphardware.cpp
index 8ecb8e3..a315041 100644
--- a/usrc/apphardware/apphardware.cpp
+++ b/usrc/apphardware/apphardware.cpp
@@ -1,4 +1,5 @@
#include "apphardware.hpp"
+#include "ucomponents/zcan/zcan.hpp"
using namespace iflytop;
#define TAG "AppHardware"
@@ -9,6 +10,8 @@ void AppHardware::setTJCScreenInDownloadMode() {
}
void AppHardware::initialize() {
+ ZCAN1::ins()->zcaninit(CAN1_TX_PIN, CAN1_RX_PIN);
+
AppHal::MX_I2C1_Init();
AppHal::tmc_spi_init();
@@ -24,7 +27,6 @@ void AppHardware::initialize() {
AppHal::UART3_Init(BLE_UART_TX, BLE_UART_RX, 115200);
remoteContolerUart = &BLE_UART_INS;
-
MOTO_POWER_EN.initAsOutput(MOTO_POWER_EN_IO, kxs_gpio_nopull, false, true);
MOTO1_CSN.initAsOutput(MOTO1_CSN_IO, kxs_gpio_nopull, false, true);
MOTO2_CSN.initAsOutput(MOTO2_CSN_IO, kxs_gpio_nopull, false, true);
diff --git a/usrc/service/app_core.cpp b/usrc/service/app_core.cpp
index b831362..c7d3fc6 100644
--- a/usrc/service/app_core.cpp
+++ b/usrc/service/app_core.cpp
@@ -12,28 +12,11 @@
#include "ucomponents/zcan/zcan.hpp"
//
#include "uicontroler/front_end_controler.hpp"
-#include "uicontroler/page/page.hpp"
+// #include "uicontroler/page/page.hpp"
#define TAG "main"
using namespace iflytop;
-/**
- * @brief
- *
- *
- *
- */
-
-// #define TEST_ID
-// #define TEST_CAN
-// #define TEST_TMC_MOTOR
-// #define TEST_TMC_MOTOR_REF
-// #define TEST_BLE_IF
-// #define TEST_EEPROM
-#define TEST_TJC_SCREEN
-// #define TEST_RTC
-// #define TEST_USB
-
static const char* zhex2str(uint8_t* data, size_t len) {
static char buf[256];
memset(buf, 0, sizeof(buf));
@@ -46,177 +29,6 @@ static const char* zhex2str(uint8_t* data, size_t len) {
extern "C" {
void umain() { AppCore::ins()->initialize(); }
}
-extern "C" {
-extern void MX_USB_HOST_Init(void);
-extern void MX_FATFS_Init();
-}
-void AppCore::test() {
- osDelay(1000);
- /***********************************************************************************************************************
- * INIT *
- ***********************************************************************************************************************/
- // 硬件无关组件初始化
- GStateMgr::ins()->initialize();
- AppEventBus::ins()->initialize();
-
- // 硬件初始化
- ZCAN1::ins()->zcaninit(CAN1_TX_PIN, CAN1_RX_PIN);
- AppHardware::ins()->initialize(); // 基础硬件初始化
-
-#ifdef TEST_ID
-
- while (true) {
- ID* id = &AppHardware::ins()->id;
- ZLOGI(TAG, "ID0:%d ID1:%d ID2:%d ID3:%d ID4:%d", //
- id->ID0.read(), id->ID1.read(), id->ID2.read(), id->ID3.read(), id->ID4.read());
- osDelay(1000);
- }
-
-#endif
-
-#ifdef TEST_CAN
- //
-
- ZCAN1::ins()->regOnCanMessage([this](zcanrx_t* rx) { //
- ZLOGI(TAG, "zcanrx 0x%08x:%s", rx->extid, zhex2str(rx->rxpacket, rx->rkpacketlen));
- });
-
- while (true) {
- static uint8_t txdata[] = {0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78};
- ZCAN1::ins()->txMsg(0x33333333, (uint8_t*)txdata, 8, 1000);
- osDelay(1000);
- }
-
-#endif
-
-#ifdef TEST_TMC_MOTOR
-
- while (true) {
- AppHardware::ins()->MOTO1.rotate(800);
- osDelay(3000);
- AppHardware::ins()->MOTO2.rotate(800);
- osDelay(3000);
- AppHardware::ins()->MOTO3.rotate(800);
- osDelay(3000);
- AppHardware::ins()->MOTO4.rotate(800);
- osDelay(3000);
- AppHardware::ins()->MOTO1.rotate(0);
- AppHardware::ins()->MOTO2.rotate(0);
- AppHardware::ins()->MOTO3.rotate(0);
- AppHardware::ins()->MOTO4.rotate(0);
- osDelay(3000);
- }
-
-#endif
-
-#ifdef TEST_TMC_MOTOR_REF
-
- auto* m1_ref_l = &AppHardware::ins()->MOTOR1_REF_L;
- auto* m1_ref_r = &AppHardware::ins()->MOTOR1_REF_R;
- auto* m2_ref_l = &AppHardware::ins()->MOTOR2_REF_L;
- auto* m2_ref_r = &AppHardware::ins()->MOTOR2_REF_R;
- auto* m3_ref_l = &AppHardware::ins()->MOTOR3_REF_L;
- auto* m3_ref_r = &AppHardware::ins()->MOTOR3_REF_R;
- auto* m4_ref_l = &AppHardware::ins()->MOTOR4_REF_L;
- auto* m4_ref_r = &AppHardware::ins()->MOTOR4_REF_R;
-
- while (true) {
- ZLOGI(TAG, "m1 r:%d l:%d , m2 r:%d l:%d , m3 r:%d l:%d , m4 r:%d l:%d", //
- m1_ref_r->read(), m1_ref_l->read(), m2_ref_r->read(), m2_ref_l->read(), m3_ref_r->read(), m3_ref_l->read(), m4_ref_r->read(), m4_ref_l->read());
- osDelay(1000);
- }
-
-#endif
-
-#ifdef TEST_BLE_IF
- RCTRL->initialize();
- RCTRL->startSchedule();
-
- ZLOGI(TAG, "start scan :%s", BLENAME);
- for (size_t i = 0;; i++) {
- if (i != 0) ZLOGI(TAG, "re start scan %s %d", BLENAME, i);
- bool suc = RCTRL->startScan(BLENAME, true);
- if (suc) break;
- }
- ZLOGI(TAG, "start scan ok");
-
- RCTRL->regOnReport([this](uint8_t* rx, int32_t len) {
- zble_proto_packet_t* packet = (zble_proto_packet_t*)rx;
- if (packet->cmd == kzble_app_report_key_event) {
- int32_t keyEvent = *(int32_t*)packet->data;
- if (keyEvent == hand_acid_remoter_kevent_add_liquid) ZLOGI(TAG, "OnKey --> add_liquid");
- if (keyEvent == hand_acid_remoter_kevent_change_next_mode) ZLOGI(TAG, "OnKey --> change_next_mode");
- if (keyEvent == hand_acid_remoter_kevent_reflux) ZLOGI(TAG, "OnKey --> reflux");
- if (keyEvent == hand_acid_remoter_kevent_preFilling) ZLOGI(TAG, "OnKey --> preFilling");
- return;
- }
- });
-
- while (true) {
- ZLOGI(TAG, "ble connect state %d", RCTRL->isConnected());
- osDelay(1000);
- }
-
-#endif
-#ifdef TEST_EEPROM
- while (true) {
- // 扫描到 0x50 说明EEPROM在线
- AppHardware::ins()->eeprom.scan_i2c();
- osDelay(3000);
- }
-#endif
-
-#ifdef TEST_TJC_SCREEN_DOWNLOAD_MODE
- AppHardware::ins()->setTJCScreenInDownloadMode();
-#endif
-
-#ifdef TEST_TJC_SCREEN
- FrontEndControler::ins()->initialize();
- FrontEndControler::ins()->startSchedule();
- while (true) {
- // 扫描到 0x50 说明EEPROM在线
- uint8_t tx = 0x10;
- uint8_t rx = 0;
- bool suc = FrontEndControler::ins()->echo(tx, &rx);
- ZLOGI(TAG, "echo suc:%d tx:%x rx:%x", suc, tx, rx);
- osDelay(100);
- }
-
-#endif
-
-#ifdef TEST_RTC
- AppHal::rtc_init();
- RTC_DateTypeDef GetData; // 获取日期结构体
- RTC_TimeTypeDef GetTime; // 获取时间结构体
-
- while (true) {
- /* Get the RTC current Time */
- HAL_RTC_GetTime(&hrtc, &GetTime, RTC_FORMAT_BIN);
- /* Get the RTC current Date */
- HAL_RTC_GetDate(&hrtc, &GetData, RTC_FORMAT_BIN);
-
- /* Display date Format : yy/mm/dd */
- ZLOGI(TAG, "%02d/%02d/%02d\r\n", 2000 + GetData.Year, GetData.Month, GetData.Date);
- /* Display time Format : hh:mm:ss */
- ZLOGI(TAG, "%02d:%02d:%02d\r\n", GetTime.Hours, GetTime.Minutes, GetTime.Seconds);
-
- ZLOGI(TAG, "\r\n");
-
- osDelay(1000);
- }
-#endif
-
-#ifdef TEST_USB
-
- ZGPIO USB_PWR;
- USB_PWR.initAsOutput(PA15, kxs_gpio_nopull, false, true);
- MX_FATFS_Init();
- MX_USB_HOST_Init();
- while (true) {
- osDelay(1000);
- }
-#endif
-}
static ZThread ledthread;
@@ -263,7 +75,19 @@ void AppCore::initialize() {
}
});
- test();
+ osDelay(1000);
+
+ // 硬件无关组件初始化
+ GStateMgr::ins()->initialize();
+ AppEventBus::ins()->initialize();
+
+ // 硬件初始化
+ AppHardware::ins()->initialize(); // 基础硬件初始化
+ FrontEndControler::ins()->initialize();
+
+ // FrontEndControler::ins()->chpage(pg_main);
+
+
while (true) osDelay(30);
}
diff --git a/usrc/service/app_core.hpp b/usrc/service/app_core.hpp
index 67c5849..c1d6d9c 100644
--- a/usrc/service/app_core.hpp
+++ b/usrc/service/app_core.hpp
@@ -18,7 +18,6 @@ class AppCore {
void appsetup();
public:
- void test();
};
} // namespace iflytop
\ No newline at end of file
diff --git a/usrc/service/remote_controler_event_processer.cpp b/usrc/service/remote_controler_event_processer.cpp
index b518289..7c0091b 100644
--- a/usrc/service/remote_controler_event_processer.cpp
+++ b/usrc/service/remote_controler_event_processer.cpp
@@ -5,8 +5,6 @@
//
#include "uicontroler/front_end_controler.hpp"
-#include "uicontroler/page/page.hpp"
-//
using namespace iflytop;
#define TAG "RemoteControlerEventProcesser"
diff --git a/usrc/uicontroler/base/page_processer.hpp b/usrc/uicontroler/base/page_processer.hpp
index 11bc7fa..fc779bb 100644
--- a/usrc/uicontroler/base/page_processer.hpp
+++ b/usrc/uicontroler/base/page_processer.hpp
@@ -34,7 +34,7 @@ class IPageProcesser {
OnDoubleStateButton(event->bid, event->d.double_state_button.val);
} else if (event->eventId == tjc::kpt_button_event) {
OnButton(event->bid, event->d.button_event.val);
- } else if (event->eventId == tjc::kpt_inputfield_content_change_event1 || event->eventId == tjc::kpt_inputfield_content_change_event0) {
+ } else if (event->eventId == tjc::kpt_inputfield_content_change_event1) {
OnInputFieldContentChange(event->bid, event->d.inputfield_content.text);
}
});
@@ -43,12 +43,12 @@ class IPageProcesser {
}
private:
-
virtual void OnPageLoad(OnPageLoadContext* cxt) { return; };
+ virtual void OnBackKey(OnPageLoadContext* cxt) { return; };
virtual void OnInputFieldContentChange(uint8_t bid, const char* text) { return; };
virtual void OnButton(uint8_t bid, uint8_t val) { return; };
virtual void OnDoubleStateButton(uint8_t bid, uint8_t val) { return; };
virtual void OnAppEvent(AppEvent_t* event) { return; };
};
-} // namespace iflytop
+} // namespace iflytop
\ No newline at end of file
diff --git a/usrc/uicontroler/page/Page_login.cpp b/usrc/uicontroler/page.bak/Page_login.cpp
similarity index 100%
rename from usrc/uicontroler/page/Page_login.cpp
rename to usrc/uicontroler/page.bak/Page_login.cpp
diff --git a/usrc/uicontroler/page/Page_login.hpp b/usrc/uicontroler/page.bak/Page_login.hpp
similarity index 100%
rename from usrc/uicontroler/page/Page_login.hpp
rename to usrc/uicontroler/page.bak/Page_login.hpp
diff --git a/usrc/uicontroler/page/Page_main.cpp b/usrc/uicontroler/page.bak/Page_main.cpp
similarity index 100%
rename from usrc/uicontroler/page/Page_main.cpp
rename to usrc/uicontroler/page.bak/Page_main.cpp
diff --git a/usrc/uicontroler/page/Page_main.hpp b/usrc/uicontroler/page.bak/Page_main.hpp
similarity index 100%
rename from usrc/uicontroler/page/Page_main.hpp
rename to usrc/uicontroler/page.bak/Page_main.hpp
diff --git a/usrc/uicontroler/page/Page_menu.cpp b/usrc/uicontroler/page.bak/Page_menu.cpp
similarity index 100%
rename from usrc/uicontroler/page/Page_menu.cpp
rename to usrc/uicontroler/page.bak/Page_menu.cpp
diff --git a/usrc/uicontroler/page/Page_menu.hpp b/usrc/uicontroler/page.bak/Page_menu.hpp
similarity index 100%
rename from usrc/uicontroler/page/Page_menu.hpp
rename to usrc/uicontroler/page.bak/Page_menu.hpp
diff --git a/usrc/uicontroler/page/keyboard/Page_keybAcidCh.cpp b/usrc/uicontroler/page.bak/keyboard/Page_keybAcidCh.cpp
similarity index 100%
rename from usrc/uicontroler/page/keyboard/Page_keybAcidCh.cpp
rename to usrc/uicontroler/page.bak/keyboard/Page_keybAcidCh.cpp
diff --git a/usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp b/usrc/uicontroler/page.bak/keyboard/Page_keybAcidCh.hpp
similarity index 100%
rename from usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp
rename to usrc/uicontroler/page.bak/keyboard/Page_keybAcidCh.hpp
diff --git a/usrc/uicontroler/page/page.hpp b/usrc/uicontroler/page.bak/page.hpp
similarity index 100%
rename from usrc/uicontroler/page/page.hpp
rename to usrc/uicontroler/page.bak/page.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_changePasswd.cpp b/usrc/uicontroler/page.bak/submenu/Page_changePasswd.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_changePasswd.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_changePasswd.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_changePasswd.hpp b/usrc/uicontroler/page.bak/submenu/Page_changePasswd.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_changePasswd.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_changePasswd.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muAcidType.cpp b/usrc/uicontroler/page.bak/submenu/Page_muAcidType.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muAcidType.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muAcidType.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muAcidType.hpp b/usrc/uicontroler/page.bak/submenu/Page_muAcidType.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muAcidType.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muAcidType.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muAudit.cpp b/usrc/uicontroler/page.bak/submenu/Page_muAudit.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muAudit.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muAudit.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muAudit.hpp b/usrc/uicontroler/page.bak/submenu/Page_muAudit.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muAudit.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muAudit.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muBleHandSett.cpp b/usrc/uicontroler/page.bak/submenu/Page_muBleHandSett.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muBleHandSett.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muBleHandSett.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muBleHandSett.hpp b/usrc/uicontroler/page.bak/submenu/Page_muBleHandSett.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muBleHandSett.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muBleHandSett.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muDeviceInfo.cpp b/usrc/uicontroler/page.bak/submenu/Page_muDeviceInfo.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muDeviceInfo.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muDeviceInfo.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muDeviceInfo.hpp b/usrc/uicontroler/page.bak/submenu/Page_muDeviceInfo.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muDeviceInfo.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muDeviceInfo.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muInterval.cpp b/usrc/uicontroler/page.bak/submenu/Page_muInterval.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muInterval.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muInterval.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muInterval.hpp b/usrc/uicontroler/page.bak/submenu/Page_muInterval.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muInterval.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muInterval.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muMotorSett.cpp b/usrc/uicontroler/page.bak/submenu/Page_muMotorSett.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muMotorSett.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muMotorSett.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muMotorSett.hpp b/usrc/uicontroler/page.bak/submenu/Page_muMotorSett.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muMotorSett.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muMotorSett.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muPumpSett.cpp b/usrc/uicontroler/page.bak/submenu/Page_muPumpSett.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muPumpSett.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muPumpSett.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muPumpSett.hpp b/usrc/uicontroler/page.bak/submenu/Page_muPumpSett.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muPumpSett.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muPumpSett.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muPumpTest.cpp b/usrc/uicontroler/page.bak/submenu/Page_muPumpTest.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muPumpTest.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muPumpTest.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muPumpTest.hpp b/usrc/uicontroler/page.bak/submenu/Page_muPumpTest.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muPumpTest.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muPumpTest.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muSettings.cpp b/usrc/uicontroler/page.bak/submenu/Page_muSettings.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muSettings.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muSettings.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muSettings.hpp b/usrc/uicontroler/page.bak/submenu/Page_muSettings.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muSettings.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muSettings.hpp
diff --git a/usrc/uicontroler/page/submenu/Page_muUsrMgr.cpp b/usrc/uicontroler/page.bak/submenu/Page_muUsrMgr.cpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muUsrMgr.cpp
rename to usrc/uicontroler/page.bak/submenu/Page_muUsrMgr.cpp
diff --git a/usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp b/usrc/uicontroler/page.bak/submenu/Page_muUsrMgr.hpp
similarity index 100%
rename from usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp
rename to usrc/uicontroler/page.bak/submenu/Page_muUsrMgr.hpp
diff --git a/usrc/uicontroler/page/README.md b/usrc/uicontroler/page/README.md
new file mode 100644
index 0000000..0b45f64
--- /dev/null
+++ b/usrc/uicontroler/page/README.md
@@ -0,0 +1,11 @@
+```
+initializer 初始化页面
+home 首页
+login 登录页面
+menu 菜单页
+submenu 菜单子页
+subx2menu 菜单子子页
+popup 弹窗页面
+load 加载页面
+keyboard 键盘
+```
\ No newline at end of file
diff --git a/usrc/uicontroler/page/initializer/PageInitializer.cpp b/usrc/uicontroler/page/initializer/PageInitializer.cpp
new file mode 100644
index 0000000..4ec57da
--- /dev/null
+++ b/usrc/uicontroler/page/initializer/PageInitializer.cpp
@@ -0,0 +1,10 @@
+#pragma once
+#include "uicontroler/base/page_processer.hpp"
+namespace iflytop {
+using namespace std;
+
+
+
+} // namespace iflytop
+
+// kpt_sys_event_page_id
\ No newline at end of file
diff --git a/usrc/uicontroler/page/login/page_login.cpp b/usrc/uicontroler/page/login/page_login.cpp
new file mode 100644
index 0000000..fa12fb2
--- /dev/null
+++ b/usrc/uicontroler/page/login/page_login.cpp
@@ -0,0 +1,35 @@
+#pragma once
+#include "ui/ui.h"
+#include "uicontroler/base/page_processer.hpp"
+namespace iflytop {
+using namespace std;
+
+class PageLogin : public IPageProcesser {
+ private:
+ /* data */
+
+ PageLogin() : IPageProcesser(pg_login) {}
+
+ public:
+ static PageLogin* ins() {
+ static PageLogin instance;
+ return &instance;
+ }
+
+ private:
+ virtual void OnPageLoad(OnPageLoadContext* cxt) override {}
+ virtual void OnBackKey(OnPageLoadContext* cxt) override {}
+ virtual void OnInputFieldContentChange(uint8_t bid, const char* text) override {}
+ virtual void OnButton(uint8_t bid, uint8_t val) override {}
+ virtual void OnDoubleStateButton(uint8_t bid, uint8_t val) override {}
+ virtual void OnAppEvent(AppEvent_t* event) override {}
+};
+
+
+
+
+void PageLoginInit() { PageLogin::ins()->initialize(); }
+
+} // namespace iflytop
+
+// kpt_sys_event_page_id
\ No newline at end of file
diff --git a/usrc/uicontroler/tjc/tjc_constant.hpp b/usrc/uicontroler/tjc/tjc_constant.hpp
index 4958513..6309006 100644
--- a/usrc/uicontroler/tjc/tjc_constant.hpp
+++ b/usrc/uicontroler/tjc/tjc_constant.hpp
@@ -15,6 +15,18 @@ namespace tjc {
* 3.页面名称最大长度为14
* 4.密码为纯数字6位数密码
*
+ *
+ * 1. 键盘最终不修改页面内容，页面内容由单片机进行修改
+ * 2. 每进入一个页面均要发送sendme指令
+ * 2. 可用组件
+ * 按键
+ * 双态按键
+ * 键盘
+ * 文本输入框（页面一律使用文本输入框）
+ * 图片
+ * 返回按键
+ * 下拉框组件
+ *
*/
#define MAX_USR_PASSWD_LENGTH (6)
@@ -47,7 +59,7 @@ typedef enum {
/**
* @brief 事件
*/
- kpt_button_event = 0x65, //
+ kpt_button_event = 0x65, // 普通按键
kpt_sys_event_page_id = 0x66, // 页面变化事件
kpt_sys_event_touch_data = 0x67,
kpt_sys_event_sleep_touch = 0x68,
@@ -67,6 +79,7 @@ typedef enum {
//
kpt_inputfield_content_change_event1 = 0xAC, // 跨页面键盘输入事件
kpt_double_state_button_event = 0xAD,
+ kpt_bakup_button_event = 0xB0, // 返回按键
} packet_type_t;
typedef enum {