From c8a99f8293e1ae335501390de5bab05db487a0f9 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 29 二月 2024 18:17:59 +0800
Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora
---
Src/main.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 0bbff10..0df6920 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
+
/* 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
@@ -256,7 +258,7 @@
// g_com_map[NOMOVESLEEP_TIME]=10;
#endif
g_com_map[ACTIVE_INDEX] = 1;
- g_com_map[GROUP_ID]=5;
+ g_com_map[GROUP_ID]=0;
g_com_map[UWBPOLLTIME_MS_IDX] = 520;
g_com_map[COM_INTERVAL] = 1000;
if(g_com_map[COM_INTERVAL]<1000)
@@ -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