From c1e6196d3da930a82f12313bce04205b3488f7f1 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期日, 24 三月 2024 09:22:59 +0800
Subject: [PATCH] Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag into 免布线标签-lora-泰斗GPS

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

diff --git a/Inc/main.h b/Inc/main.h
index 47d829f..004b1b5 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -69,6 +69,8 @@
 
 /* USER CODE END EM */
 
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
+
 /* Exported functions prototypes ---------------------------------------------*/
 void Error_Handler(void);
 
@@ -92,10 +94,6 @@
 #define LED1_G_GPIO_Port GPIOB
 #define LED1_R_Pin GPIO_PIN_13
 #define LED1_R_GPIO_Port GPIOB
-#define DW_CTRL_Pin GPIO_PIN_12
-#define DW_CTRL_GPIO_Port GPIOA
-#define LED2_G_Pin GPIO_PIN_15
-#define LED2_G_GPIO_Port GPIOA
 #define RADIO_DIO1_Pin GPIO_PIN_3
 #define RADIO_DIO1_GPIO_Port GPIOB
 #define RADIO_DIO1_EXTI_IRQn EXTI2_3_IRQn
@@ -103,6 +101,8 @@
 #define RADIO_nRESET_GPIO_Port GPIOB
 #define RADIO_NSS_Pin GPIO_PIN_5
 #define RADIO_NSS_GPIO_Port GPIOB
+#define INPUT_5V_Pin GPIO_PIN_6
+#define INPUT_5V_GPIO_Port GPIOB
 #define SDA_Pin GPIO_PIN_8
 #define SDA_GPIO_Port GPIOB
 #define SCL_Pin GPIO_PIN_9
@@ -123,9 +123,6 @@
 #define OUT1_GPIO_Port GPIOB
 #define LED1_Pin GPIO_PIN_13
 #define LED1_GPIO_Port GPIOB
-#define INPUT_5V_GPIO_Port GPIOB
-#define INPUT_5V_Pin GPIO_PIN_7
-
 /* USER CODE END Private defines */
 
 #ifdef __cplusplus

--
Gitblit v1.9.3