From fad1b368e3d987d753d3424c0144f574c6e44d2c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 11 四月 2024 11:14:06 +0800
Subject: [PATCH] Merge branch '免布线URT-LORA-L071' of http://47.108.70.204:60062/r/XRange_Tag into 免布线URT-LORA-L071
---
Src/main.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index bd80e0e..a33f031 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -245,7 +245,7 @@
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(memcmp(g_com_map2,g_com_map,200)!=0)
+ if(memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
@@ -306,7 +306,7 @@
hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = (1<<8)|11;
+ g_com_map[VERSION] = (1<<8)|15;
// g_com_map[DEV_ID]=1158;
// #ifdef DEBUG_MODE
// // g_com_map[GROUP_ID]=21;
@@ -1123,8 +1123,8 @@
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13|GPIO_PIN_7|GPIO_PIN_8, GPIO_PIN_RESET);
-
- /*Configure GPIO pin Output Level */
+
+ /*Configure GPIO pin O__set_MSPutput Level */
HAL_GPIO_WritePin(GPIOC, RADIO_NSS_Pin|RADIO_nRESET_Pin|GPIO_PIN_4, GPIO_PIN_SET);
/*Configure GPIO pin Output Level */
--
Gitblit v1.9.3