From cfa98f1edb2bb2d95b7323f7c5e7637f91aa4d66 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 29 四月 2021 10:13:23 +0800
Subject: [PATCH] 青岛第一次测试,有bug

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

diff --git a/Src/main.c b/Src/main.c
index 5bf4ea3..3b67a45 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -31,7 +31,7 @@
 
 #define NSH1 0x0001
 #define GP   0x0002
-//#define DEBUG_MODE
+#define DEBUG_MODE
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -310,13 +310,13 @@
 	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] = 0x0218;
+	g_com_map[VERSION] = 0x0219;
 //	g_com_map[DEV_ID]=0x7;
 #ifdef DEBUG_MODE
 //	g_com_map[DEV_ROLE]=1;
-		g_com_map[DEV_ID]=0x4008;
+		g_com_map[DEV_ID]=0x4009;
     g_com_map[ACTIVE_INDEX]=1;
-//	g_com_map[COM_INTERVAL]=100;
+	g_com_map[COM_INTERVAL]=50;
 //	g_com_map[MAX_REPORT_ANC_NUM]=1;
 //	g_com_map[NOMOVESLEEP_TIME]=10;
 //			g_com_map[IMU_ENABLE]=0;
@@ -382,7 +382,7 @@
 GPIO_InitTypeDef GPIO_InitStruct = {0};
 //hardware_type=2;
 if(hardware_type == 0)
-    hardware_type = 1;
+    hardware_type = 2;
 	switch(hardware_type)
 		{
         case 1:
@@ -396,7 +396,7 @@
 			break;
 		case 2:
 			MX_TIM2_Init();
-		//BarInit();
+            BarInit();
 			break;
 		}
 }
@@ -444,6 +444,7 @@
 	LED_LG_ON;
 	Program_Init();
 	LIS3DH_Data_Init();	
+ //   BarInit();
 	Dw1000_Init();
 	Dw1000_App_Init();
 	HardWareTypeDiffConfig();
@@ -455,6 +456,7 @@
 	{
 	 Error_Handler();
 	}
+    
 //	HAL_Delay(2000);
 //	mcu_sleep();
 	//LED0_BLINK;		
@@ -1024,10 +1026,12 @@
 	}else{
 		gotosleep_flag=0;
 	}
+#ifndef DEBUG_MODE    
 	if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
 	{
 		mcu_sleep();
 	}
+#endif
 }
 /* USER CODE END 4 */
 

--
Gitblit v1.9.3