diff --git a/checher_slave.uvoptx b/checher_slave.uvoptx index ec25b79..35b3d55 100644 --- a/checher_slave.uvoptx +++ b/checher_slave.uvoptx @@ -299,7 +299,7 @@ 1 0 - 1 + 0 18 @@ -523,7 +523,7 @@ 1 0 - 0 + 1 18 @@ -580,10 +580,6 @@ JL2CM3 -U69655983 -O78 -S5 -ZTIFSpeedSel1000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM) - - 0 - DLGUARM - 0 ARMRTXEVENTFLAGS diff --git a/checher_slave.uvprojx b/checher_slave.uvprojx index d2c5954..eabb1f5 100644 --- a/checher_slave.uvprojx +++ b/checher_slave.uvprojx @@ -4079,7 +4079,7 @@ app_debug 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::.\ARMCC + 5060750::V5.06 update 6 (build 750)::ARMCC 0 diff --git a/source/elec_det/elec_judge.c b/source/elec_det/elec_judge.c index 403df2f..642829f 100644 --- a/source/elec_det/elec_judge.c +++ b/source/elec_det/elec_judge.c @@ -90,13 +90,16 @@ static void elec_task_judge(elec_judge_def *e,int index,uint8_t *data) TASK_FLAG_CHECK(index); const scheme_task_def *task=&e->scheme->task[index]; uint16_t temp; + DBG_LOG("task index=%d.",index); if(EXE_ACK_CHECK(index)){ elec_add_errcode(e,task->err); + DBG_WARN("task execute err:%d.",task->err); } for(int i=0;iitem_num;i++){ temp=data[i*2]|(data[i*2+1]<<8); if(temprange[i].min||temp>task->range[i].max){ elec_add_errcode(e,task->range[i].err); + DBG_WARN("task ret_index:%d vaule=%d,err:%d",i,temp,task->range[i].err); } } } @@ -381,8 +384,8 @@ void elec_judge(elec_judge_def *e,int task_num,uint8_t *exe_ack, e->marerr_list[i]=elec_err_classify(e->err_list[i]); } DBG_LOG("err_table2:%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", - e->err_list[0],e->err_list[1],e->err_list[2],e->err_list[3],e->err_list[4], - e->err_list[5],e->err_list[6],e->err_list[7],e->err_list[8],e->err_list[9] + e->marerr_list[0],e->marerr_list[1],e->marerr_list[2],e->marerr_list[3],e->marerr_list[4], + e->marerr_list[5],e->marerr_list[6],e->marerr_list[7],e->marerr_list[8],e->marerr_list[9] ); int index=elec_report_err(e); DBG_LOG("marerr report=%d",e->marerr_list[index]); diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index 085c88d..1bb6e2b 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,7 +6,7 @@ -#define BUILD_DATE "2023-11-03 18:01:29" +#define BUILD_DATE "2023-11-04 17:32:07" #define SOFT_VERSION "2.03"