From 3dc93e0626cf3dcf3c265f902da8a7de5070f083 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 13 五月 2024 17:31:42 +0800
Subject: [PATCH] Merge branch '免布线基站' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站

---
 Src/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 6274914..ede7060 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -33,7 +33,7 @@
 #define NSH1 0x0001
 #define GP   0x0002
 #define FLASH_HARDWARE_VERSION_MAP		(uint32_t)0x08004F00    //硬件版本号和批次信息位置
-//#define DEBUG_MODE
+#define DEBUG_MODE
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -221,7 +221,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)|68;
+	g_com_map[VERSION] = (1<<8)|69;
     
     #ifdef DEBUG_MODE
    // g_com_map[GROUP_ID]=21;
@@ -230,7 +230,7 @@
     //	g_com_map[MAX_REPORT_ANC_NUM]=1;
     //	g_com_map[NOMOVESLEEP_TIME]=10;
     #endif
-    g_com_map[GROUP_ID]=3;
+//    g_com_map[GROUP_ID]=3;
     g_com_map[COM_INTERVAL] = 1000;
     active_flag = g_com_map[ACTIVE_INDEX];
     module_power = g_com_map[POWER];

--
Gitblit v1.9.3