From 2b07faacf6d1ce3de7ace73af366e5b84e652c14 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 13 十一月 2024 16:37:43 +0800
Subject: [PATCH] Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag into 免布线标签-lora-泰斗GPS
---
Src/main.c | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 28792ed..200c588 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -218,7 +218,6 @@
hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
g_com_map[VERSION] = (2<<8)|3;
-// g_com_map[VERSION] = (3<<8)|2;
// g_com_map[DEV_ID]=1158;
g_com_map[GROUP_ID]=0;
// g_com_map[COM_INTERVAL] = 1000;
@@ -331,6 +330,7 @@
{
SystemClock_Config();
irq_num++;
+ HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_SET);
RadioIrqProcess();
}
if(GPIO_Pin == GPIO_PIN_1)//按键
@@ -493,6 +493,20 @@
MX_LPUART1_UART_Init();
MX_LPTIM1_Init();
/* USER CODE BEGIN 2 */
+
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+ /*Configure GPIO pin Output Level */
+ HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
+
+ /*Configure GPIO pins : PA2 PA8 */
+ GPIO_InitStruct.Pin = GPIO_PIN_12;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+ HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+
+
LED2_TB_ON;
Program_Init();
LIS3DH_Data_Init();
--
Gitblit v1.9.3