From 23f26e8d4cea6619caff53235b92bd2dd4eed76e Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 03 八月 2023 17:23:29 +0800
Subject: [PATCH] 版本v2.6，修改5v输入检测错误bug

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

diff --git a/Inc/main.h b/Inc/main.h
index 02e8b3a..251d2ad 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,16 +57,18 @@
 
 /* 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 120
+#define KEY_KEEPRESET_TIME 5
 /* USER CODE END EC */
 
 /* Exported macro ------------------------------------------------------------*/
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
+
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
 
 /* Exported functions prototypes ---------------------------------------------*/
 void Error_Handler(void);
@@ -88,10 +91,8 @@
 #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 INPUT_5V_GPIO_Port GPIOA
 #define LED1_G_Pin GPIO_PIN_12
 #define LED1_G_GPIO_Port GPIOB
 #define LED1_R_Pin GPIO_PIN_13
@@ -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