From cea7f6ca7f65b036892965a6e0ffd22d5afcd190 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 01 三月 2024 09:34:54 +0800
Subject: [PATCH] 功能测试代码开发完成
---
Src/main.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 0c0053d..a09a0d1 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -35,11 +35,13 @@
#include "stdio.h"
#include "delay.h"
#include "lora.h"
+#include "dps310.h"
#include "dw_mbx_anc.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 -----------------------------------------------------------*/
@@ -245,7 +247,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] = (6<<8)|0;
+ g_com_map[VERSION] = (1<<8)|0;
// testprogram();
// g_com_map[DEV_ID]=0x6777;
#ifdef DEBUG_MODE
@@ -262,7 +264,7 @@
if(g_com_map[COM_INTERVAL]<1000)
{g_com_map[COM_INTERVAL] = 1000;}
active_flag = g_com_map[ACTIVE_INDEX];
- g_com_map[POWER]=0;
+// g_com_map[POWER]=0;
module_power = g_com_map[POWER];
g_com_map[IMU_ENABLE] = 0;
imu_enable=g_com_map[IMU_ENABLE];
@@ -456,6 +458,9 @@
MbxInit();
// SwitchLoraSettingstest(UWB_CHANNEL_FRQ,UWB_CHANNEL_SF);
Delay_Ms(10);
+#ifdef _USE_BAR_
+ BarInit();
+#endif
// HAL_ADC_Start_DMA(&hadc,(uint32_t*)&AD_value,sizeof(AD_value));
/* USER CODE END 2 */
--
Gitblit v1.9.3