From a165f74b59eac3a5f62aa638eb4d13f64e061d46 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 24 十月 2022 17:43:04 +0800
Subject: [PATCH] 2.55 修改标签震动蜂鸣配置到临近基站ID1中
---
Src/main.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 5740eb0..a93dbe8 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -281,14 +281,14 @@
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] = 0x022e;
+ g_com_map[VERSION] = (2<<8)|55;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
-// g_com_map[DEV_ID]=0x4009;
+ // g_com_map[DEV_ID]=0x4009;
// g_com_map[ACTIVE_INDEX]=1;
- g_com_map[COM_INTERVAL]=50;
+// 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;
@@ -353,7 +353,7 @@
void HardWareTypeDiffConfig(void)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
- //if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
+ if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
{
g_com_map[MOTORBEEPER_INDEX] = 2;
}
@@ -416,8 +416,8 @@
/* USER CODE BEGIN 2 */
LED_LG_ON;
Program_Init();
- LIS3DH_Data_Init();
- BarInit();
+ Accelerometer_Init();
+ BarInit();
Dw1000_Init();
Dw1000_App_Init();
HardWareTypeDiffConfig();
@@ -429,7 +429,7 @@
{
Error_Handler();
}
- LIS3DH_Check();
+
// HAL_Delay(2000);
// mcu_sleep();
@@ -913,7 +913,7 @@
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
- LIS3DH_Check();
+
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
HAL_PWR_DisableWakeUpPin(PWR_WAKEUP_PIN1);
@@ -938,7 +938,7 @@
nomove_count+=1/(float)tag_frequency;
if(motor_keeptime>0)
{
- motor_keeptime-=1/(float)tag_frequency;
+ motor_keeptime-=1/(float)tag_frequency;
}
if(motor_keeptime<0)
{motor_keeptime = 0;}
--
Gitblit v1.9.3