From 3c8c53f51592e0e3723083288bf80e4705973e74 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 30 十月 2023 11:29:58 +0800
Subject: [PATCH] 版本v2.5，把防撞基站测距出来的距离，加到定位的报文里发到定位基站上传服务器。

---
 Inc/main.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Inc/main.h b/Inc/main.h
index b2b1b18..2c8cb3b 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -33,6 +33,7 @@
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "Usart.h"
+#include "Flash.h"
 #include "serial_at_cmd_app.h"
 #include "led.h"	
 #include "dw_app.h"
@@ -67,6 +68,8 @@
 
 /* USER CODE END EM */
 
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
+
 /* Exported functions prototypes ---------------------------------------------*/
 void Error_Handler(void);
 
@@ -88,8 +91,6 @@
 #define USER_KEY_Pin GPIO_PIN_1
 #define USER_KEY_GPIO_Port GPIOB
 #define USER_KEY_EXTI_IRQn EXTI0_1_IRQn
-#define MOTOR_Pin GPIO_PIN_10
-#define MOTOR_GPIO_Port GPIOB
 #define INPUT_5V_Pin GPIO_PIN_11
 #define INPUT_5V_GPIO_Port GPIOB
 #define LED1_G_Pin GPIO_PIN_12
@@ -111,7 +112,7 @@
 /* USER CODE BEGIN Private defines */
 #define GET_IMUINT 		HAL_GPIO_ReadPin(GPIOA,GPIO_PIN_0)
 #define GET_USERKEY 	HAL_GPIO_ReadPin(USER_KEY_GPIO_Port,USER_KEY_Pin)
-#define STATIONARY_TIME 120
+
 /* USER CODE END Private defines */
 
 #ifdef __cplusplus

--
Gitblit v1.9.3