guanjiao
2018-09-15 08187305f2971d0e46fc919bb16ffd7d0a27b81a
Ô´Âë/ºËÐİå/Src/main.c
@@ -9,6 +9,7 @@
#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
@@ -33,9 +34,10 @@
   GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
void Parameter_Init(void)
void Program_Init(void)
{
   Usart1ParseDataCallback = UsartParseDataHandler;
   parameter_init();
}
/*! ------------------------------------------------------------------------------------------------------------------
@@ -52,7 +54,7 @@
   LPFilter_Frac* p_Dis_Filter;
   
   Device_Init();
   Parameter_Init();
   Program_Init();
   Dw1000_Init();
   p_Dis_Filter = New_LP_Frac(0.7);
@@ -69,13 +71,13 @@
      //除UWB之外的其他代码...
      dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
      
      if(dis_after_filter <= g_alarm_dist)
      if(dis_after_filter <= g_com_map[ALARM_DISTANCE])
      {
//         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)
         switch(g_com_map[ALARM_DEV])
         {
            case 0:
               BEEP2_ON;
@@ -103,7 +105,7 @@
      {
//         g_beep_on_time = 0;
//         g_beep_off_time = 0;
         switch(g_alarm_dev)
         switch(g_com_map[ALARM_DEV])
         {
            case 0:
               BEEP2_OFF;