From 330bcfcfee023997495bf4e02ad0e8fe4308dfd9 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 27 九月 2018 11:12:44 +0800
Subject: [PATCH] Revert "上海调试完成，可通讯，可设ID"
---
源码/核心板/Src/main.c | 102 +++++++++------------------------------------------
1 files changed, 18 insertions(+), 84 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 d271c2c..673affa 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,17 +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 "deca_device_api.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 = 500;
void Device_Init(void)
{
@@ -37,9 +32,10 @@
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
-void Parameter_Init(void)
+void Program_Init(void)
{
Usart1ParseDataCallback = UsartParseDataHandler;
+ parameter_init();
}
/*! ------------------------------------------------------------------------------------------------------------------
@@ -51,96 +47,34 @@
*
* @return none
*/
-extern uint8_t send_start;
+
int main(void)
{
- LPFilter_Frac* p_Dis_Filter;
-
- Device_Init();
- Parameter_Init();
- Dw1000_Init();
- p_Dis_Filter = New_LP_Frac(0.7);
- #ifdef WORK_MODE_TAG
- dwt_configuresleep(0x940, 0x7);
- _dwt_aonarrayupload();
- //dwt_entersleep();
- #endif
-
+ Device_Init();
+ Program_Init();
+ Dw1000_Init();
+
+#ifdef WORK_MODE_TAG
+ tag_sleep_configuraion();
+#endif
+ Dw1000_App_Init();
/* Loop forever initiating ranging exchanges. */
while(1)
{
#ifdef WORK_MODE_TAG
-
- if(send_start)
- {send_start=0;
+ 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);
+// UART_CheckReceive();
+ 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 <= g_alarm_dist)
- {
-// 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;
- switch(g_alarm_dev)
- {
- case 0:
- BEEP2_ON;
- BEEP_OFF;
- OUT2_OFF;
- break;
- case 1:
- BEEP_ON;
- BEEP2_OFF;
- OUT2_OFF;
- break;
- case 2:
- OUT2_ON;
- BEEP_OFF;
- BEEP2_OFF;
- break;
- default:
- BEEP2_ON;
- BEEP_ON;
- OUT2_ON;
- break;
- }
- }
- else
- {
-// g_beep_on_time = 0;
-// g_beep_off_time = 0;
- switch(g_alarm_dev)
- {
- case 0:
- BEEP2_OFF;
- break;
- case 1:
- BEEP_OFF;
- break;
- case 2:
- OUT2_OFF;
- break;
- default:
- BEEP2_OFF;
- BEEP_OFF;
- OUT2_OFF;
- break;
- }
- }
-
-
}
}
--
Gitblit v1.9.3