From 8eeb0e8fbbde5e9cb33d895223322449fd58f345 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 15 六月 2020 21:28:29 +0800
Subject: [PATCH] V1.18，武汉测试不错版本，为上一版本修改间隔到DELAY_BETWEEN_TWO_FRAME_UUS 300us
---
源码/核心板/Src/main.c | 81 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 24 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 87ded51..a145aa0 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"
@@ -55,32 +55,35 @@
//deca_sleep(1000);
HeartBeatInit();
#ifdef DEBUG_MODE
- g_com_map[DEV_ROLE]=1;
- g_com_map[DEV_ID]=1;
- g_com_map[COM_INTERVAL]=100;
- g_com_map[MAX_REPORT_ANC_NUM]=3;
- g_com_map[NEARBASE_NUM]=1;
- g_com_map[NEARBASE_ID1]=2;
+// g_com_map[DEV_ROLE]=1;
+// g_com_map[DEV_ID]=1;
+// g_com_map[COM_INTERVAL]=100;
+// g_com_map[MAX_REPORT_ANC_NUM]=3;
+// g_com_map[NEARBASE_NUM]=1;
+// g_com_map[NEARBASE_ID1]=2;
+ g_com_map[ANC_FLAG]=1;
+ save_com_map_to_flash();
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0107;
+ g_com_map[VERSION] = 0x0112;
dev_id = g_com_map[DEV_ID];
- slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*4/3);
+ slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/4)+4;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
- if(g_com_map[DEV_ROLE])
- {
- printf("标签ID: %d .\r\n",dev_id);
- printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
- printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
- }else{
- anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
- printf("基站ID: %x .\r\n",dev_id);
- printf("基站类型: %c .\r\n",anchor_type+0x41);
- printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
- }
+// if(g_com_map[DEV_ROLE])
+// {
+// printf("标签ID: %d .\r\n",dev_id);
+// printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
+// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+// }else{
+//
+// anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
+// printf("基站ID: %x .\r\n",dev_id);
+// printf("基站类型: %c .\r\n",anchor_type+0x41);
+// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+// }
OUT485_DISABLE;
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
@@ -105,11 +108,15 @@
{
UART_PushFrame(hbsend,16);
}
-extern u8 g_start_sync_flag;
-u16 heartbeat_timer,poll_timer,sync_timer;
+extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
+u16 heartbeat_timer,poll_timer;
+int16_t sync_timer;
+extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
+uint32_t tagpos_binary;
+extern u16 ancidlist_rec[20],ancidlist_send[20];
void IdleTask(void)
{
- g_start_sync_flag=0;
+ main_logic();
UART_CheckReceive();
UART_CheckSend();
if(heartbeat_timer>1000)
@@ -118,7 +125,30 @@
if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
HeatBeat();
}
+ if(flag_newsecond)
+ {
+ flag_newsecond=0;
+ tagpos_binary=0;
+ memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
+ ancidlist_num=0;
+ for(u8 i=0;i<max_slotpos;i++)
+ {
+ if(tagpos_rec[i])
+ tagpos_binary|=1<<i;
+ tagpos_rec[i] = 0;
+ }
+ }
+ if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
+ {u16 checksum;
+ usart_send_flag=0;
+ usart_send_anc[2] = 5;//正常模式
+ usart_send_anc[3] = anc_report_num*6+2;//正常模式
+ checksum = Checksum_u16(&usart_send_anc[2],anc_report_num*6+2);
+ memcpy(&usart_send_anc[4+anc_report_num*6],&checksum,2);
+ UART_PushFrame(usart_send_anc,6+anc_report_num*6);
+ anc_report_num=0;
+ }
if(g_com_map[CNT_UPDATE]==1)
{
uint32_t result = 0;
@@ -150,10 +180,12 @@
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
usart_send[0]=0x55;
usart_send[1]=0xAA;
-
+ usart_send_anc[0]=0x55;
+ usart_send_anc[1]=0xAA;
+
while(1)
{
-
+ g_start_sync_flag=0;
if(g_start_send_flag)
{
g_start_send_flag = 0;
@@ -162,6 +194,7 @@
IdleTask();
if(g_com_map[DEV_ROLE]==0)
Anchor_App();
+
}
}
--
Gitblit v1.9.3