diff --git a/checher_slave.uvoptx b/checher_slave.uvoptx index 641a16f..e3b5cec 100644 --- a/checher_slave.uvoptx +++ b/checher_slave.uvoptx @@ -299,7 +299,7 @@ 1 0 - 0 + 1 18 @@ -540,7 +540,7 @@ 1 0 - 1 + 0 18 @@ -2114,7 +2114,7 @@ coder - 0 + 1 0 0 0 diff --git a/doc/CSMZM_V0.06.bin b/doc/CSMZM_V0.06.bin deleted file mode 100644 index c95fb7f..0000000 Binary files a/doc/CSMZM_V0.06.bin and /dev/null differ diff --git a/doc/CSMZM_V0.11.bin b/doc/CSMZM_V0.11.bin deleted file mode 100644 index 9011b28..0000000 Binary files a/doc/CSMZM_V0.11.bin and /dev/null differ diff --git a/doc/CSMZM_V0.13.bin b/doc/CSMZM_V0.13.bin deleted file mode 100644 index ecb425f..0000000 Binary files a/doc/CSMZM_V0.13.bin and /dev/null differ diff --git a/doc/MS-10-30-1.bin b/doc/MS-10-30-1.bin deleted file mode 100644 index 7a39982..0000000 Binary files a/doc/MS-10-30-1.bin and /dev/null differ diff --git a/doc/__csmzm_app.bin b/doc/__csmzm_app.bin deleted file mode 100644 index 201ce2f..0000000 Binary files a/doc/__csmzm_app.bin and /dev/null differ diff --git a/doc/ms-10-30.bin b/doc/ms-10-30.bin deleted file mode 100644 index 9017d57..0000000 Binary files a/doc/ms-10-30.bin and /dev/null differ diff --git a/doc/pjy02_ca_10_tb_v0_04.pdf b/doc/pjy02_ca_10_tb_v0_04.pdf new file mode 100644 index 0000000..d32a0d3 Binary files /dev/null and b/doc/pjy02_ca_10_tb_v0_04.pdf differ diff --git a/source/ReadMe.txt b/source/ReadMe.txt index f4ab7de..e81eb39 100644 --- a/source/ReadMe.txt +++ b/source/ReadMe.txt @@ -331,4 +331,6 @@ 解决ew自检模式 8导致小板死机的bug,自检返回值除以400,单位0.1ms 2024.1.9 调试版本不弹出上传提示框 +2024.1.10 + 在槽任务失败且异常代码不为0时才会导致 CheckerExt_Slot 任务失败 diff --git a/source/elec_det/interface/CheckerExt.c b/source/elec_det/interface/CheckerExt.c index d1f90c5..3cb52de 100644 --- a/source/elec_det/interface/CheckerExt.c +++ b/source/elec_det/interface/CheckerExt.c @@ -189,10 +189,10 @@ void CheckerExt_Slot(void) checker_runcfg.rtv_index-=checker_runcfg.rtv_count; t->exe_flag=1; } - exe_ret|=checker_runcfg.excue_rtv; memcpy(t->rets,&checker_runcfg.Test_Rtv[checker_runcfg.rtv_index],checker_runcfg.rtv_count*2); memset(&checker_runcfg.Test_Rtv[checker_runcfg.rtv_index],0,checker_runcfg.rtv_count*2); if(checker_runcfg.excue_rtv){ + exe_ret|=t->errcode; task_slot_add_err(task_slot,t->errcode); } } diff --git a/source/elec_det/interface/JQChecker.c b/source/elec_det/interface/JQChecker.c index 1848126..428dbd5 100644 --- a/source/elec_det/interface/JQChecker.c +++ b/source/elec_det/interface/JQChecker.c @@ -337,7 +337,7 @@ void JQ_Test_ReadState(void) } if(uc_ack < 1) { - uc_rtv = 1; + uc_rtv = 2; } checker_runcfg.params[0] = state; Checker_SetRtv(checker_runcfg.params,checker_runcfg.rtv_count); diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index a1ff516..a4090be 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,7 +6,7 @@ -#define BUILD_DATE "2024-01-09 15:43:29" +#define BUILD_DATE "2024-01-10 17:56:38" #define SOFT_VERSION "2.13"