From 3b088e726d8d468aa7884ad66ef692e0d4d3c606 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期五, 19 四月 2024 14:42:59 +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 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/main.c b/Src/main.c index 3158932..ce34482 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)|14; + g_com_map[VERSION] = (1<<8)|17; // g_com_map[DEV_ID]=1158; // #ifdef DEBUG_MODE // // g_com_map[GROUP_ID]=21; -- Gitblit v1.9.3