From 1059b6d24c634e20aa8d63412792239b607b4020 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 09 四月 2020 23:07:28 +0800
Subject: [PATCH] 完善标签功能

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

diff --git a/Inc/main.h b/Inc/main.h
index 449c62b..5fa0da2 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -43,7 +43,7 @@
 /* USER CODE BEGIN ET */
 extern SPI_HandleTypeDef hspi1;
 extern UART_HandleTypeDef huart1;
-extern uint8_t g_start_send_flag,bat_percent;
+extern uint8_t g_start_send_flag,bat_percent,group_id;
 extern ADC_HandleTypeDef hadc;
 extern LPTIM_HandleTypeDef hlptim1;
 extern uint16_t lastpoll_count,interval_count,slot_startcount,tag_frequency,tyncpoll_time,waitusart_timer;
@@ -84,6 +84,8 @@
 #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_GPIO_Port GPIOB
 #define LED1_R_Pin GPIO_PIN_13
@@ -99,7 +101,8 @@
 #define PWR_ON_Pin GPIO_PIN_7
 #define PWR_ON_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
-#define GET_IMUINT HAL_GPIO_ReadPin(GPIOA,GPIO_PIN_0)
+#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