From cfda1c461bfb49bbfcb81ac2e9ba4e460af0d2ab Mon Sep 17 00:00:00 2001
From: ranchuan <rd05cqmcloud.com>
Date: Sun, 25 Jun 2023 18:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E6=9C=BA=E4=B8=8B=E5=8E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 checker_gen1.uvoptx                           |   2 +-
 python/checker_test.py                        | 125 ++++++++
 ...三码绑定测试2023-06-08 - 副本.json | 283 ++++++++++++++++++
 python/file/Ym_Checker.bin                    | Bin 36348 -> 36356 bytes
 python/prottcp.py                             |  10 +-
 source/ReadMe.txt                             |   3 +-
 source/main/compiler_info.h                   |   2 +-
 source/soft/signal.c                          |   2 +-
 source/task/moter.c                           |  33 ++
 source/task/moter.h                           |   3 +
 source/task/tran_for_checker.c                |  48 ++-
 11 files changed, 497 insertions(+), 14 deletions(-)
 create mode 100644 python/checker_test.py
 create mode 100644 python/file/EX三码绑定测试2023-06-08 - 副本.json

diff --git a/checker_gen1.uvoptx b/checker_gen1.uvoptx
index cb09555..c139aca 100644
--- a/checker_gen1.uvoptx
+++ b/checker_gen1.uvoptx
@@ -120,7 +120,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGUARM</Key>
-          <Name>5</Name>
+          <Name>d</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
diff --git a/python/checker_test.py b/python/checker_test.py
new file mode 100644
index 0000000..4d25709
--- /dev/null
+++ b/python/checker_test.py
@@ -0,0 +1,125 @@
+import serial
+import serial.tools.list_ports
+import threading
+import time
+import socket
+
+# 把tcp封装为串口
+class utcp:
+    is_open=False
+    def __init__(self,port:int)->None:
+        self.ser = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.ser.bind(("",port))
+        self.ser.settimeout(10)
+        self.ser.listen(128)
+        print("wait for mcu connect.")
+        self.client,self.client_addr=self.ser.accept()
+        print("client:",self.client_addr)
+        self.is_open=True
+    def read(self,len:int):
+        return self.client.recv(len)
+    def write(self,data:bytearray):
+        return self.client.send(data)
+    def close(self):
+        self.client.close()
+        self.ser.close()
+        self.is_open=False
+
+class port:
+    def __init__(self) -> None:
+        pass
+    def open(self,name:str,bsp:int):
+        if(name!="utcp"):
+            self.ser = serial.Serial(port=name, baudrate=bsp,bytesize=serial.EIGHTBITS,parity=serial.PARITY_NONE,
+                        stopbits=serial.STOPBITS_ONE,timeout=None)
+        else:
+            self.ser=utcp(9527)
+    def start_recv(self):
+        self.thread_ = threading.Thread(target=self.recv, args=())
+        self.thread_.start()
+    def recv(self,num:int):
+        d=bytes()
+        try:
+            d=self.ser.read(num)
+        except Exception as a:
+            print("port closed")
+            return
+        # print("recv:",d.hex(" "))
+    def send(self,data:bytearray):
+        self.ser.write(data)
+    # 测试上位机
+    def ecode_test(self,times:int):
+        print("检测赋码系统耗时测试：")
+        tick=0
+        while(tick<times):
+            tick+=1
+            print("当前={d1},总共={d2}".format(d1=tick,d2=times))
+            # 等待数据库写入
+            time.sleep(3)
+            start = time.perf_counter()
+            # 开始检测
+            self.send(bytearray([0xB0, 0x00, 0x02, 0x00, 0x60]))
+            # 接收指令应答
+            self.recv(5)
+            # 接收检测结果
+            self.recv(24)
+            end = time.perf_counter()
+            print("检测耗时:",end-start)
+            start2=time.perf_counter()
+            # 开始注码
+            self.send(bytearray([0xF0, 0x00, 0x02, 0xE0, 0x41, 0xB1, 0x00, 0x02, 0x00, 0xFB]))
+            # 接收指令应答
+            self.recv(5)
+            # 接收注码 结果
+            self.recv(305)
+            end = time.perf_counter()
+            print("注码耗时:",end-start2)
+            # 打标结束，保存数据库
+            self.send(bytearray([0xF0, 0x00, 0x02, 0xE2, 0x23, 0xB2, 0x00, 0x02, 0x00, 0x67]))
+            # 接收指令应答
+            self.recv(5)
+            end = time.perf_counter()
+            print("总耗时:",end-start)
+    # 测试注码仪
+    def coder_test(self,times:int):
+        print("赋码仪耗时测试：")
+        tick=0
+        while(tick<times):
+            tick+=1
+            start = time.perf_counter()
+            print("当前={d1},总共={d2}".format(d1=tick,d2=times))
+            # 开始检测
+            self.send(bytearray([0x59, 0x6D, 0x05, 0x00, 0x01, 0x66, 0x04, 0x05, 0x00, 0x2F, 0xD9]))
+            # 接收指令应答
+            self.recv(13)
+            # 接收检测结果
+            self.recv(72)
+            end = time.perf_counter()
+            print("检测耗时:",end-start)
+            start2=time.perf_counter()
+            # 开始注码
+            self.send(bytearray([0x59,0x6D,0x94,0x00,0x02,0xBE,0x01,0x0A,0x32,0x30,0x32,0x33,0x00,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x39,0x01,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x38,0x02,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x37,0x03,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x36,0x04,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x35,0x05,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x34,0x06,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x33,0x07,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x32,0x08,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x31,0x09,0x35,0x38,0x33,0x30,0x36,0x31,0x39,0x41,0x30,0x34,0x30,0x30,0x30,0x44,0xC1]))
+            # 接收指令应答
+            self.recv(12)
+            # 接收注码 结果
+            self.recv(401)
+            end = time.perf_counter()
+            print("注码耗时:",end-start2)
+            end = time.perf_counter()
+            print("总耗时:",end-start)
+
+if __name__ == "__main__":
+    p=port()
+    # 检测赋码仪系统测试
+    p.open("com8",115200)
+    p.ecode_test(5)
+
+    # 赋码仪设备串口测试
+    # p.open("com5",9600)
+    # p.coder_test(5)
+    # p.open("com5",115200)
+    # p.coder_test(5)
+
+    # 赋码仪设备网口测试
+    # p.open("utcp",0)
+    # p.coder_test(5)
diff --git a/python/file/EX三码绑定测试2023-06-08 - 副本.json b/python/file/EX三码绑定测试2023-06-08 - 副本.json
new file mode 100644
index 0000000..b2fc392
--- /dev/null
+++ b/python/file/EX三码绑定测试2023-06-08 - 副本.json	
@@ -0,0 +1,283 @@
+{
+  "PlanID": 46534786,
+  "CheckSoftVersion": [
+    1
+  ],
+  "CheckHardVersion": [
+    1
+  ],
+  "TimeOutS": 4,
+  "TimeOutM": 10,
+  "TimeOutUI": 12,
+  "TaskIDMax": 26,
+  "TaskArray": [
+    {
+      "TaskID": 0,
+      "TaskIndex": 0,
+      "ParamCount": 1,
+      "ParamVal": [
+        88
+      ],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 1,
+      "TaskIndex": 1,
+      "ParamCount": 3,
+      "ParamVal": [
+        88,
+        5000,
+        400
+      ],
+      "TestStandard": [
+        {
+          "Max": 95,
+          "Min": 80
+        },
+        {
+          "Max": 600,
+          "Min": 100
+        }
+      ],
+      "ReturnCount": 2,
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [
+        23,
+        22
+      ],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 5,
+      "TaskIndex": 2,
+      "ParamCount": 4,
+      "ParamVal": [
+        8,
+        4,
+        0,
+        1
+      ],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 32,
+      "TaskIndex": 3,
+      "ParamCount": 0,
+      "ParamInfo": [],
+      "ParamVal": [],
+      "TestStandard": [
+        {
+          "Max": 8,
+          "Min": 8
+        },
+        {
+          "Max": 4,
+          "Min": 4
+        },
+        {
+          "Max": 1,
+          "Min": 1
+        }
+      ],
+      "ReturnCount": 3,
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [
+        28,
+        28,
+        28,
+        255
+      ],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 4,
+      "TaskIndex": 4,
+      "ParamCount": 2,
+      "ParamVal": [
+        0,
+        0
+      ],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 24,
+      "TaskIndex": 5,
+      "ParamCount": 2,
+      "ParamVal": [
+        128,
+        0
+      ],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 11,
+      "TaskIndex": 6,
+      "ParamCount": 0,
+      "ParamInfo": [],
+      "ParamVal": [],
+      "TestStandard": [
+        {
+          "Max": 240,
+          "Min": 0
+        }
+      ],
+      "ReturnCount": 1,
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [
+        30
+      ],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 8,
+      "TaskIndex": 7,
+      "ParamCount": 5,
+      "ParamVal": [
+        34,
+        5000,
+        100,
+        600,
+        5
+      ],
+      "TestStandard": [
+        {
+          "Max": 3500,
+          "Min": 1000
+        },
+        {
+          "Max": 600,
+          "Min": 200
+        },
+        {
+          "Max": 80,
+          "Min": 10
+        }
+      ],
+      "ReturnCount": 3,
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [
+        34,
+        35,
+        32,
+        255
+      ],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 7,
+      "TaskIndex": 8,
+      "ParamCount": 0,
+      "ParamInfo": [],
+      "ParamVal": [],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 40,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 26,
+      "TaskIndex": 9,
+      "ParamCount": 0,
+      "ParamInfo": [],
+      "ParamVal": [],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 45,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 4,
+      "TaskIndex": 10,
+      "ParamCount": 2,
+      "ParamVal": [
+        0,
+        1
+      ],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 31,
+      "TaskIndex": 11,
+      "ParamCount": 0,
+      "ParamInfo": [],
+      "ParamVal": [],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 24,
+      "TaskIndex": 12,
+      "ParamCount": 2,
+      "ParamVal": [
+        32,
+        32
+      ],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    },
+    {
+      "TaskID": 29,
+      "TaskIndex": 13,
+      "ParamCount": 0,
+      "ParamInfo": [],
+      "ParamVal": [],
+      "TestStandard": [],
+      "ReturnCount": 0,
+      "ReturnInfo": [],
+      "ErrJumpTo": 255,
+      "ExecuteErrCode": 254,
+      "ResultErrCode": [],
+      "RetryCount": 0
+    }
+  ]
+}
\ No newline at end of file
diff --git a/python/file/Ym_Checker.bin b/python/file/Ym_Checker.bin
index 510f2e2f40b130548d6220e94999f3db5ea6e267..17b92472ee1263d970dab0662f7d6b1ba29aeff7 100644
GIT binary patch
delta 8146
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

delta 8007
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

diff --git a/python/prottcp.py b/python/prottcp.py
index dbf4a63..8310779 100644
--- a/python/prottcp.py
+++ b/python/prottcp.py
@@ -433,5 +433,13 @@ if __name__ == "__main__":
     # u.init("utcp:7777")
     # u.send_file(0xee,"file/JQ_JCXB_V54.bin")
     # u.send_file(0xed,"../Objects/checker_gen1_app_20230602.bin")
-    u.cmd=0x34
+    u.cmd=0x31
     print(u.encode(bytearray()).hex(' '))
+
+
+# 开始检测
+# 59 6d 03 00 30 00 00 60 0f
+# 结束应答
+# 59 6D 03 00 31 00 00 31 CF
+
+
diff --git a/source/ReadMe.txt b/source/ReadMe.txt
index 22061be..3989aae 100644
--- a/source/ReadMe.txt
+++ b/source/ReadMe.txt
@@ -115,6 +115,7 @@
     赋码仪读写参数命令添加读写位，解决写参数时少偏移了一位导致的写参数失败的问题
 2023.6.20
     赋码失败返回时返回小板的错误码
-
+2023.6.25
+    电机下压
 
     
\ No newline at end of file
diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h
index b0d28e1..5882632 100644
--- a/source/main/compiler_info.h
+++ b/source/main/compiler_info.h
@@ -6,7 +6,7 @@
 
 
 
-#define BUILD_DATE  "2023-06-20 17:40:53"
+#define BUILD_DATE  "2023-06-25 17:31:20"
 #define SOFT_VERSION  "0.01"
 
 
diff --git a/source/soft/signal.c b/source/soft/signal.c
index d3908b1..6b39cdb 100644
--- a/source/soft/signal.c
+++ b/source/soft/signal.c
@@ -78,7 +78,7 @@ sig_thread thread_creat(int pro)
   slot_run_def *run=calloc(1,sizeof(slot_run_def));
   run->run=1;
   sprintf(name,"sig_mq#%d",count);
-  run->mb=rt_mq_create(name,(sizeof(slot_msg_def)+sizeof(uint32_t)*8),50,RT_IPC_FLAG_FIFO);
+  run->mb=rt_mq_create(name,(sizeof(slot_msg_def)+sizeof(uint32_t)*8),100,RT_IPC_FLAG_FIFO);
   sprintf(name,"sig_t#%d",count);
   rt_thread_t rt_t=rt_thread_create(name,slot_run,run,2048,pro,20);
   rt_thread_startup(rt_t);
diff --git a/source/task/moter.c b/source/task/moter.c
index 4e9dae9..7f98d1a 100644
--- a/source/task/moter.c
+++ b/source/task/moter.c
@@ -24,6 +24,8 @@ typedef struct{
   int count;
   int max_count;
   moter_stat stat;
+  void (*fun_in_end)(void *t);
+  void *t;
 }self_def;
 
 
@@ -73,12 +75,42 @@ static void moter_run(void *t)
       s->stat=STOP;
       DBG_LOG("moter stoped.");
       emit moter_end_signal(s);
+      if(s->fun_in_end){
+        s->fun_in_end(s->t);
+        s->fun_in_end=0;
+        s->t=0;
+      }
     }
     ev=0;
   }
 }
 
 
+
+
+// ����½������ʱ�ص�
+void moter_down(void (*fun)(void *t),void *t)
+{
+  self_def *s=&g_self;
+  if(fun){
+    s->fun_in_end=fun;
+    s->t=t;
+  }
+  moter_start(0,MOTER_MAX_COUNT-s->count);
+}
+
+// ������������ʱ�ص�
+void moter_up(void (*fun)(void *t),void *t)
+{
+  self_def *s=&g_self;
+  if(fun){
+    s->fun_in_end=fun;
+    s->t=t;
+  }
+  moter_start(0,-s->count-100);
+}
+
+
 void moter_start(int fre,int step_count)
 {
   self_def *s=&g_self;
@@ -101,6 +133,7 @@ void moter_start_slot(void *t,int fre,int step_count)
   if(s->count+step_count>s->max_count)
   {
     DBG_WARN("steps count exceeded limit!,max=%d",s->max_count);
+    end_irq(s);
     return ;
   }
   else{
diff --git a/source/task/moter.h b/source/task/moter.h
index ca2ae45..42c5613 100644
--- a/source/task/moter.h
+++ b/source/task/moter.h
@@ -16,6 +16,9 @@ void moter_start_slot(void *t,int fre,int step_count);
 
 void moter_start(int fre,int step_count);
 
+void moter_down(void (*fun)(void *t),void *t);
+
+void moter_up(void (*fun)(void *t),void *t);
 
 
 
diff --git a/source/task/tran_for_checker.c b/source/task/tran_for_checker.c
index 1e98c1a..56313ae 100644
--- a/source/task/tran_for_checker.c
+++ b/source/task/tran_for_checker.c
@@ -9,6 +9,7 @@
 #include "handle_for_checker.h"
 #include "compiler_info.h"
 #include "dev_backup.h"
+#include "moter.h"
 
 
 
@@ -81,10 +82,29 @@ static void check_end(ucport_def *u,port_mcu *src,void *data,int ack,char *err_s
     arr_append(a,0);
     arr_appends(a,w->ack,w->ack_size);
     emit tran_send_signal(w->u.p,0x31,arr_temp(a));
+    // 把命令字改为0x31用于接收主机应答
+    w->u.cmd=0x31;
     tran_set_busy(w->u.p,0);
   }
 }
 
+// 电机上升之后解除忙状态
+static void check_when_moter_up(void *t)
+{
+  ucport_def *u=t;
+  tran_set_busy(u->p,0);
+}
+
+
+static int check_dolater(ucport_def *u,uint8_t cmd,array_def *data,char *err_str)
+{
+  if(cmd==0x31)
+  {
+    moter_up(check_when_moter_up,u);
+  }
+  return 0;
+}
+
 
 static void check_del(ucport_def *u)
 {
@@ -92,6 +112,23 @@ static void check_del(ucport_def *u)
 }
 
 
+// 电机下降之后开始检测
+static void check_when_moter_down(void *t)
+{
+  ucport_def *u=t;
+  for(int i=0;i<20;i++)
+  {
+    port_mcu *mcu=tran_get_portm(u->p,i);
+    // 这里打开检测
+    if(mcu){
+      port_start(mcu,check_creat(check_scheme()));
+    }
+  }
+}
+
+
+
+
 static ucport_def *check(tran_def *t, uint8_t cmd,array_def *data)
 {
   int return_size=(check_scheme()->range_num*2+8+(check_scheme()->range_num+7)/8);
@@ -100,18 +137,11 @@ static ucport_def *check(tran_def *t, uint8_t cmd,array_def *data)
   u->ack_size=return_size*20;
   u->u.p=t;
   u->u.del=check_del;
+  u->u.dolater=check_dolater;
   u->u.doend=check_end;
   DBG_LOG("check: skip=%d",u->ret_skip);
   tran_set_busy(t,1);
-  for(int i=0;i<20;i++)
-  {
-    port_mcu *mcu=tran_get_portm(u->u.p,i);
-    // 这里打开检测
-    if(mcu){
-      port_start(mcu,check_creat(check_scheme()));
-    }
-  }
-  
+  moter_down(check_when_moter_down,u);
   array_def *a=arr_creat();
   arr_append(a,0);
   emit tran_reply_signal(u->u.p,arr_temp(a));