Add list of sensors with long payload

Author: giulcioffi

src/BoschParser.cpp

@@ -1,5 +1,6 @@
 #include "BoschParser.h"
 #include "BoschSensortec.h"
+#include "sensors/SensorID.h"
 
 Stream* BoschParser::_debug = NULL;
 
@@ -38,7 +39,16 @@ void BoschParser::parseData(const struct bhy2_fifo_parse_data_info *fifoData, vo
     _debug->print("  ");
   }
 
-  if (sensorData.sensorId == 115 || sensorData.sensorId == 171) {
+  bool longSensor = false;
+
+  for (int i = 0; i < NUM_LONG_SENSOR; i++) {
+    if (LongSensorList[i].id == sensorData.sensorId) {
+      longSensor = true;
+      break;
+    }
+  }
+
+  if (longSensor) {
     sensortec.addLongSensorData(sensorData);
   } else {
     SensorDataPacket shortData;

src/sensors/SensorID.h

@@ -1,7 +1,8 @@
 #ifndef SENSOR_ID_H_
 #define SENSOR_ID_H_
 
-#define NUM_SUPPORTEND_SENSOR           77
+#define NUM_SUPPORTEND_SENSOR           79
+#define NUM_LONG_SENSOR                 2
 
 enum SensorID {
   SENSOR_ID_ACC_PASS                 = 1,   /* Accelerometer passthrough */
@@ -99,7 +100,8 @@ enum SensorPayload {
   P40BITUNSIGNED = 10,
   PEVENT = 11,
   ACTIVITY = 12,
-  DEBUG_DATA = 13
+  DEBUG_DATA = 13,
+  BSEC = 14
 };
 
 struct SensorStruct
@@ -109,6 +111,11 @@ struct SensorStruct
 	float scaleFactor;
 };
 
+static SensorStruct LongSensorList[2] = {
+  {SENSOR_ID_BSEC,                BSEC,               1.0},
+  {SENSOR_ID_BSEC_LEGACY,         BSEC,               1.0}
+};
+
 static SensorStruct SensorList[NUM_SUPPORTEND_SENSOR] = {
   {SENSOR_ID_ACC_PASS,            VECTOR3D,           1.0},
   {SENSOR_ID_ACC_RAW,             VECTOR3D,           1.0},
@@ -158,6 +165,7 @@ static SensorStruct SensorList[NUM_SUPPORTEND_SENSOR] = {
   {SENSOR_ID_GYRO_BIAS_WU,        VECTOR3D,           1.0},
   {SENSOR_ID_MAG_BIAS_WU,         VECTOR3D,           1.0},
   {SENSOR_ID_STD_WU,              PEVENT,             1.0},
+  {SENSOR_ID_BSEC,                BSEC,               1.0},
   {SENSOR_ID_TEMP,                P16BITSIGNED,       0.01},
   {SENSOR_ID_BARO,                P24BITUNSIGNED,     0.0078},
   {SENSOR_ID_HUM,                 P8BITUNISIGNED,     1.0},
@@ -180,6 +188,7 @@ static SensorStruct SensorList[NUM_SUPPORTEND_SENSOR] = {
   {SENSOR_ID_PROX,                P8BITUNISIGNED,     1.0},
   {SENSOR_ID_LIGHT_WU,            P16BITUNSIGNED,     46.296},
   {SENSOR_ID_PROX_WU,             P8BITUNISIGNED,     1.0},
+  {SENSOR_ID_BSEC_LEGACY,         BSEC,               1.0},
   {DEBUG_DATA_EVENT,              DEBUG_DATA,         1.0},
   {TIMESTAMP_SMALL_DELTA,         P8BITUNISIGNED,     0.000015625},
   {TIMESTAMP_SMALL_DELTA_WU,      P8BITUNISIGNED,     0.000015625},

src/sensors/SensorManager.cpp

@@ -10,16 +10,26 @@ void SensorManager::process(SensorLongDataPacket &data)
 {
   for (int i = 0; i < _sensorsLen; i++) {
     if (data.sensorId == _sensors[i]->id()) {
-      if (_sensors[i]->id() == 115 || _sensors[i]->id() == 171) {
-        // BSEC sensor is the only one with long payload
+
+      bool longSensor = false;
+
+      for (int i = 0; i < NUM_LONG_SENSOR; i++) {
+        if (LongSensorList[i].id == data.sensorId) {
+          longSensor = true;
+          break;
+        }
+      }
+
+      if (longSensor) {
         _sensors[i]->setData(data);
       } else {
         // All the other sensors have short payloads
         SensorDataPacket shortData;
         memcpy(&shortData, &data, sizeof(SensorDataPacket));
         _sensors[i]->setData(shortData);
       }
-      return; // can more sensor objects use the same sensor id?
+
+      return;
     }
   }
 }