From 8055f4e70f0e9e7cc82eff51c777d346d809973a Mon Sep 17 00:00:00 2001
From: luocai <luocai@reconova.com>
Date: Mon, 18 Nov 2024 18:39:50 +0800
Subject: [PATCH] =?UTF-8?q?VerifyRequest=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=AE=8C=E5=96=84=E5=8D=8F=E8=AE=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/build_ubuntu.yaml              | 14 +++-----------
 .gitea/workflows/release_ubuntu.yaml            |  5 ++++-
 Analyser/ModuleCommunication.h                  |  2 ++
 Readme.md                                       |  2 +-
 ...化版.md => L015掌静脉识别模组串口通信协议V0.2 - 简化版.md} | 17 +++++++++++------
 5 files changed, 21 insertions(+), 19 deletions(-)
 rename resources/{L015掌静脉识别模组串口通信协议V0.1 - 简化版.md => L015掌静脉识别模组串口通信协议V0.2 - 简化版.md} (93%)

diff --git a/.gitea/workflows/build_ubuntu.yaml b/.gitea/workflows/build_ubuntu.yaml
index a662ce1..2a4f111 100644
--- a/.gitea/workflows/build_ubuntu.yaml
+++ b/.gitea/workflows/build_ubuntu.yaml
@@ -7,21 +7,13 @@ on:
     tags-ignore:
       - 'v*'
 jobs:
-  PullDocker:
-    runs-on: [ubuntu-latest, ubuntu-24.04]
-    steps:
-      - name: Login to ACR
-        uses: aliyun/acr-login@v1
-        with:
-          login-server: https://registry.cn-shenzhen.aliyuncs.com
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Pull Docker image
-        run: docker pull registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04
   Build:
     runs-on: [ubuntu-latest, ubuntu-24.04]
     container:
       image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04
+      credentials:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
     steps:
       - name: Set up SSH
         run: |
diff --git a/.gitea/workflows/release_ubuntu.yaml b/.gitea/workflows/release_ubuntu.yaml
index d302573..d678aa3 100644
--- a/.gitea/workflows/release_ubuntu.yaml
+++ b/.gitea/workflows/release_ubuntu.yaml
@@ -1,5 +1,5 @@
 name: Deploy Release
-run-name: ${{ github.actor }} is building Bilby...
+run-name: ${{ github.actor }} is building SmartLockerTools...
 on:
   push:
     tags:
@@ -9,6 +9,9 @@ jobs:
     runs-on: [ubuntu-latest, ubuntu-24.04]
     container:
       image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04
+      credentials:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
     steps:
       - name: Set up SSH
         run: |
diff --git a/Analyser/ModuleCommunication.h b/Analyser/ModuleCommunication.h
index c40f722..b3a616b 100644
--- a/Analyser/ModuleCommunication.h
+++ b/Analyser/ModuleCommunication.h
@@ -89,6 +89,8 @@ public:
     struct VerifyRequest {
         uint8_t save_image;
         uint8_t timeout; // timeout, unit second, default 10s
+        uint16_t interval = 0;
+        uint8_t reserved[4];
     };
 
     struct PalmStateNote {
diff --git a/Readme.md b/Readme.md
index 42c7793..f4bdef5 100644
--- a/Readme.md
+++ b/Readme.md
@@ -73,7 +73,7 @@ HOST_TOOLS := /opt/Xuantie-900-gcc-elf-newlib-x86_64-V2.6.1/bin
 
 docker run -it --rm --user 1000:1000 -v /opt:/opt -v $(pwd)/..:$(pwd)/.. -w $(pwd) registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 ./rebuild-app.sh y L015 V200 R002
 
-docker run -it --rm --user 1000:1000 -v /opt:/opt -v $(pwd)/..:$(pwd)/.. -w $(pwd) registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 ./rebuild-app-ota.sh y L015 V200 R002 08
+docker run -it --rm --user 1000:1000 -v /opt:/opt -v $(pwd)/..:$(pwd)/.. -w $(pwd) registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 ./rebuild-app-ota.sh y L015 V200 R002 09
 ```
 
 
diff --git a/resources/L015掌静脉识别模组串口通信协议V0.1 - 简化版.md b/resources/L015掌静脉识别模组串口通信协议V0.2 - 简化版.md
similarity index 93%
rename from resources/L015掌静脉识别模组串口通信协议V0.1 - 简化版.md
rename to resources/L015掌静脉识别模组串口通信协议V0.2 - 简化版.md
index 0df2f83..5aea4dc 100644
--- a/resources/L015掌静脉识别模组串口通信协议V0.1 - 简化版.md	
+++ b/resources/L015掌静脉识别模组串口通信协议V0.2 - 简化版.md	
@@ -74,15 +74,17 @@ USB（CDC）：
 
 ```c++
 struct msg_verify_data  {
-    uint8_t reserved; 
+    uint8_t reserved1; 
     uint8_t timeout; 
+    uint8_t reserved2[6];
 };
 ```
 
 参数说明：
 
-- reserved：保留字段，暂未使用。需设置为 0x00。
+- reserved1：保留字段，暂未使用。需设置为 0x00。
 - timeout：识别超时时间，默认为10s，用户可以自行设置（最大不超过255s）。**主控等待模组录入应答的超时时间应大于此参数设置值。**
+- reserved2：保留字段，暂未使用。需设置为 0x00。
 
 主控下发消息格式如下：
 
@@ -93,22 +95,23 @@ struct msg_verify_data  {
         <th>SyncWord</th>        
         <th>MsgID</th>         
         <th>DataSize</th>
-        <th colspan="2">Data</th>
+        <th colspan="3">Data</th>
         <th>ParityCheck</th>   
     </tr>     
     <tr align="center">        
         <td>2 bytes</td>
         <td>1 byte</td>
         <td>2 bytes</td>
-        <td colspan="2">2 bytes</td>
+        <td colspan="3">8 bytes</td>
         <td>1 byte</td>
     </tr>    
     <tr align="center">        
         <td>0xEF 0xAA</td>
         <td>MID_VERIFY<br/>(0x12)</td>
-        <td>0x02</td>
-        <td>reserved<br/>(1 byte)</td>
+        <td>0x08</td>
+        <td>reserved1<br/>(1 byte)</td>
         <td>timeout<br/>(1 byte)</td>
+        <td>reserved2<br/>(6 bytes)</td>
         <td> </td>
     </tr>     
 </table>
@@ -392,6 +395,8 @@ MID_NOTE 消息主要作用是主动向主控上报一些信息，报文格式
 
 2024/10/14：V0.1版本，描述模组识别、录入、删除几个基本协议指令。
 
+2024/11/18：V0.2版本，`MID_VERIFY` 消息新增字段预留空间，用于功能扩展。
+