From 863f8f72d0726c104db21799a8d642f4e04ac93f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 11 十一月 2021 17:40:09 +0800
Subject: [PATCH] Merge branch '定位-临近' into 定位-临近-物资
---
Drivers/ExternlDrivers/lis3dh_driver.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Drivers/ExternlDrivers/lis3dh_driver.c b/Drivers/ExternlDrivers/lis3dh_driver.c
index ccf5b24..efb87ff 100644
--- a/Drivers/ExternlDrivers/lis3dh_driver.c
+++ b/Drivers/ExternlDrivers/lis3dh_driver.c
@@ -89,9 +89,16 @@
LIS3DH_WriteReg(LIS3DH_CTRL_REG3, 0x40); /* CTRL_REG3(22h): 0x80 ???????INT_1 INT_2 */
LIS3DH_WriteReg(LIS3DH_CTRL_REG4, 0x08); /* CTRL_REG4(23h): ???,????,???+/-2G,?????? */
LIS3DH_WriteReg(LIS3DH_INT1_CFG, 0xaa); /* INT1_CFG(30h): ??,6D X/Y/Z???????? */
- g_com_map[IMU_THRES]=1;
+ if(g_com_map[IMU_THRES]>20||g_com_map[IMU_THRES] == 0)
+ {
+ g_com_map[IMU_THRES] = 1;
+ }
+ if(g_com_map[IMU_DUARTION]>20||g_com_map[IMU_DUARTION]==0)
+ {
+ g_com_map[IMU_DUARTION] = 2;
+ }
LIS3DH_WriteReg(LIS3DH_INT1_THS, (uint8_t)g_com_map[IMU_THRES]); /* INT1_THS(32h): ?????? 0x10: 16*2(FS) 0x20: 32*16(FS) */
- LIS3DH_WriteReg(LIS3DH_INT1_DURATION, 0x02); /* INT1_DURATION(33h): 1LSB=1/ODR ??ODR=100HZ ??1LSB=10ms ???? 1s,??100->0x64 */
+ LIS3DH_WriteReg(LIS3DH_INT1_DURATION, (uint8_t)g_com_map[IMU_DUARTION]); /* INT1_DURATION(33h): 1LSB=1/ODR ??ODR=100HZ ??1LSB=10ms ???? 1s,??100->0x64 */
/* Start sensor */
//LIS3DH_WriteReg(0x20, 0x5f); /* CTRL_REG1(20h): Start sensor at ODR 100Hz Low-power mode */
// Read ID
--
Gitblit v1.9.3