andy/checker_slave
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加检测情况打印

Browse Source
This commit is contained in:
ranchuan
2023-11-04 17:55:16 +08:00
parent c13291bc03
commit be55648c12
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
checher_slave.uvoptx
View File

@@ -299,7 +299,7 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget> <IsCurrentTarget>0</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>18</CpuCode> <CpuCode>18</CpuCode>
<DebugOpt> <DebugOpt>
@@ -523,7 +523,7 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget> <IsCurrentTarget>1</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>18</CpuCode> <CpuCode>18</CpuCode>
<DebugOpt> <DebugOpt>
@@ -580,10 +580,6 @@
<Key>JL2CM3</Key> <Key>JL2CM3</Key>
<Name>-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)</Name> <Name>-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)</Name>
</SetRegEntry> </SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
</SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>ARMRTXEVENTFLAGS</Key> <Key>ARMRTXEVENTFLAGS</Key>

2
checher_slave.uvprojx
View File

@@ -4079,7 +4079,7 @@
<TargetName>app_debug</TargetName> <TargetName>app_debug</TargetName>
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed> <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
<uAC6>0</uAC6> <uAC6>0</uAC6>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>

7
source/elec_det/elec_judge.c
View File

@@ -90,13 +90,16 @@ static void elec_task_judge(elec_judge_def *e,int index,uint8_t *data)
TASK_FLAG_CHECK(index); TASK_FLAG_CHECK(index);
const scheme_task_def *task=&e->scheme->task[index]; const scheme_task_def *task=&e->scheme->task[index];
uint16_t temp; uint16_t temp;
DBG_LOG("task index=%d.",index);
if(EXE_ACK_CHECK(index)){ if(EXE_ACK_CHECK(index)){
elec_add_errcode(e,task->err); elec_add_errcode(e,task->err);
DBG_WARN("task execute err:%d.",task->err);
} }
for(int i=0;i<task->item_num;i++){ for(int i=0;i<task->item_num;i++){
temp=data[i*2]|(data[i*2+1]<<8); temp=data[i*2]|(data[i*2+1]<<8);
if(temp<task->range[i].min||temp>task->range[i].max){ if(temp<task->range[i].min||temp>task->range[i].max){
elec_add_errcode(e,task->range[i].err); 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]); 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", 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->marerr_list[0],e->marerr_list[1],e->marerr_list[2],e->marerr_list[3],e->marerr_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[5],e->marerr_list[6],e->marerr_list[7],e->marerr_list[8],e->marerr_list[9]
); );
int index=elec_report_err(e); int index=elec_report_err(e);
DBG_LOG("marerr report=%d",e->marerr_list[index]); DBG_LOG("marerr report=%d",e->marerr_list[index]);

2
source/main/compiler_info.h
View File

@@ -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" #define SOFT_VERSION "2.03"