From 7a67526ee4c5c0664e2b8b9a56e86a82eb9b238a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 10 十二月 2021 17:32:39 +0800
Subject: [PATCH] 0

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

diff --git a/Inc/main.h b/Inc/main.h
index 02e8b3a..bd45113 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"
@@ -44,7 +45,7 @@
 extern SPI_HandleTypeDef hspi1;
 extern UART_HandleTypeDef huart1;
 extern uint8_t g_start_send_flag,bat_percent,group_id;
-extern ADC_HandleTypeDef hadc;
+//extern ADC_HandleTypeDef hadc;
 extern LPTIM_HandleTypeDef hlptim1;
 extern uint16_t lastpoll_count,interval_count,slot_startcount,tag_frequency,tyncpoll_time,waitusart_timer;
 typedef uint32_t  u32;
@@ -56,10 +57,10 @@
 
 /* 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 ------------------------------------------------------------*/
@@ -75,26 +76,17 @@
 /* USER CODE END EFP */
 
 /* 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 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 INPUT_5V_GPIO_Port GPIOB
-#define LED1_G_Pin GPIO_PIN_12
+#define LED1_G_Pin GPIO_PIN_10
 #define LED1_G_GPIO_Port GPIOB
-#define LED1_R_Pin GPIO_PIN_13
+#define LED1_R_Pin GPIO_PIN_3
 #define LED1_R_GPIO_Port GPIOB
 #define DW_WKUP_Pin GPIO_PIN_8
 #define DW_WKUP_GPIO_Port GPIOA
@@ -109,9 +101,11 @@
 #define PWR_CTL_Pin GPIO_PIN_9
 #define PWR_CTL_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
+#define USER_KEY_GPIO_Port GPIOA
+#define USER_KEY_Pin GPIO_PIN_1
 #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