From 13fa2c6eaab3b3ee51d447d2549f6e09c821dc60 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 20 十二月 2021 12:14:04 +0800
Subject: [PATCH] 1

---
 Src/main.c |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index a583eaa..bd5b549 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -281,7 +281,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] = 0x0229;
+	g_com_map[VERSION] = 0x022c;
     
 //	g_com_map[DEV_ID]=0x7;
 #ifdef DEBUG_MODE
@@ -307,13 +307,14 @@
 	}
 //g_com_map[HEIGHTOFFEST_INDEX]=g_com_map[MAX_REPORT_ANC_NUM];
 	module_power = g_com_map[POWER];
+	module_power = 67;
 	imu_enable=g_com_map[IMU_ENABLE];
 	motor_enable=g_com_map[MOTOR_ENABLE];
 	
 	group_id=g_com_map[GROUP_ID];
 	dev_id = g_com_map[DEV_ID];
 	//slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
-		slottime = 5;
+	slottime = 5;
 	max_slotpos=g_com_map[COM_INTERVAL]/slottime;
 	tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;	
 	slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
@@ -352,14 +353,15 @@
 
 void HardWareTypeDiffConfig(void)
 {
-GPIO_InitTypeDef GPIO_InitStruct = {0};
-hardware_type=2;
-if(hardware_type == 0)
-    hardware_type = 1;
+	GPIO_InitTypeDef GPIO_InitStruct = {0};
+	//if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
+	{
+			g_com_map[MOTORBEEPER_INDEX] = 1;
+	}
+	hardware_type	= g_com_map[MOTORBEEPER_INDEX];
 	switch(hardware_type)
 		{
-        case 1:
-	  
+        case 1:	  
             HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
             GPIO_InitStruct.Pin = MOTOR_Pin;
             GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@@ -419,6 +421,15 @@
   BarInit();
 	Dw1000_Init();
 	Dw1000_App_Init();
+	//Spi_ChangePrescaler(SPIx_PRESCALER_SLOW);	
+	
+		dwt_configcontinuousframemode(124800);
+		dwt_writetxfctrl(13, 0);
+	//	dwt_starttx(DWT_START_TX_IMMEDIATE);
+		while(1)
+	{		
+			IdleTask();	
+	}
 	HardWareTypeDiffConfig();
 	dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
 	dwt_entersleep();

--
Gitblit v1.9.3