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-12-04 11:02:41 +08:00
parent c4a1d5c088
commit 95a4faff3f
8 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
checher_slave.uvoptx
View File

@@ -377,24 +377,7 @@
<Name></Name> <Name></Name>
</SetRegEntry> </SetRegEntry>
</TargetDriverDllRegistry> </TargetDriverDllRegistry>
<Breakpoint> <Breakpoint/>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>159</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134301518</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>D:\work\SVN\鍐夊窛\mcu_program\checker_slave\source\soft\mystdlib.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\checker_slave_app\source/soft/mystdlib.c\159</Expression>
</Bp>
</Breakpoint>
<WatchWindow1> <WatchWindow1>
<Ww> <Ww>
<count>0</count> <count>0</count>
@@ -406,15 +389,15 @@
<Mm> <Mm>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<SubType>1</SubType> <SubType>1</SubType>
<ItemText>0x20002700</ItemText> <ItemText>0x20001800</ItemText>
<AccSizeX>0</AccSizeX> <AccSizeX>0</AccSizeX>
</Mm> </Mm>
</MemoryWindow1> </MemoryWindow1>
<MemoryWindow2> <MemoryWindow2>
<Mm> <Mm>
<WinNumber>2</WinNumber> <WinNumber>2</WinNumber>
<SubType>0</SubType> <SubType>1</SubType>
<ItemText>0x0803B000</ItemText> <ItemText>0x200028C8</ItemText>
<AccSizeX>0</AccSizeX> <AccSizeX>0</AccSizeX>
</Mm> </Mm>
</MemoryWindow2> </MemoryWindow2>

2
source/ReadMe.txt
View File

@@ -275,4 +275,6 @@
EJ工厂代码otp0地址校验 EJ工厂代码otp0地址校验
2023.12.1 2023.12.1
地址线使用下拉，app中也使用断言，线程栈默认填充0x23+pro，malloc失败直接进断言 地址线使用下拉，app中也使用断言，线程栈默认填充0x23+pro，malloc失败直接进断言
2023.12.4
只在初次进入检测命令时清除检测结果，检测结束时获取检测结果加入有效性判断

3
source/elec_det/elec_det.c
View File

@@ -543,6 +543,7 @@ array_def *elec_check_with_scheme(array_def *uid_psw)
arr_append(r,2); arr_append(r,2);
return arr_temp(r); return arr_temp(r);
} }
elec_check_result_clear();
LED1_Out_Off; LED1_Out_Off;
while(s->task_index<s->task_num){ while(s->task_index<s->task_num){
if(elec_check_load_task_param(s->task_index)){ if(elec_check_load_task_param(s->task_index)){
@@ -585,7 +586,7 @@ array_def *elec_code(array_def *uid_psw)
array_def *r=arr_creat(); array_def *r=arr_creat();
uint8_t ret=0; uint8_t ret=0;
int check_ret=0; int check_ret=0;
//CHECK_DO(s->data,arr_delete); elec_check_result_clear();
check_ret=elec_code_param_check(uid_psw); check_ret=elec_code_param_check(uid_psw);
if(check_ret!=0){ if(check_ret!=0){
arr_append(r,1); arr_append(r,1);

3
source/elec_det/hardware/gpio_cfg.c
View File

@@ -24,7 +24,8 @@ void CtrlGpio_DefInit(void)
GPIO_ResetBits(GPIOA,GPIO_InitStructure.GPIO_Pin); GPIO_ResetBits(GPIOA,GPIO_InitStructure.GPIO_Pin);
GPIO_InitStructure.GPIO_Pin = SEG0_Pin; GPIO_InitStructure.GPIO_Pin = SEG0_Pin;
GPIO_InitStructure.GPIO_Mode=GPIO_Mode_IN_FLOATING; //GPIO_InitStructure.GPIO_Mode=GPIO_Mode_IN_FLOATING;
GPIO_InitStructure.GPIO_Mode=GPIO_Mode_IPD;
GPIO_Init(GPIOA,&GPIO_InitStructure); GPIO_Init(GPIOA,&GPIO_InitStructure);

4
source/main/compiler_info.h
View File

@@ -6,8 +6,8 @@
#define BUILD_DATE "2023-12-01 18:39:30" #define BUILD_DATE "2023-12-04 10:52:51"
#define SOFT_VERSION "2.06" #define SOFT_VERSION "2.07"

2
source/prebuild.py
View File

@@ -7,7 +7,7 @@ import mycopy
# 定义软件版本号 # 定义软件版本号
SOFT_VERION = "2.06" SOFT_VERION = "2.07"

2
source/rt_thread/rtconfig.h
View File

@@ -82,7 +82,7 @@
// <o>The stack size of timer thread <0-8192> // <o>The stack size of timer thread <0-8192>
// <i>Default: 512 // <i>Default: 512
#define RT_TIMER_THREAD_STACK_SIZE 2048 #define RT_TIMER_THREAD_STACK_SIZE 1024
// <o>The soft-timer tick per second <0-1000> // <o>The soft-timer tick per second <0-1000>
// <i>Default: 100 // <i>Default: 100

11
source/task/tran_for_slave.c
View File

@@ -163,8 +163,13 @@ static void check_submit_later(void *t)
s->submit_times--; s->submit_times--;
if(s->submit_running&&(s->submit_times>0)){ if(s->submit_running&&(s->submit_times>0)){
emit tran_send_signal(s->tran,s->cmd,(elec_check_result())); array_def *ret=elec_check_result();
s->submit_delay+=elec_local_addr()*3; if(ret!=0){
emit tran_send_signal(s->tran,s->cmd,ret);
s->submit_delay+=elec_local_addr()*3;
}else{
//while(1);
}
later_execute(check_submit_later,s,s->submit_delay); later_execute(check_submit_later,s,s->submit_delay);
}else{ }else{
s->submit_running=0; s->submit_running=0;
@@ -198,13 +203,13 @@ static int check_dolater(ucport_def *u,uint8_t cmd,array_def *data,char *err_str
c->tran=s->u.p; c->tran=s->u.p;
check_set_data(c,data); check_set_data(c,data);
later_execute(check_later,c,10); later_execute(check_later,c,10);
elec_check_result_clear();
} }
if(c->cmd==cmd){ if(c->cmd==cmd){
arr_append(r,0); arr_append(r,0);
}else{ }else{
arr_append(r,2); arr_append(r,2);
} }
elec_check_result_clear();
if(c->cmd==cmd){ if(c->cmd==cmd){
emit tran_reply_signal(u->p,arr_temp(r)); emit tran_reply_signal(u->p,arr_temp(r));
}else{ }else{