[nRF52] add some logic to distinguish M1, M3 and M6

Author: lyusupov

software/firmware/source/SoftRF/SoftRF.h

@@ -282,6 +282,7 @@ enum
 	ACC_BMA423,
 	ACC_ADXL362,
 	ACC_QMA6100P,
+	ACC_SC7A20H,
 	IMU_MPU6886,
 	IMU_MPU9250,
 	IMU_BNO080,

software/firmware/source/SoftRF/src/platform/iomap/Elecrow_ThinkNode_M3.h

@@ -59,6 +59,6 @@
 #define SOC_GPIO_PIN_M3_VUSB_SEN  _PINNUM(0, 31) // P0.31
 #define SOC_GPIO_PIN_M3_VGPS_SEN  SOC_UNUSED_PIN // TBD
 
-/* Sensors (ACC + AHT10) */
+/* Sensors (SC7A20H + AHT20) */
 #define SOC_GPIO_PIN_M3_ACC_EN    _PINNUM(0,  2) // P0.02 active HIGH ?
 #define SOC_GPIO_PIN_M3_TEMP_EN   _PINNUM(0,  3) // P0.03 active HIGH

software/firmware/source/SoftRF/src/platform/nRF52.cpp

@@ -925,6 +925,34 @@ static void nRF52_setup()
 #endif /* EXCLUDE_IMU */
   }
 
+  if (nRF52_board == NRF52_ELECROW_TN_M1) { /* "ELECROWBOOT" */
+    pinMode(SOC_GPIO_PIN_M3_TEMP_EN, INPUT_PULLUP);
+    delay(5);
+
+#if !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_ZEPHYR)
+    Wire.setPins(SOC_GPIO_PIN_M3_SDA, SOC_GPIO_PIN_M3_SCL);
+#endif /* ARDUINO_ARCH_MBED */
+    Wire.begin();
+    Wire.beginTransmission(AHT20_ADDRESS);
+    if (Wire.endTransmission() == 0) { nRF52_board = NRF52_ELECROW_TN_M3; }
+    Wire.end();
+    pinMode(SOC_GPIO_PIN_M3_TEMP_EN, INPUT);
+  }
+
+  if (nRF52_board == NRF52_ELECROW_TN_M1) { /* "ELECROWBOOT" */
+    pinMode(SOC_GPIO_PIN_IO_M6_PWR, INPUT_PULLUP);
+    delay(5);
+
+#if !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_ZEPHYR)
+    Wire.setPins(SOC_GPIO_PIN_M6_SDA, SOC_GPIO_PIN_M6_SCL);
+#endif /* ARDUINO_ARCH_MBED */
+    Wire.begin();
+    Wire.beginTransmission(PCF8563_SLAVE_ADDRESS);
+    if (Wire.endTransmission() == 0) { nRF52_board = NRF52_ELECROW_TN_M6; }
+    Wire.end();
+    pinMode(SOC_GPIO_PIN_IO_M6_PWR, INPUT);
+  }
+
 #if !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_ZEPHYR)
   switch (nRF52_board)
   {
@@ -1662,6 +1690,10 @@ static void nRF52_setup()
         }
         break;
 
+      case NRF52_ELECROW_TN_M3:
+        /* TBD */
+        break;
+
       default:
         break;
     }
@@ -2249,7 +2281,7 @@ static void nRF52_loop()
     IMU_Time_Marker = millis();
   }
 
-#if !defined(EXCLUDE_BHI260)
+#if 0 /* TODO */ // !defined(EXCLUDE_BHI260)
   if (hw_info.imu == IMU_BHI260AP &&
       (millis() - IMU_Time_Marker) > (IMU_UPDATE_INTERVAL / 10)) {
     // Update sensor fifo

software/firmware/source/SoftRF/src/platform/nRF52.h

@@ -135,7 +135,9 @@ struct rst_info {
 #define BME280_ADDRESS        (0x77)
 #define BHI260AP_ADDRESS_L    (0x28)
 #define BHI260AP_ADDRESS_H    (0x29)
-#define AHT10_ADDRESS         (0x38)
+#define AHT20_ADDRESS         (0x38)
+#define SC7A20H_ADDRESS_L     (0x18)
+#define SC7A20H_ADDRESS_H     (0x19)
 
 #if defined(ARDUINO_ARCH_MBED) || defined(ARDUINO_ARCH_ZEPHYR)
 #define PCF8563_SLAVE_ADDRESS (0x51)
@@ -342,7 +344,7 @@ struct rst_info {
 #endif /* ARDUINO_ARCH_MBED */
 
 //#define EXCLUDE_BHI260
-//#define USE_BHI260_RAM_FW
+#define USE_BHI260_RAM_FW
 
 /* T-Ultima */
 #define EXCLUDE_PMU

software/firmware/source/SoftRF/src/ui/IMU_EPD.cpp

@@ -30,7 +30,8 @@ static const char G_load_text[] = "G-load";
 
 void EPD_imu_setup()
 {
-  if (hw_info.imu != IMU_NONE) {
+  if (hw_info.imu != IMU_NONE &&
+      hw_info.imu != IMU_BHI260AP /* TODO */) {
     EPD_pages_mask |= (1 << VIEW_MODE_IMU);
   }
 }