From 7db378e2b93702b98ffe7f7b6ab9a4d20aaabb20 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 16 四月 2020 08:50:37 +0800
Subject: [PATCH] V1.10 去掉基站标识，改输出模式
---
源码/核心板/Src/main.c | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 7b982e9..e2e780c 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"
@@ -11,7 +11,7 @@
#include "global_param.h"
#include "ADC.h"
-#define DEBUG_MODE
+//#define DEBUG_MODE
void Device_Init(void)
{
@@ -55,17 +55,22 @@
//deca_sleep(1000);
HeartBeatInit();
#ifdef DEBUG_MODE
- g_com_map[DEV_ROLE]=0;
- g_com_map[DEV_ID]=4;
- g_com_map[COM_INTERVAL]=100;
- g_com_map[MAX_REPORT_ANC_NUM]=3;
+// 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] = 0x010a;
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]/3)+1;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
+
if(g_com_map[DEV_ROLE])
{
@@ -103,7 +108,7 @@
{
UART_PushFrame(hbsend,16);
}
-extern u8 g_start_sync_flag;
+extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
u16 heartbeat_timer,poll_timer,sync_timer;
void IdleTask(void)
{
@@ -117,6 +122,16 @@
HeatBeat();
}
+ if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
+ {u16 checksum;
+ usart_send_flag=0;
+ usart_send[2] = 4;//正常模式
+ usart_send[3] = anc_report_num*6+2;//正常模式
+ checksum = Checksum_u16(&usart_send[2],anc_report_num*6+2);
+ memcpy(&usart_send[4+anc_report_num*6],&checksum,2);
+ UART_PushFrame(usart_send,6+anc_report_num*6);
+ anc_report_num=0;
+ }
if(g_com_map[CNT_UPDATE]==1)
{
uint32_t result = 0;
--
Gitblit v1.9.3