Split sensor code out into their own files

doudar · Mar 9, 2021 · f19752a · f19752a
1 parent fc08da9
commit f19752a
Show file tree

Hide file tree

Showing 15 changed files with 550 additions and 467 deletions.
diff --git a/include/BLE_Common.h b/include/BLE_Common.h
@@ -200,182 +200,4 @@ class SpinBLEClient
     };
 };
 
-extern SpinBLEClient spinBLEClient;
-
-class SensorData
-{
-public:
-    SensorData(String id) : id(id){};
-
-    String getId();
-    virtual bool hasHeartRate() = 0;
-    virtual bool hasCadence() = 0;
-    virtual bool hasPower() = 0;
-    virtual bool hasSpeed() = 0;
-    virtual int getHeartRate() = 0;
-    virtual float getCadence() = 0;
-    virtual int getPower() = 0;
-    virtual float getSpeed() = 0;
-    virtual void decode(uint8_t *data, size_t length) = 0;
-
-protected:
-    String id;
-};
-
-class KnownDevice
-{
-public:
-    KnownDevice(NimBLEUUID uuid, std::shared_ptr<SensorData> sensorData): uuid(uuid), sensorData(sensorData){};
-    NimBLEUUID getUUID();
-    std::shared_ptr<SensorData> decode(uint8_t *data, size_t length);
-
-private:
-    NimBLEUUID uuid;
-    std::shared_ptr<SensorData> sensorData;
-};
-
-class SensorDataFactory
-{
-public:
-    SensorDataFactory(){};
-
-    std::shared_ptr<SensorData> getSensorData(BLERemoteCharacteristic *characteristic, uint8_t *data, size_t length);
-
-private:
-    std::vector<KnownDevice*> knownDevices;
-    static std::shared_ptr<SensorData> NULL_SENSOR_DATA;
-};
-
-class NullData : public SensorData
-{
-public:
-    NullData() : SensorData("Null"){};
-
-    virtual bool hasHeartRate();
-    virtual bool hasCadence();
-    virtual bool hasPower();
-    virtual bool hasSpeed();
-    virtual int getHeartRate();
-    virtual float getCadence();
-    virtual int getPower();
-    virtual float getSpeed();
-    virtual void decode(uint8_t *data, size_t length);
-};
-
-class HeartRateData : public SensorData
-{
-public:
-    HeartRateData() : SensorData("HRM"){};
-
-    virtual bool hasHeartRate();
-    virtual bool hasCadence();
-    virtual bool hasPower();
-    virtual bool hasSpeed();
-    virtual int getHeartRate();
-    virtual float getCadence();
-    virtual int getPower();
-    virtual float getSpeed();
-    virtual void decode(uint8_t *data, size_t length);
-
-private:
-    int heartrate;
-};
-
-class CyclePowerData : public SensorData
-{
-public:
-    CyclePowerData() : SensorData("CPS"){};
-
-    virtual bool hasHeartRate();
-    virtual bool hasCadence();
-    virtual bool hasPower();
-    virtual bool hasSpeed();
-    virtual int getHeartRate();
-    virtual float getCadence();
-    virtual int getPower();
-    virtual float getSpeed();
-    virtual void decode(uint8_t *data, size_t length);
-
-private:
-    int power;
-    float cadence;
-    float crankRev = 0;
-    float lastCrankRev = 0;
-    float lastCrankEventTime = 0;
-    float crankEventTime = 0;
-    uint8_t missedReadingCount = 0;
-};
-
-class FlywheelData : public SensorData
-{
-public:
-    FlywheelData() : SensorData("FLYW"){};
-
-    virtual bool hasHeartRate();
-    virtual bool hasCadence();
-    virtual bool hasPower();
-    virtual bool hasSpeed();
-    virtual int getHeartRate();
-    virtual float getCadence();
-    virtual int getPower();
-    virtual float getSpeed();
-    virtual void decode(uint8_t *data, size_t length);
-
-private:
-    bool hasData = false;
-    float cadence;
-    int power;
-};
-
-class FitnessMachineIndoorBikeData : public SensorData
-{
-public:
-    FitnessMachineIndoorBikeData() : SensorData("FTMS"){};
-
-    enum Types : uint8_t
-    {
-        InstantaneousSpeed = 0,
-        AverageSpeed = 1,
-        InstantaneousCadence = 2,
-        AverageCadence = 3,
-        TotalDistance = 4,
-        ResistanceLevel = 5,
-        InstantaneousPower = 6,
-        AveragePower = 7,
-        TotalEnergy = 8,
-        EnergyPerHour = 9,
-        EnergyPerMinute = 10,
-        HeartRate = 11,
-        MetabolicEquivalent = 12,
-        ElapsedTime = 13,
-        RemainingTime = 14
-    };
-
-    static constexpr uint8_t FieldCount = Types::RemainingTime + 1;
-
-    virtual bool hasHeartRate();
-    virtual bool hasCadence();
-    virtual bool hasPower();
-    virtual bool hasSpeed();
-    virtual int getHeartRate();
-    virtual float getCadence();
-    virtual int getPower();
-    virtual float getSpeed();
-    virtual void decode(uint8_t *data, size_t length);
-
-private:
-    double_t values[FieldCount];
-
-    static uint8_t const flagBitIndices[];
-    static uint8_t const flagEnabledValues[];
-    static size_t const byteSizes[];
-    static uint8_t const signedFlags[];
-    static double_t const resolutions[];
-    static int convert(int value, size_t length, uint8_t isSigned);
-};
-
-/******************CPS***************************/
-void BLE_CPSDecode(BLERemoteCharacteristic *pBLERemoteCharacteristic);
-
-/******************FTMS**************************/
-void BLE_FTMSDecode(BLERemoteCharacteristic *pBLERemoteCharacteristic);
+extern SpinBLEClient spinBLEClient;
diff --git a/include/sensors/CyclePowerData.h b/include/sensors/CyclePowerData.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Arduino.h>
+#include "SensorData.h"
+
+class CyclePowerData : public SensorData
+{
+public:
+    CyclePowerData() : SensorData("CPS"){};
+
+    bool hasHeartRate();
+    bool hasCadence();
+    bool hasPower();
+    bool hasSpeed();
+    int getHeartRate();
+    float getCadence();
+    int getPower();
+    float getSpeed();
+    void decode(uint8_t *data, size_t length);
+
+private:
+    int power;
+    float cadence;
+    float crankRev = 0;
+    float lastCrankRev = 0;
+    float lastCrankEventTime = 0;
+    float crankEventTime = 0;
+    uint8_t missedReadingCount = 0;
+};
diff --git a/include/sensors/FitnessMachineIndoorBikeData.h b/include/sensors/FitnessMachineIndoorBikeData.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include <Arduino.h>
+#include "SensorData.h"
+
+class FitnessMachineIndoorBikeData : public SensorData
+{
+public:
+    FitnessMachineIndoorBikeData() : SensorData("FTMS"){};
+
+    bool hasHeartRate();
+    bool hasCadence();
+    bool hasPower();
+    bool hasSpeed();
+    int getHeartRate();
+    float getCadence();
+    int getPower();
+    float getSpeed();
+    void decode(uint8_t *data, size_t length);
+
+    enum Types : uint8_t
+    {
+        InstantaneousSpeed = 0,
+        AverageSpeed = 1,
+        InstantaneousCadence = 2,
+        AverageCadence = 3,
+        TotalDistance = 4,
+        ResistanceLevel = 5,
+        InstantaneousPower = 6,
+        AveragePower = 7,
+        TotalEnergy = 8,
+        EnergyPerHour = 9,
+        EnergyPerMinute = 10,
+        HeartRate = 11,
+        MetabolicEquivalent = 12,
+        ElapsedTime = 13,
+        RemainingTime = 14
+    };
+
+    static constexpr uint8_t FieldCount = Types::RemainingTime + 1;
+
+private:
+    double_t values[FieldCount];
+
+    // See: https://github.com/oesmith/gatt-xml/blob/master/org.bluetooth.characteristic.indoor_bike_data.xml
+    static uint8_t const flagBitIndices[];
+    static uint8_t const flagEnabledValues[];
+    static size_t const byteSizes[];
+    static uint8_t const signedFlags[];
+    static double_t const resolutions[];
+
+    static int convert(int value, size_t length, uint8_t isSigned);
+};
diff --git a/include/sensors/FlywheelData.h b/include/sensors/FlywheelData.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "SensorData.h"
+
+class FlywheelData : public SensorData
+{
+public:
+    FlywheelData() : SensorData("FLYW"){};
+
+    bool hasHeartRate();
+    bool hasCadence();
+    bool hasPower();
+    bool hasSpeed();
+    int getHeartRate();
+    float getCadence();
+    int getPower();
+    float getSpeed();
+    void decode(uint8_t *data, size_t length);
+
+private:
+    bool hasData = false;
+    float cadence;
+    int power;
+};
diff --git a/include/sensors/HeartRateData.h b/include/sensors/HeartRateData.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "SensorData.h"
+
+class HeartRateData : public SensorData
+{
+public:
+    HeartRateData() : SensorData("HRM"){};
+
+    bool hasHeartRate();
+    bool hasCadence();
+    bool hasPower();
+    bool hasSpeed();
+    int getHeartRate();
+    float getCadence();
+    int getPower();
+    float getSpeed();
+    void decode(uint8_t *data, size_t length);
+
+private:
+    int heartrate;
+};
diff --git a/include/sensors/SensorData.h b/include/sensors/SensorData.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <Arduino.h>
+
+class SensorData
+{
+public:
+    SensorData(String id) : id(id){};
+
+    String getId();
+    virtual bool hasHeartRate() = 0;
+    virtual bool hasCadence() = 0;
+    virtual bool hasPower() = 0;
+    virtual bool hasSpeed() = 0;
+    virtual int getHeartRate() = 0;
+    virtual float getCadence() = 0;
+    virtual int getPower() = 0;
+    virtual float getSpeed() = 0;
+    virtual void decode(uint8_t *data, size_t length) = 0;
+
+private:
+    String id;
+};
diff --git a/include/sensors/SensorDataFactory.h b/include/sensors/SensorDataFactory.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <memory>
+#include <Arduino.h>
+#include <NimBLEDevice.h>
+#include "SensorData.h"
+#include "CyclePowerData.h"
+#include "FlywheelData.h"
+#include "FitnessMachineIndoorBikeData.h"
+#include "HeartRateData.h"
+
+class SensorDataFactory
+{
+public:
+    SensorDataFactory(){};
+
+    std::shared_ptr<SensorData> getSensorData(BLERemoteCharacteristic *characteristic, uint8_t *data, size_t length);
+
+private:
+    class KnownDevice
+    {
+    public:
+        KnownDevice(NimBLEUUID uuid, std::shared_ptr<SensorData> sensorData) : uuid(uuid), sensorData(sensorData){};
+        NimBLEUUID getUUID();
+        std::shared_ptr<SensorData> decode(uint8_t *data, size_t length);
+
+    private:
+        NimBLEUUID uuid;
+        std::shared_ptr<SensorData> sensorData;
+    };
+
+    class NullData : public SensorData
+    {
+    public:
+        NullData() : SensorData("Null"){};
+
+        virtual bool hasHeartRate();
+        virtual bool hasCadence();
+        virtual bool hasPower();
+        virtual bool hasSpeed();
+        virtual int getHeartRate();
+        virtual float getCadence();
+        virtual int getPower();
+        virtual float getSpeed();
+        virtual void decode(uint8_t *data, size_t length);
+    };
+
+    std::vector<KnownDevice *> knownDevices;
+    static std::shared_ptr<SensorData> NULL_SENSOR_DATA;
+};