解决本地异常判定任务数量与实际不符的bug

V2.04

checher_slave.uvoptx

@@ -551,7 +551,7 @@
         <bEvRecOn>1</bEvRecOn>
         <bSchkAxf>0</bSchkAxf>
         <bTchkAxf>0</bTchkAxf>
-        <nTsel>4</nTsel>
+        <nTsel>6</nTsel>
         <sDll></sDll>
         <sDllPa></sDllPa>
         <sDlgDll></sDlgDll>
@@ -562,9 +562,14 @@
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
         <tIfile></tIfile>
-        <pMon>Segger\JL2CM3.dll</pMon>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>

source/ReadMe.txt

@@ -244,5 +244,8 @@
     启动时调压改为查找任务id0，自检信息中的方案id由方案初始化时确定
     接收到升级方案命令时把本机方案状态设置为无效
     检测电阻命令index为5时读取本机校准值
+2023.11.6
+    解决本地异常判定任务数量与实际不符的bug
+    V2.04
 
     

source/elec_det/elec_det.c

@@ -467,7 +467,7 @@ array_def *elec_check_with_scheme(array_def *uid_psw)
   }
   
   elec_judge_def *e=malloc(sizeof(elec_judge_def));
-  elec_judge(e,checker_runcfg.rtv_index,checker_runcfg.Task_Result,
+  elec_judge(e,s->task_num,checker_runcfg.Task_Result,
     checker_runcfg.Task_Excute,
     (uint8_t *)checker_runcfg.Test_Rtv,0,0);
   free(e);

source/elec_det/elec_judge.c

@@ -124,6 +124,7 @@ static void elec_current(elec_judge_def *e,int index,uint8_t *data)
   {
     // 接触异常
     elec_add_errcode(e,3);
+    //DBG_WARN("task ret_index:%d vaule1=%d,vaule12=%d",i,temp,task->range[i].err);
   }
   else if(((temp>task->range[0].max)&&(temp<short_c))||
     ((temp2>task->range[1].max)&&(temp2<short_c)))
@@ -356,6 +357,10 @@ void elec_judge(elec_judge_def *e,int task_num,uint8_t *exe_ack,
   const scheme_task_def *task;
   memset(e,0,sizeof(elec_judge_def));
   e->scheme=check_scheme();
+  if(e->scheme->plan_id==0xffffffff){
+    DBG_WARN("can not find judge params.");
+    return;
+  }
   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;

source/main/compiler_info.h

@@ -6,8 +6,8 @@
 
 
 
-#define BUILD_DATE  "2023-11-04 17:32:07"
-#define SOFT_VERSION  "2.03"
+#define BUILD_DATE  "2023-11-06 16:44:51"
+#define SOFT_VERSION  "2.04"
 
 
 

source/prebuild.py

@@ -7,7 +7,7 @@ import mycopy
 
 
 # 定义软件版本号
-SOFT_VERION = "2.03"
+SOFT_VERION = "2.04"