From ee0385e380984bf1141a31061ba3c9802b9817e2 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Fri, 15 Jan 2021 21:26:39 +1100
Subject: [PATCH] Check chip ID on the BMA

---
 workspace/TS100/Core/Drivers/BMA223.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/workspace/TS100/Core/Drivers/BMA223.cpp b/workspace/TS100/Core/Drivers/BMA223.cpp
index ac049b07..4da4ae76 100755
--- a/workspace/TS100/Core/Drivers/BMA223.cpp
+++ b/workspace/TS100/Core/Drivers/BMA223.cpp
@@ -9,7 +9,15 @@
 #include <array>
 
 bool BMA223::detect() {
-	return FRToSI2C::probe(BMA223_ADDRESS);
+	if (FRToSI2C::probe(BMA223_ADDRESS)) {
+		//Read chip id to ensure its not an address collision
+		uint8_t id = 0;
+		if (FRToSI2C::Mem_Read(BMA223_ADDRESS, BMA223_BGW_CHIPID, &id, 1)) {
+			return id == 0b11111000;
+		}
+	}
+
+	return false;
 }
 
 static const FRToSI2C::I2C_REG i2c_registers[] = { //