From 3bb0e44ef7d12ddc84e631456f4b6eab7112df1c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 08 十一月 2023 14:39:59 +0800
Subject: [PATCH] 版本v1.0  加入气压计驱动  并且放到uwb里传给urt

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

diff --git a/Src/main.c b/Src/main.c
index a5ffadf..86ce769 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -30,10 +30,11 @@
 #include "TrackingDiff.h"
 #include "dw_app.h"
 #include "Flash.h"
+
 #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 +222,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)|0;
     
     #ifdef DEBUG_MODE
    // g_com_map[GROUP_ID]=21;
@@ -230,7 +231,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];
@@ -339,6 +340,8 @@
     HAL_ADC_DeInit(&hadc);
     HAL_ADCEx_DisableVREFINT();
 }
+
+
 /* USER CODE END 0 */
 
 /**
@@ -386,11 +389,13 @@
     dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
     dwt_entersleep();
     DW_DISABLE;
+     BarInit();
      if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
     {
      Error_Handler();
     }
     HAL_Delay(2000);
+    
 //	mcu_sleep();
 	//LED0_BLINK;		
 //	SystemPower_Config();

--
Gitblit v1.9.3