From 2cf1ce56d99b68d336951a52d9399021571ed2d7 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 07 二月 2023 16:25:57 +0800
Subject: [PATCH] V2.147 修改加速计驱动，适配物资V5和多功能标签。
---
Src/main.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index f81503d..a808ad8 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] = 0x022c;
+ g_com_map[VERSION] = 0x0293;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -355,7 +355,7 @@
GPIO_InitTypeDef GPIO_InitStruct = {0};
//if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
{
- g_com_map[MOTORBEEPER_INDEX] = 1;
+ g_com_map[MOTORBEEPER_INDEX] = 2;
}
hardware_type = g_com_map[MOTORBEEPER_INDEX];
switch(hardware_type)
@@ -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,8 @@
{
Error_Handler();
}
-
+ // LIS3DH_Check();
+
// HAL_Delay(2000);
// mcu_sleep();
//LED0_BLINK;
@@ -903,6 +904,7 @@
}
void mcu_sleep(void)
{
+ Accelerometer_Init();
HAL_LPTIM_DeInit(&hlptim1);
GPIO_InitTypeDef GPIO_InitStruct = {0};
GPIO_InitStruct.Pin = GPIO_PIN_All;
@@ -912,6 +914,8 @@
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);
/*Clear all related wakeup flags*/
--
Gitblit v1.9.3