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

V0.05

Browse Source 
uid追溯改为10年，密码上报反序
This commit is contained in:
ranchuan
2023-11-16 10:09:19 +08:00
parent 2141db1f2f
commit c537004498
7 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coder_2channel.uvoptx
View File

@@ -987,7 +987,7 @@
<Group> <Group>
<GroupName>rt_thread</GroupName> <GroupName>rt_thread</GroupName>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -1223,7 +1223,7 @@
<Group> <Group>
<GroupName>soft</GroupName> <GroupName>soft</GroupName>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>

4
source/ReadMe.txt
View File

@@ -186,7 +186,9 @@
修改方案结构体为节约存储空间版本，与之前的updata软件不兼容 修改方案结构体为节约存储空间版本，与之前的updata软件不兼容
修改打标时间为5s 修改打标时间为5s
打标结束时亮绿灯 打标结束时亮绿灯
2023.11.16
V0.05
uid追溯改为10年，密码上报反序

4
source/coder/coder_lib.c
View File

@@ -69,7 +69,9 @@ static int coder_calc_year(const char *year,const char shell_year,char *uid_year
} }
// year是实时数据，鉴于12月31生产的雷管，year可能不同 // year是实时数据，鉴于12月31生产的雷管，year可能不同
// 此时year-1来保证与uid码上的相同 // 此时year-1来保证与uid码上的相同
if(year[3]!=shell_year) // if(year[3]!=shell_year)
// y--;
while((y%10)!=(shell_year-'0'))
y--; y--;
uid_year[0]=y%100/10+'0'; uid_year[0]=y%100/10+'0';
uid_year[1]=y%10+'0'; uid_year[1]=y%10+'0';

4
source/main/compiler_info.h
View File

@@ -6,8 +6,8 @@
#define BUILD_DATE "2023-11-14 09:14:57" #define BUILD_DATE "2023-11-16 09:58:59"
#define SOFT_VERSION "0.04" #define SOFT_VERSION "0.05"

2
source/prebuild.py
View File

@@ -7,7 +7,7 @@ from datetime import datetime, timedelta
# 定义软件版本号 # 定义软件版本号
SOFT_VERION = "0.04" SOFT_VERION = "0.05"

6
source/task/tran_for_coder2.c
View File

@@ -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 " 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], "%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]); d_[8],d_[9],d_[10],d_[11]);
// 生成密码字符串 // 生成密码字符串，反序
sprintf(u->item[i].password,"%02X%02X%02X%02X",u->item[i].uid_pw_hex[8], sprintf(u->item[i].password,"%02X%02X%02X%02X",u->item[i].uid_pw_hex[11],
u->item[i].uid_pw_hex[9],u->item[i].uid_pw_hex[10],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+0]=i+slave_addr_off();
u->ack[i*39+1]=1; u->ack[i*39+1]=1;

6
source/task/tran_for_coder2ch.c
View File

@@ -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 " 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], "%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]); d_[8],d_[9],d_[10],d_[11]);
// 生成密码字符串 // 生成密码字符串，反序
sprintf(u->item[i].password,"%02X%02X%02X%02X",u->item[i].uid_pw_hex[8], sprintf(u->item[i].password,"%02X%02X%02X%02X",u->item[i].uid_pw_hex[11],
u->item[i].uid_pw_hex[9],u->item[i].uid_pw_hex[10],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+0]=i+slave_addr_off();
u->ack[i*38+1]=1; u->ack[i*38+1]=1;