diff --git a/ReadMe.txt b/ReadMe.txt index aae1a9f..3bd75b3 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -29,3 +29,8 @@ 添加读取电机步数命令 添加新赋码仪检测命令,赋码仪注码命令 添加检测并写入流水号命令 +2023.12.25 + 解决生成新赋码任务数据长度异常的bug + + + diff --git a/complier_info.h b/complier_info.h index 9d826a8..fa12a02 100644 --- a/complier_info.h +++ b/complier_info.h @@ -6,7 +6,7 @@ -#define BUILD_DATE "2023-12-22 18:08:01" +#define BUILD_DATE "2023-12-25 18:43:09" diff --git a/info.json b/info.json index ba99d4d..bf750de 100644 --- a/info.json +++ b/info.json @@ -1,5 +1,5 @@ { - "build_date": "2023-12-22 18:08:01", + "build_date": "2023-12-25 18:43:09", "hard_version": "MHPZ2_V1.00", "private": [ "info.json", diff --git a/prot_cmd/cmd_coder.cpp b/prot_cmd/cmd_coder.cpp index 3d98a84..42c15a7 100644 --- a/prot_cmd/cmd_coder.cpp +++ b/prot_cmd/cmd_coder.cpp @@ -132,7 +132,7 @@ const task_def *coder_find_task(const char *str) int chip=elec_extract_chip(check_plan()->get_plan_id()); const task_def *table=nullptr; - qDebug("find task in ext_table."); + // qDebug("find task in ext_table."); table=g_ext_task_table; for(int i=0;i<100;i++){ if(table[i].name==nullptr){ @@ -145,10 +145,10 @@ const task_def *coder_find_task(const char *str) table=nullptr; if(chip==0){ table=g_jq_task_table; - qDebug("find task in jq_table."); + // qDebug("find task in jq_table."); }else if(chip==2){ table=g_ew_task_table; - qDebug("find task in ew_table."); + // qDebug("find task in ew_table."); } if(table==nullptr){ return nullptr; @@ -158,7 +158,7 @@ const task_def *coder_find_task(const char *str) break; } if(qstrcmp(str,table[i].name)==0){ - qDebug("find task index=%d.",i); + // qDebug("find task index=%d.",i); return &table[i]; } } @@ -189,8 +189,8 @@ int coder_add_task(myarray &d,const char *name,int slot_index,int task_index,uin qWarning("can not find task with %s.",name); return -1; }else{ - qDebug("task_name:%s,task_id=%d,par_count=%d,ret_count=%d,err=%d",name,task->task_id, - task->par_count,task->ret_count,task->errcode); + // qDebug("task_name:%s,task_id=%d,par_count=%d,ret_count=%d,err=%d",name,task->task_id, + // task->par_count,task->ret_count,task->errcode); } char *par=(char *)params; d.append(uint8_t(slot_index)); @@ -454,7 +454,7 @@ myarray cmd_coder_code2::cmd_pc_to_slave(myarray data) data.remove(0,4); memcpy(year,data.mid(1,4).data(),4); qDebug("tran pc data to slave"); - for (int i=0;i cmd_pc_to_addrs(myarray data){ QList addr_list; addrs=data[0]|(data[1]<<8)|(data[2]<<16); + addrs_num=0; for(int i=0;i<20;i++){ if((addrs&(1< data); protected: int addrs; + int addrs_num; }; @@ -233,9 +236,11 @@ public: QList cmd_pc_to_addrs(myarray data){ QList addr_list; addrs=data[0]|(data[1]<<8)|(data[2]<<16); + addrs_num=0; for(int i=0;i<20;i++){ if((addrs&(1< uid_codes; };