diff --git a/source/ReadMe.txt b/source/ReadMe.txt index 761dff0..9d8d79d 100644 --- a/source/ReadMe.txt +++ b/source/ReadMe.txt @@ -181,6 +181,11 @@ 扫描从机从启动后500ms改为启动后2000ms 2023.10.12 添加测试命令 test_input test_output 测试输入输出通道 +2023.11.13 + V0.04 + 修改方案结构体为节约存储空间版本,与之前的updata软件不兼容 + 修改打标时间为5s + 打标结束时亮绿灯 diff --git a/source/dev/dev_flash.h b/source/dev/dev_flash.h index 511940f..5b67342 100644 --- a/source/dev/dev_flash.h +++ b/source/dev/dev_flash.h @@ -83,6 +83,27 @@ int flash_save_param(sys_param_def *par); const sys_param_def *sys_param(void); + +#if 1 +__packed +typedef struct{ + uint16_t max; + uint16_t min; + uint8_t err; +}scheme_range_def; + +__packed +typedef struct +{ + uint8_t taskid; + uint8_t taskindex; + uint8_t item_num; + uint8_t err; + scheme_range_def range[16]; +}scheme_task_def; + +#else + __packed typedef struct{ uint32_t max; @@ -102,6 +123,18 @@ typedef struct scheme_range_def range[16]; }scheme_task_def; + +#endif + + +__packed +typedef struct{ + uint8_t err; + uint8_t suberr_num; + uint8_t suberr[30]; +}marerr_def; + + // 方案参数 __packed typedef struct{ @@ -109,6 +142,8 @@ typedef struct{ uint32_t plan_id; uint32_t timeout_m; uint32_t task_num; + uint32_t marerr_num; + marerr_def marerr[21]; scheme_task_def task[0]; }scheme_def; diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index 97f4616..72eab7a 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,8 +6,8 @@ -#define BUILD_DATE "2023-10-12 11:03:25" -#define SOFT_VERSION "0.03" +#define BUILD_DATE "2023-11-14 09:14:57" +#define SOFT_VERSION "0.04" diff --git a/source/prebuild.py b/source/prebuild.py index b8963b3..95a301f 100644 --- a/source/prebuild.py +++ b/source/prebuild.py @@ -7,7 +7,7 @@ from datetime import datetime, timedelta # 定义软件版本号 -SOFT_VERION = "0.03" +SOFT_VERION = "0.04" diff --git a/source/task/process.c b/source/task/process.c index f7a768e..cc8212a 100644 --- a/source/task/process.c +++ b/source/task/process.c @@ -391,7 +391,6 @@ static void process_end_slot(void *obj,int ack,array_def *data) s->busy=0; return; }else{ - SET_LED_OK(); } // 保存到内部存储 if(s->code_data){ @@ -411,7 +410,7 @@ static void process_end_slot(void *obj,int ack,array_def *data) // 5s 后打标结束 void process_mark_end(void *arg); - later_execute(process_mark_end,s,2300); + later_execute(process_mark_end,s,5300); process_send_errstr(s,10,"开始打标"); } @@ -449,6 +448,7 @@ static void process_mark_end(void *arg) RESET_STEP(s->step); s->busy=0; + SET_LED_OK(); DBG_LOG("mark end."); }