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 | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 b9fae62..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"
@@ -6,22 +6,40 @@
#include "beep.h"
#include "dw_driver.h"
#include "dw_app.h"
+#include "stm32f10x_it.h"
+#include "serial_at_cmd_app.h"
+#include "global_param.h"
//#define WORK_MODE_TAG
#define WORK_MODE_ANCHOR
void Device_Init(void)
{
- Rcc_Init();
+ RCC_Configuration();
+ //SystemInit();
Nvic_Init();
Systick_Init();
+#ifdef WORK_MODE_TAG
+ RTC_Configuration();
+#endif
Led_Init();
Beep_Init();
DW_GPIO_Init();
- Usart_Init();
+ Uart1_Init();
Spi_Init();
+
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
+}
+
+void Program_Init(void)
+{uint16_t i;
+ Usart1ParseDataCallback = UsartParseDataHandler;
+ parameter_init();
+ for(i=0;i<255;i++)
+ {
+ g_Tagdist[i]=0xffff;
+ }
}
/*! ------------------------------------------------------------------------------------------------------------------
@@ -33,22 +51,34 @@
*
* @return none
*/
+
int main(void)
{
-
+delay_ms(1000);
Device_Init();
+ Program_Init();
Dw1000_Init();
+#ifdef WORK_MODE_TAG
+ tag_sleep_configuraion();
+#endif
+ Dw1000_App_Init();
/* Loop forever initiating ranging exchanges. */
+ RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
while(1)
{
#ifdef WORK_MODE_TAG
+ if(g_start_send_flag)
+ {
+ g_start_send_flag = 0;
Tag_App();
+ }
+// UART_CheckReceive();
+ PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);
#else
Anchor_App();
#endif
- //除UWB之外的其他代码...
-
+
}
}
--
Gitblit v1.9.3