andy/checker_slave
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改检测后CAN总线自动上传基础延时为 addr*10+200

Browse Source 
修改检测时注码,单独注码判定
添加cmd_printf 函数不会自动添加换行符
This commit is contained in:
ranchuan
2023-10-18 18:24:46 +08:00
parent dc92f48f75
commit 8a91c94c85
9 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/elec_det/elec_det.c
View File

@@ -139,6 +139,7 @@ array_def *elec_bootinfo(void)
Ye_BoardCheck();
board_st.hard_v=sys_param()->hard_version;
board_st.resistor_diff=sys_param()->resistor_diff;
board_st.hard_v=rt_tick_get()/1000;
board_st.soft_v=(int)(str_atof(SOFT_VERSION)*100);
array_def *r=arr_creat();
arr_append(r,0);
@@ -294,20 +295,20 @@ static void elec_load_scheme(void)
}
// 注码 参数校验
// 注码 参数校验 1,检测时注码；0,单独注码；-1,失败
static int elec_code_param_check(array_def *uid_psw)
{
if((uid_psw==0)||(arr_length(uid_psw)==0)){
return 1;
return -1;
}
if(arr_length(uid_psw)!=(arr_get(uid_psw,0)+arr_get(uid_psw,1)+3)){
return 2;
}
if(arr_get(uid_psw,2)!=0){
return 3;
return -1;
}
if((arr_get(uid_psw,0)>13)||(arr_get(uid_psw,1)>8)){
return 4;
return -1;
}
if(arr_get(uid_psw,2)!=0){
return 1;
}
return 0;
}
@@ -375,7 +376,7 @@ array_def *elec_check_with_scheme(array_def *uid_psw)
memset(&checker_runcfg,0,sizeof(Checker_RunCfg_st));
checker_runcfg.power_prapare_exe=res;
chip_type=(board_st.plan_id >> 12 ) & 0x0F;
if(elec_code_param_check(uid_psw)==0){
if(elec_code_param_check(uid_psw)==1){
elec_code_load_param(uid_psw);
}
@@ -445,8 +446,8 @@ array_def *elec_code(array_def *uid_psw)
int check_ret=0;
CHECK_DO(s->data,arr_delete);
check_ret=elec_code_param_check(uid_psw);
if(check_ret){
arr_append(r,check_ret);
if(check_ret!=0){
arr_append(r,1);
return arr_temp(r);
}
elec_code_load_param(uid_psw);