From 1964c9f6c990dde20db364b687275d8d50416ff4 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 14 四月 2020 23:15:25 +0800
Subject: [PATCH] V1.9 修改成串口距离信息整合输出
---
源码/核心板/Src/main.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 3a40269..9b6fb2e 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,20 +55,25 @@
//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] = 0x0109;
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[ANC_FLAG]==0xffff)
+ {g_com_map[DEV_ROLE]=1;}
+
if(g_com_map[DEV_ROLE])
{
printf("标签ID: %d .\r\n",dev_id);
--
Gitblit v1.9.3