From 66b13717fce3890b464d0b43eb61b94ea7cdf56e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 28 九月 2021 17:09:23 +0800
Subject: [PATCH] V2.30
---
源码/核心板/Src/main.c | 8 +++++---
1 files changed, 5 insertions(+), 3 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 7e1f98c..a28753b 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"
@@ -72,6 +72,7 @@
if(g_com_map[IMU_THRES]<1)
{g_com_map[IMU_THRES]=1;}
}
+u16 decid;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -94,14 +95,15 @@
#endif
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x021a;
+ g_com_map[VERSION] = 0x021e;
dev_id = g_com_map[DEV_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+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];
total_slotnum = 1000/g_com_map[COM_INTERVAL];
- anchor_type = dev_id%3;
+ decid = (g_com_map[DEV_ID]/0x1000)*1000+((g_com_map[DEV_ID]%0x1000)/0x100)*100+((g_com_map[DEV_ID]%0x100)/0x10)*10+((g_com_map[DEV_ID]%0x10));
+ anchor_type = decid%g_com_map[MAX_REPORT_ANC_NUM];
@@ -160,7 +162,7 @@
UART_PushFrame(hbsend,16);
}
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
-u16 heartbeat_timer,poll_timer;
+u16 heartbeat_timer=58000,poll_timer;
int16_t sync_timer;
extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
uint32_t tagpos_binary;
--
Gitblit v1.9.3