From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误
---
keil/include/drivers/lis3dh_driver.c | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/keil/include/drivers/lis3dh_driver.c b/keil/include/drivers/lis3dh_driver.c
index 7a4a0fb..e01b3b8 100644
--- a/keil/include/drivers/lis3dh_driver.c
+++ b/keil/include/drivers/lis3dh_driver.c
@@ -214,18 +214,37 @@
void Accelerometer_Init()
{
- LIS3DH_GetWHO_AM_I(&lisidtemp);
- lisid=(uint16_t)lisidtemp;
+// LIS3DH_GetWHO_AM_I(&lisidtemp);
+// lisid=(uint16_t)lisidtemp;
- if(lisid == 0x33)
- {
- LIS3DH_Data_Init();
- }
- else
- {
- g_com_map[IMU_ENABLE]=0;
- }
-
+// if(lisid == 0x33)
+// {
+// LIS3DH_Data_Init();
+// }
+// else
+// {
+// g_com_map[IMU_ENABLE]=0;
+// }
+ lisid = mir3da_ReadOneByte(REG_CHIP_ID);
+
+ if(lisid == 0x13)
+ {
+ mir3da_init();
+ }
+ else
+ {
+ LIS3DH_GetWHO_AM_I(&lisidtemp);
+ lisid=(uint16_t)lisidtemp;
+
+ if(lisid == 0x33)
+ {
+ LIS3DH_Data_Init();
+ }
+ else
+ {
+ g_com_map[IMU_ENABLE]=0;
+ }
+ }
}
void mir3da_init()
--
Gitblit v1.9.3