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 | 76 +++++++++++++++++---------------------
1 files changed, 34 insertions(+), 42 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 49dd841..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,32 +6,42 @@
#include "beep.h"
#include "dw_driver.h"
#include "dw_app.h"
-#include "filters.h"
#include "stm32f10x_it.h"
+#include "serial_at_cmd_app.h"
+#include "global_param.h"
//#define WORK_MODE_TAG
#define WORK_MODE_ANCHOR
-#define START_ALARM_DIST_CM 200
-#define BEEM_ON_TIME_MS 200
-
-float dis_after_filter = 0;
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();
- Usart_Init();
+ Uart1_Init();
Spi_Init();
+
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
-
- uint8_t aa;
+
+void Program_Init(void)
+{uint16_t i;
+ Usart1ParseDataCallback = UsartParseDataHandler;
+ parameter_init();
+ for(i=0;i<255;i++)
+ {
+ g_Tagdist[i]=0xffff;
+ }
+}
+
/*! ------------------------------------------------------------------------------------------------------------------
* @fn main()
*
@@ -41,52 +51,34 @@
*
* @return none
*/
+
int main(void)
{
- LPFilter_Frac* p_Dis_Filter;
-
+delay_ms(1000);
Device_Init();
+ Program_Init();
Dw1000_Init();
- p_Dis_Filter = New_LP_Frac(0.9);
+#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
- if(USART_GetFlagStatus(EXT_USART, USART_FLAG_RXNE) != RESET)
- {
- aa = USART_ReceiveData(EXT_USART);
- USART_SendData(EXT_USART, 0x66);//向串口1发送数据
- while(USART_GetFlagStatus(EXT_USART, USART_FLAG_TC)!=SET);//等待发送结束
-
- aa = 0;
- }
-
- //除UWB之外的其他代码...
- dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
-
- if(dis_after_filter <= START_ALARM_DIST_CM)
- {
-// g_beep_off_time = (uint32_t)dis_after_filter * 10;
-// if(g_beep_off_time <= 0)
-// g_beep_off_time = 0;
-// g_beep_on_time = BEEM_ON_TIME_MS;
- OUT2_ON;
-
- }
- else
- {
-// g_beep_on_time = 0;
-// g_beep_off_time = 0;
- OUT2_OFF;
- }
-
}
}
--
Gitblit v1.9.3