VerifyRequest新增字段,完善协议。
All checks were successful
Build Applications / Build (push) Successful in 6m4s
Windows CI / build (push) Successful in 8m7s

This commit is contained in:
luocai 2024-11-18 18:39:50 +08:00
parent 5ae5c5adc6
commit 8055f4e70f
5 changed files with 21 additions and 19 deletions

View File

@ -7,21 +7,13 @@ on:
tags-ignore: tags-ignore:
- 'v*' - 'v*'
jobs: 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: Build:
runs-on: [ubuntu-latest, ubuntu-24.04] runs-on: [ubuntu-latest, ubuntu-24.04]
container: container:
image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04
credentials:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
steps: steps:
- name: Set up SSH - name: Set up SSH
run: | run: |

View File

@ -1,5 +1,5 @@
name: Deploy Release name: Deploy Release
run-name: ${{ github.actor }} is building Bilby... run-name: ${{ github.actor }} is building SmartLockerTools...
on: on:
push: push:
tags: tags:
@ -9,6 +9,9 @@ jobs:
runs-on: [ubuntu-latest, ubuntu-24.04] runs-on: [ubuntu-latest, ubuntu-24.04]
container: container:
image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04 image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/ubuntu_dev:24.04
credentials:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
steps: steps:
- name: Set up SSH - name: Set up SSH
run: | run: |

View File

@ -89,6 +89,8 @@ public:
struct VerifyRequest { struct VerifyRequest {
uint8_t save_image; uint8_t save_image;
uint8_t timeout; // timeout, unit second, default 10s uint8_t timeout; // timeout, unit second, default 10s
uint16_t interval = 0;
uint8_t reserved[4];
}; };
struct PalmStateNote { struct PalmStateNote {

View File

@ -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.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
``` ```

View File

@ -74,15 +74,17 @@ USBCDC
```c++ ```c++
struct msg_verify_data { struct msg_verify_data {
uint8_t reserved; uint8_t reserved1;
uint8_t timeout; uint8_t timeout;
uint8_t reserved2[6];
}; };
``` ```
参数说明: 参数说明:
- reserved保留字段暂未使用。需设置为 0x00。 - reserved1:保留字段,暂未使用。需设置为 0x00。
- timeout识别超时时间默认为10s用户可以自行设置最大不超过255s。**主控等待模组录入应答的超时时间应大于此参数设置值。** - timeout识别超时时间默认为10s用户可以自行设置最大不超过255s。**主控等待模组录入应答的超时时间应大于此参数设置值。**
- reserved2保留字段暂未使用。需设置为 0x00。
主控下发消息格式如下: 主控下发消息格式如下:
@ -93,22 +95,23 @@ struct msg_verify_data {
<th>SyncWord</th> <th>SyncWord</th>
<th>MsgID</th> <th>MsgID</th>
<th>DataSize</th> <th>DataSize</th>
<th colspan="2">Data</th> <th colspan="3">Data</th>
<th>ParityCheck</th> <th>ParityCheck</th>
</tr> </tr>
<tr align="center"> <tr align="center">
<td>2 bytes</td> <td>2 bytes</td>
<td>1 byte</td> <td>1 byte</td>
<td>2 bytes</td> <td>2 bytes</td>
<td colspan="2">2 bytes</td> <td colspan="3">8 bytes</td>
<td>1 byte</td> <td>1 byte</td>
</tr> </tr>
<tr align="center"> <tr align="center">
<td>0xEF 0xAA</td> <td>0xEF 0xAA</td>
<td>MID_VERIFY<br/>(0x12)</td> <td>MID_VERIFY<br/>(0x12)</td>
<td>0x02</td> <td>0x08</td>
<td>reserved<br/>(1 byte)</td> <td>reserved1<br/>(1 byte)</td>
<td>timeout<br/>(1 byte)</td> <td>timeout<br/>(1 byte)</td>
<td>reserved2<br/>(6 bytes)</td>
<td> </td> <td> </td>
</tr> </tr>
</table> </table>
@ -392,6 +395,8 @@ MID_NOTE 消息主要作用是主动向主控上报一些信息,报文格式
2024/10/14V0.1版本,描述模组识别、录入、删除几个基本协议指令。 2024/10/14V0.1版本,描述模组识别、录入、删除几个基本协议指令。
2024/11/18V0.2版本,`MID_VERIFY` 消息新增字段预留空间,用于功能扩展。