From d2de620b25574ea7a0c47ef7b00ef5b7c3751e12 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 31 十月 2021 17:00:00 +0800
Subject: [PATCH] V2.41 时间片解决，有蓝灯长亮BUG

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

diff --git a/Inc/main.h b/Inc/main.h
index 03ffb26..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"
@@ -50,20 +51,24 @@
 typedef uint32_t  u32;
 typedef uint16_t u16;
 typedef uint8_t  u8;
-extern uint16_t slottime,max_slotpos;
+extern uint16_t slottime,max_slotpos,current_slotnum;
+void SetNextPollTime(u16 time);
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
 /* USER CODE BEGIN EC */
-#define LPTIMER_LSB 30.518 //1 puls=30.518us
-#define LPTIMER_1S_COUNT 33095
-#define USART_KEEPWAKE_TIME 60
+#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
 /* 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);
@@ -85,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
@@ -104,9 +108,12 @@
 #define LED2_R_GPIO_Port GPIOB
 #define PWR_ON_Pin GPIO_PIN_7
 #define PWR_ON_GPIO_Port GPIOB
+#define PWR_CTL_Pin GPIO_PIN_9
+#define PWR_CTL_GPIO_Port GPIOB
 /* 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)
+
 /* USER CODE END Private defines */
 
 #ifdef __cplusplus

--
Gitblit v1.9.3