diff --git a/python/checker_save.py b/python/checker_save.py index 03c0c1a..2f9ce10 100644 --- a/python/checker_save.py +++ b/python/checker_save.py @@ -60,6 +60,7 @@ class save: num=0 for i in self.json_obj["TaskArray"]: num=num+i["ReturnCount"] + # print("checkret_num=",num) return num # 计算超限错误字节个数 def calc_parerrnum(self): @@ -71,7 +72,7 @@ class save: ret_num=self.calc_retnum()*2+8+self.calc_parerrnum() slave_num=len(d)//ret_num for i in range(slave_num): - print("slave:",i+1) + # print("slave:",i+1) self.save_item(i+1,d[i*ret_num:i*ret_num+ret_num]) # 保存一个条目 @@ -85,7 +86,7 @@ class save: # print(d[8:8+errnum].hex(' ')) a,b=lua_test(self.script,self.scheme,d) s=s+a+','+str(b) - print(s) + # print(s) with open(self.save_file,"+a") as f: f.write(s+'\n') @@ -128,7 +129,7 @@ if __name__ == "__main__": # sa=save() # print(sa.hex2bit(bytes([0xab,0xcd]))) # js_test() - check_data=bytearray([0xB5,0x96,0xEC,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0x01,0x00,0x00,0x00,0x00,0x21,0x00,0x12,0x01,0x00,0x00,0x00,0x00,0xB5,0x00,0xB1,0x00,0x6B,0x00,0x00,0x00,0xA5,0x02,0xA4,0x02,0x00,0x00,0xA4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]) - lua_test("file/judge-xt.lua","file/EX_Coder_Test_2023-07-4.json".encode("gbk").decode("utf-8"),check_data) + check_data=bytearray([0x00,0x08,0x00,0x02,0x50,0x01,0x00,0x00,0x40,0x00,0x46,0xe3,0x4f,0x03,0x58,0x00,0xb5,0x00,0x00,0x01,0x09,0x01,0x10,0x00,0x00,0x00,0x4b,0x00,0x78,0x00,0x57,0x0a,0x21,0x01,0x6a,0x00,0xec,0x00,0x04,0x01,0x4a,0x01,0x1b,0x01,0x23,0x01,0x40,0x9c,0x7e,0x06,0x90,0x00,0x43,0x00,0x77,0x00,0x00,0x00,0x03,0x00,0x40,0x9c,0x80,0x06,0x1f,0x00,0x54,0x07,0x21,0x01,0xd0,0x07,0xff,0xff]) + lua_test("file/judge-xt-checker.lua","file/7.15.json".encode("gbk").decode("utf-8"),check_data) # lua_test("file/judge-xt.lua","file/checker_ye_cfg.json",check_data) diff --git a/python/checker_test.py b/python/checker_test.py index 29babeb..de9927e 100644 --- a/python/checker_test.py +++ b/python/checker_test.py @@ -123,7 +123,7 @@ class port: length=data[8]|(data[9]<<8)|(data[10]<<16)|(data[11]<<24) self.num_to_recv=5+length+2 if(self.num_to_recv>0 and self.num_to_recv==len(data)): - print("recv:",data.hex(" ")) + # print("recv:",data.hex(" ")) return self.decode(data) def encode(self,data:bytearray): t=bytearray() @@ -156,25 +156,36 @@ class port: while(tickstr_err,"recv data check error."); } int cmd_no=arr_get(data,5)|(arr_get(data,6)<<8); - if(p->cmd_no==cmd_no) - { - // 重复的cmd_no - DBG_WARN("duplicate sequence number."); - str_set(p->str_err,"duplicate sequence number."); - } +// if(p->cmd_no==cmd_no) +// { +// // 重复的cmd_no +// DBG_WARN("duplicate sequence number."); +// str_set(p->str_err,"duplicate sequence number."); +// } p->cmd=arr_get(data,4); // 数据负载 arr_delete(r); diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index c7cd8db..336974a 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,7 +6,7 @@ -#define BUILD_DATE "2023-07-14 16:23:08" +#define BUILD_DATE "2023-07-20 17:41:21" #define SOFT_VERSION "0.10" diff --git a/source/task/prot_uc.c b/source/task/prot_uc.c index aafa804..dd15158 100644 --- a/source/task/prot_uc.c +++ b/source/task/prot_uc.c @@ -281,7 +281,7 @@ void protu_send_call(protu_def *p,uint8_t cmd,array_def *data) if(cmd!=0){ p->cmd=cmd; // 上报数据不增加流水号 2023.7.14 - // p->cmd_no++; + p->cmd_no++; if(p->codec) t=p->codec->encode(p,data); }else if(p->cmd==0) diff --git a/source/task/tran_for_coder2.c b/source/task/tran_for_coder2.c index f8f4093..c4cb483 100644 --- a/source/task/tran_for_coder2.c +++ b/source/task/tran_for_coder2.c @@ -77,6 +77,7 @@ static void write_uid_upmit(write_uid_def *w) emit tran_send_signal(w->u.p,0x82,arr_temp(a)); g_self.step=0; // 把命令字改为0x82用于接收主机应答 + tran_set_busy(w->u.p,0); w->u.cmd=0x82; } @@ -375,7 +376,7 @@ static void check_end(ucport_def *u,port_mcu *src,void *data,int ack,char *err_s arr_append(a,w->type); arr_appends(a,w->ack,(6)*10); emit tran_send_signal(w->u.p,0x81,arr_temp(a)); - //tran_set_busy(w->u.p,0); + tran_set_busy(w->u.p,0); // 把命令字改为0x81用于接收主机应答 w->u.cmd=0x81; g_self.step=1;