From 17ff13e1e82eb03555357177282256fda7ad976a Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 08 八月 2023 18:15:40 +0800
Subject: [PATCH] Merge branch '嘉峪关-SS定位-防撞基站-气压计' of http://47.108.70.204:60062/r/XRange_Tag into 嘉峪关-SS定位-防撞基站-气压计

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

diff --git a/Inc/main.h b/Inc/main.h
index 251d2ad..7038f10 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -91,14 +91,14 @@
 #define USER_KEY_Pin GPIO_PIN_1
 #define USER_KEY_GPIO_Port GPIOB
 #define USER_KEY_EXTI_IRQn EXTI0_1_IRQn
-#define INPUT_5V_Pin GPIO_PIN_11
-#define INPUT_5V_GPIO_Port GPIOA
 #define LED1_G_Pin GPIO_PIN_12
 #define LED1_G_GPIO_Port GPIOB
 #define LED1_R_Pin GPIO_PIN_13
 #define LED1_R_GPIO_Port GPIOB
 #define DW_WKUP_Pin GPIO_PIN_8
 #define DW_WKUP_GPIO_Port GPIOA
+#define INPUT_5V_Pin GPIO_PIN_11
+#define INPUT_5V_GPIO_Port GPIOA
 #define DW_CTRL_Pin GPIO_PIN_12
 #define DW_CTRL_GPIO_Port GPIOA
 #define LED2_G_Pin GPIO_PIN_15

--
Gitblit v1.9.3