From 4fedcbdd38ed538a8671e2cab5c7408ba4df3827 Mon Sep 17 00:00:00 2001 From: ranchuan Date: Fri, 16 Jun 2023 22:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=8B=E7=A0=81=E4=BB=AA=E8=AF=BB=E5=86=99?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=91=BD=E4=BB=A4=E6=B5=8B=E8=AF=95=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ReadMe.txt | 2 ++ source/main/compiler_info.h | 2 +- source/task/tran_for_checker.c | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/ReadMe.txt b/source/ReadMe.txt index 3b806d0..f429524 100644 --- a/source/ReadMe.txt +++ b/source/ReadMe.txt @@ -111,6 +111,8 @@ 系统初始化不会因为参数错误而死机 2023.6.16 编译app自动生成boot.bin程序,可以用jlink或离线下载器下载到单片机 +2023.6.16 + 赋码仪读写参数命令添加读写位,解决写参数时少偏移了一位导致的写参数失败的问题 \ No newline at end of file diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index 7f1e293..5342e5c 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,7 +6,7 @@ -#define BUILD_DATE "2023-06-16 17:58:34" +#define BUILD_DATE "2023-06-16 19:59:30" #define SOFT_VERSION "0.01" diff --git a/source/task/tran_for_checker.c b/source/task/tran_for_checker.c index 196cae1..1e98c1a 100644 --- a/source/task/tran_for_checker.c +++ b/source/task/tran_for_checker.c @@ -424,6 +424,8 @@ static ucport_def *param(tran_def *t, uint8_t cmd,array_def *data) { // 赋码仪添加通道数 arr_append(a,10); + // 赋码仪添加读写位 + arr_append(a,op); } arr_append(a,0); arr_appends(a,d,sizeof(paraminfo_def)); @@ -435,12 +437,15 @@ static ucport_def *param(tran_def *t, uint8_t cmd,array_def *data) { // 赋码仪添加通道数 arr_append(a,10); + // 赋码仪添加读写位 + arr_append(a,op); } + if(arr_length(data)<1+off+sizeof(paraminfo_def)){ arr_append(a,0xff); emit tran_reply_signal(u->u.p,arr_temp(a)); }else{ - memcpy(&u->par,arr_data(data)+1,sizeof(paraminfo_def)); + memcpy(&u->par,arr_data(data)+1+off,sizeof(paraminfo_def)); int ret=paraminfo_save(&u->par); arr_append(a,ret); emit tran_reply_signal(u->u.p,arr_temp(a));