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 {