From 8770b97111b845632246b08696f4362f6e88a5ee Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 20:31:25 +0800
Subject: [PATCH] Merge branch 'dev_zyc' into Merge_anchor_and_tag
---
源码/核心板/Src/main.c | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 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 21cdfa8..c8760ae 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,15 +6,12 @@
#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 500
-#define BEEM_ON_TIME_MS 200
-
-float dis_after_filter = 0;
+#define WORK_MODE_TAG
+//#define WORK_MODE_ANCHOR
void Device_Init(void)
{
@@ -22,13 +19,23 @@
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)
+{
+ Usart1ParseDataCallback = UsartParseDataHandler;
+ parameter_init();
}
/*! ------------------------------------------------------------------------------------------------------------------
@@ -40,38 +47,33 @@
*
* @return none
*/
+
int main(void)
{
- LPFilter_Frac* p_Dis_Filter;
-
- Device_Init();
- Dw1000_Init();
- p_Dis_Filter = New_LP_Frac(0.9);
+ Device_Init();
+ Program_Init();
+ Dw1000_Init();
+
+#ifdef WORK_MODE_TAG
+ tag_sleep_configuraion();
+#endif
+
/* Loop forever initiating ranging exchanges. */
while(1)
{
#ifdef WORK_MODE_TAG
+ if(g_start_send_flag)
+ {
+ g_start_send_flag = 0;
Tag_App();
+ }
+ RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
+ PWR_EnterSTOPMode(PWR_Regulator_LowPower, PWR_STOPEntry_WFI);
#else
Anchor_App();
#endif
- //除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;
- }
- else
- {
- g_beep_on_time = 0;
- g_beep_off_time = 0;
- }
-
+
}
}
--
Gitblit v1.9.3