From 5309726bb8a8b310304b88c84a8ae5dd76d8188a Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 22 一月 2024 15:35:09 +0800
Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora

---
 Inc/main.h |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Inc/main.h b/Inc/main.h
index 65f9f37..d538123 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -52,13 +52,15 @@
 typedef uint8_t  u8;
 extern uint16_t slottime,max_slotpos,current_slotnum;
 void SetNextPollTime(u16 time);
+void MX_ADC_Init(void);
+void MX_ADC_DeInit(void);
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
 /* USER CODE BEGIN EC */
 #define LPTIMER_LSB 30.518 //1 puls=30.518us
 #define LPTIMER_1S_COUNT 32767
-#define USART_KEEPWAKE_TIME 10
+#define USART_KEEPWAKE_TIME 2
 #define KEY_KEEPRESET_TIME 5
 /* USER CODE END EC */
 
@@ -66,8 +68,6 @@
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
-
-void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
 
 /* Exported functions prototypes ---------------------------------------------*/
 void Error_Handler(void);
@@ -90,9 +90,11 @@
 #define USER_KEY_Pin GPIO_PIN_1
 #define USER_KEY_GPIO_Port GPIOB
 #define USER_KEY_EXTI_IRQn EXTI0_1_IRQn
+#define RADIO_BUSY_Pin GPIO_PIN_2
+#define RADIO_BUSY_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_13
 #define LED1_G_GPIO_Port GPIOB
 #define LED1_R_Pin GPIO_PIN_13
 #define LED1_R_GPIO_Port GPIOB
@@ -102,16 +104,37 @@
 #define DW_CTRL_GPIO_Port GPIOA
 #define LED2_G_Pin GPIO_PIN_15
 #define LED2_G_GPIO_Port GPIOA
-#define LED2_R_Pin GPIO_PIN_3
-#define LED2_R_GPIO_Port GPIOB
-#define PWR_ON_Pin GPIO_PIN_7
-#define PWR_ON_GPIO_Port GPIOB
+#define RADIO_DIO1_Pin GPIO_PIN_3
+#define RADIO_DIO1_GPIO_Port GPIOB
+#define RADIO_DIO1_EXTI_IRQn EXTI2_3_IRQn
+#define RADIO_nRESET_Pin GPIO_PIN_4
+#define RADIO_nRESET_GPIO_Port GPIOB
+#define RADIO_NSS_Pin GPIO_PIN_5
+#define RADIO_NSS_GPIO_Port GPIOB
 #define PWR_CTL_Pin GPIO_PIN_9
 #define PWR_CTL_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 #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 3
+
+
+#define RADIO_SCK_Pin GPIO_PIN_5
+#define RADIO_SCK_GPIO_Port GPIOA
+#define RADIO_MISO_Pin GPIO_PIN_6
+#define RADIO_MISO_GPIO_Port GPIOA
+#define RADIO_MOSI_Pin GPIO_PIN_7
+#define RADIO_MOSI_GPIO_Port GPIOA
+#define OUT1_Pin GPIO_PIN_12
+#define OUT1_GPIO_Port GPIOB
+#define LED1_Pin GPIO_PIN_13
+#define LED1_GPIO_Port GPIOB
+
+#define   LORA_CS_ON   HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_SET);
+#define   LORA_CS_OFF HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin, GPIO_PIN_RESET);
+
+#define   UWB_CS_ON  HAL_GPIO_WritePin(SPI_CS_GPIO_Port, SPI_CS_Pin, GPIO_PIN_SET);
+#define   UWB_CS_OFF HAL_GPIO_WritePin(SPI_CS_GPIO_Port, SPI_CS_Pin, GPIO_PIN_RESET);
 /* USER CODE END Private defines */
 
 #ifdef __cplusplus

--
Gitblit v1.9.3