Merge pull request #1225 from Ralim/ts80-accel

TS80P Accelerometer version detection again

source/Core/BSP/Miniware/configuration.h

@@ -210,6 +210,7 @@
 #define TEMP_NTC
 #define I2C_SOFT
 #define LIS_ORI_FLIP
+#define SC7_ORI_FLIP
 #define OLED_FLIP
 #endif
 

source/Core/Drivers/LIS2DH12.cpp

@@ -36,4 +36,14 @@ void LIS2DH12::getAxisReadings(int16_t &x, int16_t &y, int16_t &z) {
   z = sensorData[2];
 }
 
-bool LIS2DH12::detect() { return FRToSI2C::probe(LIS2DH_I2C_ADDRESS); }
+bool LIS2DH12::detect() {
+  if (!FRToSI2C::probe(LIS2DH_I2C_ADDRESS)) {
+    return false;
+  }
+  // Read chip id to ensure its not an address collision
+  uint8_t id = 0;
+  if (FRToSI2C::Mem_Read(LIS2DH_I2C_ADDRESS, LIS2DH_WHOAMI_REG, &id, 1)) {
+    return id == LIS2DH_WHOAMI_ID;
+  }
+  return false; // cant read ID
+}

source/Core/Drivers/LIS2DH12_defines.hpp

@@ -9,7 +9,8 @@
 #define LIS2DH12_DEFINES_HPP_
 
 #define LIS2DH_I2C_ADDRESS (25 << 1)
-
+#define LIS2DH_WHOAMI_REG  0x0F
+#define LIS2DH_WHOAMI_ID   (0b00110011)
 #define LIS_CTRL_REG1      0x20 | 0x80
 #define LIS_CTRL_REG2      0x21 | 0x80
 #define LIS_CTRL_REG3      0x22 | 0x80

source/Core/Drivers/SC7A20.cpp

@@ -9,15 +9,29 @@
 #include <SC7A20_defines.h>
 #include <array>
 
+uint8_t SC7A20::activeAddress;
+
 bool SC7A20::detect() {
   if (FRToSI2C::probe(SC7A20_ADDRESS)) {
     // Read chip id to ensure its not an address collision
     uint8_t id = 0;
     if (FRToSI2C::Mem_Read(SC7A20_ADDRESS, SC7A20_WHO_AMI_I, &id, 1)) {
-      return id == 0b00010001;
+      if (id == SC7A20_WHO_AM_I_VALUE) {
+        activeAddress = SC7A20_ADDRESS;
+        return true;
+      }
+    }
+  }
+  if (FRToSI2C::probe(SC7A20_ADDRESS2)) {
+    // Read chip id to ensure its not an address collision
+    uint8_t id = 0;
+    if (FRToSI2C::Mem_Read(SC7A20_ADDRESS2, SC7A20_WHO_AMI_I, &id, 1)) {
+      if (id == SC7A20_WHO_AM_I_VALUE) {
+        activeAddress = SC7A20_ADDRESS2;
+        return true;
+      }
     }
   }
-
   return false;
 }
 
@@ -50,7 +64,7 @@ bool SC7A20::initalize() {
   // Hysteresis is set to ~ 16 counts
   // Theta blocking is set to 0b10
 
-  return FRToSI2C::writeRegistersBulk(SC7A20_ADDRESS, i2c_registers, sizeof(i2c_registers) / sizeof(i2c_registers[0]));
+  return FRToSI2C::writeRegistersBulk(activeAddress, i2c_registers, sizeof(i2c_registers) / sizeof(i2c_registers[0]));
 }
 
 void SC7A20::getAxisReadings(int16_t &x, int16_t &y, int16_t &z) {

source/Core/Drivers/SC7A20.hpp

@@ -17,17 +17,26 @@ public:
   static bool initalize();
   // 1 = rh, 2,=lh, 8=flat
   static Orientation getOrientation() {
-    uint8_t val = ((FRToSI2C::I2C_RegisterRead(SC7A20_ADDRESS, SC7A20_INT2_SOURCE) >> 2) - 1);
-    if (val == 1)
-      return Orientation::ORIENTATION_LEFT_HAND;
-    else if (val == 4 || val == 0)
+    uint8_t val = ((FRToSI2C::I2C_RegisterRead(activeAddress, SC7A20_INT2_SOURCE) >> 2) - 1);
+    if (val == 1) {
+#ifdef SC7_ORI_FLIP
       return Orientation::ORIENTATION_RIGHT_HAND;
-    else
+#else
+      return Orientation::ORIENTATION_LEFT_HAND;
+#endif
+    } else if (val == 4 || val == 0) {
+#ifdef SC7_ORI_FLIP
+      return Orientation::ORIENTATION_LEFT_HAND;
+#else
+      return Orientation::ORIENTATION_RIGHT_HAND;
+#endif
+    } else
       return Orientation::ORIENTATION_FLAT;
   }
   static void getAxisReadings(int16_t &x, int16_t &y, int16_t &z);
 
 private:
+  static uint8_t activeAddress;
 };
 
 #endif /* CORE_DRIVERS_BMA223_HPP_ */

source/Core/Drivers/SC7A20_defines.h

@@ -1,5 +1,5 @@
 /*
- * BMA223_defines.h
+ * SC7A20_defines.h
  *
  *  Created on: 18 Sep. 2020
  *      Author: Ralim
@@ -9,6 +9,10 @@
 #define CORE_DRIVERS_SC7A20_DEFINES_H_
 
 #define SC7A20_ADDRESS 0x18 << 1
+// Sometimes the SC7A20 turns up programmed to impersonate the LIS2DH12
+#define SC7A20_ADDRESS2 (25 << 1)
+
+#define SC7A20_WHO_AM_I_VALUE (0b00010001)
 #define SC7A20_WHO_AMI_I      0x0F
 #define SC7A20_CTRL_REG1      0x20
 #define SC7A20_CTRL_REG2      0x21