From d9a7770ba94decb726583ab824fe5fb0d0b4d85f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 01 七月 2020 20:36:10 +0800
Subject: [PATCH] 远程修改标签配置功能，好像有bug，map表会自动修改
---
源码/核心板/Src/main.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index f7c4e53..794be8a 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -67,9 +67,9 @@
save_com_map_to_flash();
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0112;
+ g_com_map[VERSION] = 0x0113;
dev_id = g_com_map[DEV_ID];
- slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/4)+4;
+ slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*0.4)+3;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
module_power = g_com_map[POWER];
@@ -121,6 +121,7 @@
extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
uint32_t tagpos_binary;
extern u16 ancidlist_rec[20],ancidlist_send[20];
+extern u16 target_time;
void IdleTask(void)
{
@@ -145,6 +146,8 @@
tagpos_rec[i] = 0;
}
}
+ if(target_time>1000)
+ {target_time-=1000;}
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
{u16 checksum;
--
Gitblit v1.9.3