From 902f38238daefe5b6acb13ca86d73de9ea4dcd8d Mon Sep 17 00:00:00 2001
From: Gareth Coleman <30833824+garethhcoleman@users.noreply.github.com>
Date: Fri, 5 Apr 2024 13:20:22 +0100
Subject: [PATCH] This change to the I2C Scan is to distinguish between two
 devices (#3554)

sharing the same I2C address, the QMI8658 IMU and BQ24295 PMU.
---
 src/detect/ScanI2C.h          |  1 +
 src/detect/ScanI2CTwoWire.cpp | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h
index 66e6839823..ecb6db225a 100644
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -38,6 +38,7 @@ class ScanI2C
         MPU6050,
         LIS3DH,
         BMA423,
+        BQ24295,
 #ifdef HAS_NCP5623
         NCP5623,
 #endif
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index 146daa3dcf..ea6e692dfb 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -293,7 +293,18 @@ void ScanI2CTwoWire::scanPort(I2CPort port)
                 SCAN_SIMPLE_CASE(LPS22HB_ADDR, LPS22HB, "LPS22HB sensor found\n")
 
                 SCAN_SIMPLE_CASE(QMC6310_ADDR, QMC6310, "QMC6310 Highrate 3-Axis magnetic sensor found\n")
-                SCAN_SIMPLE_CASE(QMI8658_ADDR, QMI8658, "QMI8658 Highrate 6-Axis inertial measurement sensor found\n")
+
+            case QMI8658_ADDR:
+                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0A), 1); // get ID
+                if (registerValue == 0xC0) {
+                    type = BQ24295;
+                    LOG_INFO("BQ24295 PMU found\n");
+                } else {
+                    type = QMI8658;
+                    LOG_INFO("QMI8658 Highrate 6-Axis inertial measurement sensor found\n");
+                }
+                break;
+
                 SCAN_SIMPLE_CASE(QMC5883L_ADDR, QMC5883L, "QMC5883L Highrate 3-Axis magnetic sensor found\n")
 
                 SCAN_SIMPLE_CASE(PMSA0031_ADDR, PMSA0031, "PMSA0031 air quality sensor found\n")