From 50c54bca9c7877bf5ca4bfa0de7a80a89980b5c6 Mon Sep 17 00:00:00 2001
From: ranchuan <rd05cqmcloud.com>
Date: Wed, 6 Mar 2024 16:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E7=A0=81=E5=91=BD=E4=BB=A402=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=BC=80?=
 =?UTF-8?q?=E8=B7=AF=E5=88=A4=E7=BA=BF=E6=94=B9=E4=B8=BA30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 complier_info.h        | 2 +-
 elec/elec_judge.cpp    | 2 +-
 info.json              | 4 ++--
 prot_cmd/cmd_coder.cpp | 6 +++++-
 quest_info.txt         | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/complier_info.h b/complier_info.h
index 6e3c80a..269042a 100644
--- a/complier_info.h
+++ b/complier_info.h
@@ -6,7 +6,7 @@
 
 
 
-#define BUILD_DATE  "2024-01-29 17:53:35"
+#define BUILD_DATE  "2024-03-01 11:12:15"
 
 
 
diff --git a/elec/elec_judge.cpp b/elec/elec_judge.cpp
index a9bd05f..9b1d06b 100644
--- a/elec/elec_judge.cpp
+++ b/elec/elec_judge.cpp
@@ -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_num=elec_calc_judge_fun_num(e->judge_fun_table);
   e->short_circuited=1500;
-  e->open_circuited=80;
+  e->open_circuited=30;
   e->exe_ack=exe_ack;
   if(task_num>e->scheme->task_num)
     task_num=e->scheme->task_num;
diff --git a/info.json b/info.json
index 4e215bf..6ca9155 100644
--- a/info.json
+++ b/info.json
@@ -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",
   "private": [
     "info.json",
     "json.lua",
     "prints.lua"
   ],
-  "soft_version": "V2.05"
+  "soft_version": "V2.06"
 }
diff --git a/prot_cmd/cmd_coder.cpp b/prot_cmd/cmd_coder.cpp
index 886ad00..d541421 100644
--- a/prot_cmd/cmd_coder.cpp
+++ b/prot_cmd/cmd_coder.cpp
@@ -438,7 +438,7 @@ myarray cmd_coder_code::cmd_pc_to_slave(myarray data)
     ret+=d;
   }
   // 检测模式1,返回异常代码和任务插槽数据
-  ret.insert(0,uint8_t(1));
+  ret.insert(0,uint8_t(2));
   qDebug("tran pc data to slave end");
   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)
 {
+  check_cfg *ccfg_=check_plan();
   myarray r;
   r.append(uint8_t(addrs));
   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));
     if(sdata.size()>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{
       r.append(uint8_t(0xd0));
     }
diff --git a/quest_info.txt b/quest_info.txt
index 3ff947f..4b99db0 100644
--- a/quest_info.txt
+++ b/quest_info.txt
@@ -1 +1 @@
-  V2.05 回滚JQ芯片三码算法
\ No newline at end of file
+  V2.06 添加赋码仪一体机(inte_coder),串口屏赋码仪(hmi_coder)的支持，添加自动测试功能(cfgset auto_test 12)此命令根据设备类型（coder/checker）来自动发送按键按下的指令
\ No newline at end of file