diff --git a/coder_2channel.uvoptx b/coder_2channel.uvoptx index 834cdcc..0051e60 100644 --- a/coder_2channel.uvoptx +++ b/coder_2channel.uvoptx @@ -987,7 +987,7 @@ rt_thread - 1 + 0 0 0 0 @@ -1223,7 +1223,7 @@ soft - 1 + 0 0 0 0 diff --git a/source/ReadMe.txt b/source/ReadMe.txt index 9d8d79d..a1dd17e 100644 --- a/source/ReadMe.txt +++ b/source/ReadMe.txt @@ -186,7 +186,9 @@ 修改方案结构体为节约存储空间版本,与之前的updata软件不兼容 修改打标时间为5s 打标结束时亮绿灯 - +2023.11.16 + V0.05 + uid追溯改为10年,密码上报反序 \ No newline at end of file diff --git a/source/coder/coder_lib.c b/source/coder/coder_lib.c index ad34ff3..958327c 100644 --- a/source/coder/coder_lib.c +++ b/source/coder/coder_lib.c @@ -69,7 +69,9 @@ static int coder_calc_year(const char *year,const char shell_year,char *uid_year } // year是实时数据,鉴于12月31生产的雷管,year可能不同 // 此时year-1来保证与uid码上的相同 - if(year[3]!=shell_year) +// if(year[3]!=shell_year) +// y--; + while((y%10)!=(shell_year-'0')) y--; uid_year[0]=y%100/10+'0'; uid_year[1]=y%10+'0'; diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index 72eab7a..339c2d9 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,8 +6,8 @@ -#define BUILD_DATE "2023-11-14 09:14:57" -#define SOFT_VERSION "0.04" +#define BUILD_DATE "2023-11-16 09:58:59" +#define SOFT_VERSION "0.05" diff --git a/source/prebuild.py b/source/prebuild.py index 95a301f..4a3ca17 100644 --- a/source/prebuild.py +++ b/source/prebuild.py @@ -7,7 +7,7 @@ from datetime import datetime, timedelta # 定义软件版本号 -SOFT_VERION = "0.04" +SOFT_VERION = "0.05" diff --git a/source/task/tran_for_coder2.c b/source/task/tran_for_coder2.c index b218f2d..9736f27 100644 --- a/source/task/tran_for_coder2.c +++ b/source/task/tran_for_coder2.c @@ -185,9 +185,9 @@ static ucport_def *write_uid(tran_def *t, uint8_t cmd,array_def *data) DBG_LOG("slave:%d, uid_pw=%02X %02X %02X %02X %02X %02X %02X %02X " "%02X %02X %02X %02X ",i,d_[0],d_[1],d_[2],d_[3],d_[4],d_[5],d_[6],d_[7], d_[8],d_[9],d_[10],d_[11]); - // 生成密码字符串 - sprintf(u->item[i].password,"%02X%02X%02X%02X",u->item[i].uid_pw_hex[8], - u->item[i].uid_pw_hex[9],u->item[i].uid_pw_hex[10],u->item[i].uid_pw_hex[11]); + // 生成密码字符串,反序 + sprintf(u->item[i].password,"%02X%02X%02X%02X",u->item[i].uid_pw_hex[11], + u->item[i].uid_pw_hex[10],u->item[i].uid_pw_hex[9],u->item[i].uid_pw_hex[8]); // 默认失败 u->ack[i*39+0]=i+slave_addr_off(); u->ack[i*39+1]=1; diff --git a/source/task/tran_for_coder2ch.c b/source/task/tran_for_coder2ch.c index 8ca45a4..01aca36 100644 --- a/source/task/tran_for_coder2ch.c +++ b/source/task/tran_for_coder2ch.c @@ -256,9 +256,9 @@ static ucport_def *write_uid(tran_def *t, uint8_t cmd,array_def *data) DBG_LOG("slave:%d, uid_pw=%02X %02X %02X %02X %02X %02X %02X %02X " "%02X %02X %02X %02X ",i,d_[0],d_[1],d_[2],d_[3],d_[4],d_[5],d_[6],d_[7], d_[8],d_[9],d_[10],d_[11]); - // 生成密码字符串 - sprintf(u->item[i].password,"%02X%02X%02X%02X",u->item[i].uid_pw_hex[8], - u->item[i].uid_pw_hex[9],u->item[i].uid_pw_hex[10],u->item[i].uid_pw_hex[11]); + // 生成密码字符串,反序 + sprintf(u->item[i].password,"%02X%02X%02X%02X",u->item[i].uid_pw_hex[11], + u->item[i].uid_pw_hex[10],u->item[i].uid_pw_hex[9],u->item[i].uid_pw_hex[8]); // 默认失败 u->ack[i*38+0]=i+slave_addr_off(); u->ack[i*38+1]=1;