From aaf7e4ef5c1aa0535940531f20e4846cbcd39b69 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 04 十一月 2019 19:48:15 +0800
Subject: [PATCH] Merge branch '基站测距' into ALPHAV1
---
源码/核心板/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 78ab7a3..ffa53e1 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"
@@ -54,6 +54,8 @@
// g_com_map[DEV_ROLE]=1;
// g_com_map[DEV_ID]=1;
// g_com_map[COM_INTERVAL]=10;
+ OUT485_ENABLE;
+ g_com_map[VERSION] = 0x0104;
if(g_com_map[DEV_ROLE])
{
tyncpoll_time=g_com_map[DEV_ID]*g_com_map[MAX_REPORT_ANC_NUM]*4/3;
@@ -67,6 +69,7 @@
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]);
@@ -125,14 +128,14 @@
Device_Init();
Program_Init();
- //Dw1000_Init();
+ Dw1000_Init();
delay_ms(10);
Dw1000_App_Init();
/* Loop forever initiating ranging exchanges. */
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
usart_send[0]=0x55;
usart_send[1]=0xAA;
- UART_PushFrame(hbsend,16);
+
while(1)
{
IdleTask();
--
Gitblit v1.9.3