From f41e89f0825b39b4b98b8a82e9e8fd5c655de55d Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 14 九月 2023 15:07:43 +0800
Subject: [PATCH] 版本v2.70，加入防撞代码，uwb  4G

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

diff --git a/Inc/main.h b/Inc/main.h
index a48fd5c..397ef23 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"
@@ -56,7 +57,7 @@
 
 /* Exported constants --------------------------------------------------------*/
 /* USER CODE BEGIN EC */
-#define LPTIMER_LSB 30.518 //1 puls=30.518us
+#define LPTIMER_LSB 30.518 //30.518 //1 puls=30.518us
 #define LPTIMER_1S_COUNT 32767
 #define USART_KEEPWAKE_TIME 10
 #define KEY_KEEPRESET_TIME 5
@@ -66,6 +67,8 @@
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
+
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
 
 /* Exported functions prototypes ---------------------------------------------*/
 void Error_Handler(void);
@@ -87,9 +90,8 @@
 #define BAT_MEAS_GND_GPIO_Port GPIOB
 #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 USER_KEY_EXTI_IRQn EXTI0_1_IRQn
 #define INPUT_5V_Pin GPIO_PIN_11
 #define INPUT_5V_GPIO_Port GPIOB
 #define LED1_G_Pin GPIO_PIN_12
@@ -111,7 +113,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