From 6e24113e302a99f943d0040d075d67963e570689 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 11 十一月 2021 18:00:55 +0800
Subject: [PATCH] I2C 改好

---
 Inc/main.h |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Inc/main.h b/Inc/main.h
index 07df619..81924b1 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,15 +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 60
+#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);
@@ -76,20 +80,20 @@
 /* Private defines -----------------------------------------------------------*/
 #define BAT_MEAS_Pin GPIO_PIN_1
 #define BAT_MEAS_GPIO_Port GPIOA
-#define SCL_Pin GPIO_PIN_2
-#define SCL_GPIO_Port GPIOA
-#define SDA_Pin GPIO_PIN_3
-#define SDA_GPIO_Port GPIOA
+#define SCL_Pin GPIO_PIN_14
+#define SCL_GPIO_Port GPIOB
+
+#define SDA_Pin GPIO_PIN_2
+#define SDA_GPIO_Port GPIOB
 #define SPI_CS_Pin GPIO_PIN_4
 #define SPI_CS_GPIO_Port GPIOA
 #define BAT_MEAS_GND_Pin GPIO_PIN_0
 #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 INPUT_5V_Pin GPIO_PIN_11
+#define USER_KEY_EXTI_IRQn EXTI0_1_IRQn
+#define INPUT_5V_Pin GPIO_PIN_6
 #define INPUT_5V_GPIO_Port GPIOB
 #define LED1_G_Pin GPIO_PIN_12
 #define LED1_G_GPIO_Port GPIOB
@@ -105,9 +109,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