From dca9d1109b42085df12402d6b54006a23a9aaa75 Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期日, 07 十月 2018 16:35:01 +0800
Subject: [PATCH] 修改为0.5s通讯一次,增加测距输出

---
 源码/核心板/MDK-ARM/Project.uvoptx   |    4 ----
 源码/核心板/Src/OnChipDevices/RTC.c  |    2 +-
 源码/核心板/Src/application/dw_app.c |    4 +++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
index d4923fd..fe302f0 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
@@ -117,10 +117,6 @@
       <TargetDriverDllRegistry>
         <SetRegEntry>
           <Number>0</Number>
-          <Key>DLGUARM</Key>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
           <Key>UL2CM3</Key>
           <Name>-UV0010M9E -O2254 -S0 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7  -FN1 -FC1000 -FD20000000 -FF0STM32F10x_128 -FL020000 -FS08000000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
         </SetRegEntry>
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/RTC.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/RTC.c"
index d1ac0de..39aa7da 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/RTC.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/RTC.c"
@@ -51,7 +51,7 @@
 	RTC_ITConfig(RTC_IT_ALR,ENABLE); //?? RTC ???  
 		RTC_WaitForLastTask();
 	/* Set RTC prescaler: set RTC period to 1sec */
-	RTC_SetPrescaler(2000); /* RTC period = RTCCLK/RTC_PR = (32.768 KHz)/(32767+1) */
+	RTC_SetPrescaler(10000); /* RTC period = RTCCLK/RTC_PR = (32.768 KHz)/(32767+1) */
 
 	/* Wait until last write operation on RTC registers has finished */
 	RTC_WaitForLastTask();
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index 2499fa3..9aa3f99 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -30,6 +30,7 @@
 #include "Usart.h"
 #include "global_param.h"
 #include "filters.h"
+#include <stdio.h>
 
 
 
@@ -263,7 +264,7 @@
 }
 void Dw1000_App_Init(void)
 {
-	g_com_map[DEV_ID]=0x03;
+	g_com_map[DEV_ID] = 0x04;
 	tx_poll_msg[MESSAGE_TYPE_IDX]=POLL;
 	tx_resp_msg[MESSAGE_TYPE_IDX]=RESPONSE;
 	tx_final_msg[MESSAGE_TYPE_IDX]=FINAL;
@@ -495,6 +496,7 @@
 					dis_after_filter=dist_cm;
 					g_Tagdist[tag_id_recv]=dist_cm;
 					g_flag_Taggetdist[tag_id_recv]=0;
+					printf("Anchor ID: %d, Tag ID: %d, Dist = %d cm\n", g_com_map[DEV_ID], tag_id_recv, (uint16_t)dis_after_filter);
 					//dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
 
 				}

--
Gitblit v1.9.3