From 2d82c2dfc1a64b05cf92a1bf1bd6fc840cb84e79 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 18 十月 2018 16:24:29 +0800
Subject: [PATCH] Revert "配对完成，有bug"
---
源码/核心板/Src/main.c | 24 ++++++++++++++++--------
1 files changed, 16 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 917fef0..1f67ccf 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"
@@ -15,13 +15,10 @@
void Device_Init(void)
{
-// Rcc_Init();
- SystemInit();
+ RCC_Configuration();
+ //SystemInit();
Nvic_Init();
Systick_Init();
-#ifdef WORK_MODE_TAG
- RTC_Configuration();
-#endif
Led_Init();
Beep_Init();
DW_GPIO_Init();
@@ -36,6 +33,16 @@
{uint16_t i;
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
+ #ifdef WORK_MODE_TAG
+ printf("DEVICE MODE: TAG .\r\n");
+ printf("DEVICE ID: %d .\r\n",g_com_map[DEV_ID]);
+ printf("DEVICE INTERVAL: %d .\r\n",g_com_map[COM_INTERVAL]);
+ #else
+ printf("DEVICE MODE: ANCHOR .\r\n");
+ printf("DEVICE ID: %d .\r\n",g_com_map[DEV_ID]);
+ 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]);
+ #endif
for(i=0;i<255;i++)
{
g_Tagdist[i]=0xffff;
@@ -54,16 +61,18 @@
int main(void)
{
-
+
Device_Init();
Program_Init();
Dw1000_Init();
-
+ delay_ms(1000);
#ifdef WORK_MODE_TAG
+ RTC_Configuration(g_com_map[COM_INTERVAL]*20);
tag_sleep_configuraion();
#endif
Dw1000_App_Init();
/* Loop forever initiating ranging exchanges. */
+ RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
while(1)
{
#ifdef WORK_MODE_TAG
@@ -73,7 +82,6 @@
Tag_App();
}
// UART_CheckReceive();
- RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);
#else
Anchor_App();
--
Gitblit v1.9.3