From e1cb73d3e104a4dd0e52407cad1db5c177384f3a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 19 四月 2022 20:35:27 +0800
Subject: [PATCH] V2.48 修复注册慢bug

---
 源码/核心板/Src/application/global_param.h |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h"
index ed8dc4c..93385fc 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h"
@@ -20,9 +20,10 @@
 
 #define 	ALARM_DEV						0x9		//是哪个设备报警
 #define		ALARM_DISTANCE1			0xA		//小于多少距离报警
-#define   NEARSWITCH_DISTANCE_INDEX 0x0A
-#define		ALARM_DISTANCE2			0xB		//小于多少距离报警
+#define     NEARSWITCH_DISTANCE_INDEX 0x0A
+#define		MAXRANGDIST_INDEX			0xB		//小于多少距离报警
 #define		ALARM_DISTANCE3			0xC		//小于多少距离报警
+#define     OUTPUTALLNEARPOLLMSG    0xC
 #define		PAIR_ID							0xD		//小于多少距离报警
 #define		HEARTBEAT       		0xE
 
@@ -56,10 +57,20 @@
 
 #define 	ANC_FLAG							0x100
 
+
+
+
+///////////////////STATE MAP/////////////////
+#define SM_RESTART      1
+#define SM_UPDATE       2
+#define SM_UPDATEFAIL   3
+#define SM_BOOTFAIL     4
+#define SM_MAPERROR     5
+#define SM_REBOOT       6
 /*------------END Map Definition-------------------*/
 
 
-extern uint16_t g_com_map[COM_MAP_SIZE];
+extern uint16_t g_com_map[COM_MAP_SIZE],g_com_map2[COM_MAP_SIZE];
 
 extern uint32_t save_com_map_to_flash(void);
 extern void parameter_init(void);

--
Gitblit v1.9.3