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 | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Inc/main.h b/Inc/main.h index 397ef23..bd45113 100644 --- a/Inc/main.h +++ b/Inc/main.h @@ -45,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; @@ -68,8 +68,6 @@ /* USER CODE END EM */ -void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); - /* Exported functions prototypes ---------------------------------------------*/ void Error_Handler(void); @@ -78,25 +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 MOTOR_Pin GPIO_PIN_10 -#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 +#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 @@ -111,6 +101,8 @@ #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) -- Gitblit v1.9.3