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

注码命令02打印检测数据，开路判线改为30

Browse Source
This commit is contained in:
ranchuan
2024-03-06 16:41:37 +08:00
parent 2fb109f2ac
commit 50c54bca9c
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
complier_info.h
View File

@@ -6,7 +6,7 @@
#define BUILD_DATE "2024-01-29 17:53:35" #define BUILD_DATE "2024-03-01 11:12:15"

2
elec/elec_judge.cpp
View File

@@ -427,7 +427,7 @@ void elec_judge(const scheme_def *s,int task_num,uint8_t *exe_ack,
e->judge_fun_table=g_judge_fun_table[elec_extract_chip(e->scheme->plan_id)]; e->judge_fun_table=g_judge_fun_table[elec_extract_chip(e->scheme->plan_id)];
e->judge_fun_num=elec_calc_judge_fun_num(e->judge_fun_table); e->judge_fun_num=elec_calc_judge_fun_num(e->judge_fun_table);
e->short_circuited=1500; e->short_circuited=1500;
e->open_circuited=80; e->open_circuited=30;
e->exe_ack=exe_ack; e->exe_ack=exe_ack;
if(task_num>e->scheme->task_num) if(task_num>e->scheme->task_num)
task_num=e->scheme->task_num; task_num=e->scheme->task_num;

4
info.json
View File

@@ -1,10 +1,10 @@
{ {
"build_date": "2024-01-29 17:53:35", "build_date": "2024-03-01 11:12:15",
"hard_version": "MHPZ2_V1.00", "hard_version": "MHPZ2_V1.00",
"private": [ "private": [
"info.json", "info.json",
"json.lua", "json.lua",
"prints.lua" "prints.lua"
], ],
"soft_version": "V2.05" "soft_version": "V2.06"
} }

6
prot_cmd/cmd_coder.cpp
View File

@@ -438,7 +438,7 @@ myarray cmd_coder_code::cmd_pc_to_slave(myarray data)
ret+=d; ret+=d;
} }
// 检测模式1,返回异常代码和任务插槽数据 // 检测模式1,返回异常代码和任务插槽数据
ret.insert(0,uint8_t(1)); ret.insert(0,uint8_t(2));
qDebug("tran pc data to slave end"); qDebug("tran pc data to slave end");
return ret; return ret;
} }
@@ -446,6 +446,7 @@ myarray cmd_coder_code::cmd_pc_to_slave(myarray data)
// 把从机回复的数据转化为上位机能理解的格式 // 把从机回复的数据转化为上位机能理解的格式
myarray cmd_coder_code::ret_slave_to_pc(QList<myarray> data) myarray cmd_coder_code::ret_slave_to_pc(QList<myarray> data)
{ {
check_cfg *ccfg_=check_plan();
myarray r; myarray r;
r.append(uint8_t(addrs)); r.append(uint8_t(addrs));
for (int i=0;i<data.size();i++) for (int i=0;i<data.size();i++)
@@ -456,6 +457,9 @@ myarray cmd_coder_code::ret_slave_to_pc(QList<myarray> data)
r.append(uint8_t(addr)); r.append(uint8_t(addr));
if(sdata.size()>0){ if(sdata.size()>0){
r.append(sdata[0]); r.append(sdata[0]);
int return_num=ccfg_->get_return_num();
myarray check_data=sdata.left(1+16+return_num*2);
tran_slave_to_selfdev_check(check_data);
}else{ }else{
r.append(uint8_t(0xd0)); r.append(uint8_t(0xd0));
} }

2
quest_info.txt
View File

@@ -1 +1 @@
V2.05 回滚JQ芯片三码算法 V2.06 添加赋码仪一体机(inte_coder),串口屏赋码仪(hmi_coder)的支持，添加自动测试功能(cfgset auto_test 12)此命令根据设备类型（coder/checker）来自动发送按键按下的指令