From df3db0b978b1cab3555d6878a274b0f382bf707c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 01 十月 2018 15:42:49 +0800
Subject: [PATCH] 标签开机死机bug改好，基站增加软件超时复位
---
源码/核心板/Src/main.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 673affa..c0f89a6 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"
@@ -10,13 +10,13 @@
#include "serial_at_cmd_app.h"
#include "global_param.h"
-#define WORK_MODE_TAG
-//#define WORK_MODE_ANCHOR
+//#define WORK_MODE_TAG
+#define WORK_MODE_ANCHOR
void Device_Init(void)
{
-// Rcc_Init();
- SystemInit();
+ RCC_Configuration();
+ //SystemInit();
Nvic_Init();
Systick_Init();
#ifdef WORK_MODE_TAG
@@ -33,9 +33,13 @@
}
void Program_Init(void)
-{
+{uint16_t i;
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
+ for(i=0;i<255;i++)
+ {
+ g_Tagdist[i]=0xffff;
+ }
}
/*! ------------------------------------------------------------------------------------------------------------------
@@ -50,7 +54,7 @@
int main(void)
{
-
+delay_ms(1000);
Device_Init();
Program_Init();
Dw1000_Init();
@@ -60,6 +64,7 @@
#endif
Dw1000_App_Init();
/* Loop forever initiating ranging exchanges. */
+ RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
while(1)
{
#ifdef WORK_MODE_TAG
@@ -69,7 +74,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