From 965674dd2cedc54b47af2e04e579a4b36a70120d Mon Sep 17 00:00:00 2001 From: ranchuan Date: Tue, 24 Oct 2023 18:10:26 +0800 Subject: [PATCH] =?UTF-8?q?XT=E6=A8=A1=E5=9D=97=E8=AF=BB=E5=8F=96=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E4=BF=A1=E6=81=AF=E6=B5=8B=E8=AF=95=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=AF=BB=E5=8F=96=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ReadMe.txt | 2 ++ source/elec_det/interface/XTChecker.c | 9 ++++++++- source/elec_det/test/XTCheckerTest.c | 15 ++++++++++++++- source/main/compiler_info.h | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/source/ReadMe.txt b/source/ReadMe.txt index 4ded67f..70d945b 100644 --- a/source/ReadMe.txt +++ b/source/ReadMe.txt @@ -222,3 +222,5 @@ 修改检测后CAN总线自动上传基础延时为 addr*10+200 修改检测时注码,单独注码判定 添加cmd_printf 函数不会自动添加换行符 +2023.10.23 + XT模块读取工厂信息测试命令返回读取结果 diff --git a/source/elec_det/interface/XTChecker.c b/source/elec_det/interface/XTChecker.c index ecda9d8..8d73087 100644 --- a/source/elec_det/interface/XTChecker.c +++ b/source/elec_det/interface/XTChecker.c @@ -1145,7 +1145,7 @@ void XT_OnLine_SCAN(void) return; } uc_rtv = XT_Read_Uid(XT_RunBuf,checker_runcfg.params[2]); - Checker_MaskResult(1,checker_runcfg.task_info.runindex); + Checker_MaskResult(uc_rtv,checker_runcfg.task_info.runindex); Checker_SetRtv(&us_h_v,checker_runcfg.rtv_count); } @@ -1235,6 +1235,7 @@ void XT_Test_VerfyShell(void) uint8_t uc_rtv = 0; uint8_t uc_count = 0; uint8_t uc_index = 0; + uint16_t us_temp[7]; if(0 != Checker_FacBufCheck()) { uc_rtv = 1; @@ -1266,7 +1267,13 @@ void XT_Test_VerfyShell(void) break; } } + if(checker_runcfg.rtv_count > 7) + { + checker_runcfg.rtv_count = 7; + } + memcpy(us_temp,XT_RunBuf,checker_runcfg.rtv_count<<1); Checker_MaskResult(uc_rtv,checker_runcfg.task_info.runindex); + Checker_SetRtv(us_temp,checker_runcfg.rtv_count); } CheckerTask xttaskArray[CHECKER_MAXID_COUNT] ={ diff --git a/source/elec_det/test/XTCheckerTest.c b/source/elec_det/test/XTCheckerTest.c index ba47f1e..6e9636d 100644 --- a/source/elec_det/test/XTCheckerTest.c +++ b/source/elec_det/test/XTCheckerTest.c @@ -243,8 +243,21 @@ static void XTCheckerTest(int argc, char**argv) XT_CurMonitor(); printf("CurMonitor Excute %d\n",checker_runcfg.Task_Result[0]); }else if(!rt_strcmp(argv[1], "VerfyShell")){ + checker_runcfg.rtv_count = 7; XT_Test_VerfyShell(); - printf("VerfyShell Excute %d\n",checker_runcfg.Task_Result[0]); + printf("VerfyShell Excute %d Shell Data \n",checker_runcfg.Task_Result[0]); + us_temp = 0; + while(us_temp < 7) + { + printf("%02x ",(checker_runcfg.Test_Rtv[us_temp]) & 0x0FF); + printf("%02x ",(checker_runcfg.Test_Rtv[us_temp]>>8) & 0x0FF); + if(us_temp == 4) + { + printf("\n"); + } + us_temp++; + } + printf("\n"); } else{ diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index e337e30..bc2d4cf 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,7 +6,7 @@ -#define BUILD_DATE "2023-10-18 15:28:02" +#define BUILD_DATE "2023-10-23 15:26:13" #define SOFT_VERSION "2.01"