INA260 + INA219 sensor support (#1501)

* INA219 + INA260 support in telemetry

* Protobuf update

* Fixes + debug statement

* Fix size

* Fix conversion from mv

* Added getRegisterValue for i2cscan

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -16,12 +16,17 @@
 #include "Sensor/DHTSensor.h"
 #include "Sensor/DallasSensor.h"
 #include "Sensor/MCP9808Sensor.h"
+#include "Sensor/INA260Sensor.h"
+#include "Sensor/INA219Sensor.h"
+
 
 BME280Sensor bme280Sensor;
 BME680Sensor bme680Sensor;
 DHTSensor dhtSensor;
 DallasSensor dallasSensor;
 MCP9808Sensor mcp9808Sensor;
+INA260Sensor ina260Sensor;
+INA219Sensor ina219Sensor;
 
 #define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
 #define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
@@ -50,6 +55,7 @@ int32_t EnvironmentTelemetryModule::runOnce()
         Uncomment the preferences below if you want to use the module
         without having to configure it from the PythonAPI or WebUI.
     */
+    moduleConfig.telemetry.environment_measurement_enabled = 1;
    
     /*
     moduleConfig.telemetry.environment_measurement_enabled = 1;
@@ -96,6 +102,10 @@ int32_t EnvironmentTelemetryModule::runOnce()
                 result = bme280Sensor.runOnce();
             if (mcp9808Sensor.hasSensor()) 
                 result = mcp9808Sensor.runOnce();
+            if (ina260Sensor.hasSensor()) 
+                result = ina260Sensor.runOnce();
+            if (ina219Sensor.hasSensor())
+                result = ina219Sensor.runOnce();
         }
         return result;
     } else {
@@ -252,6 +262,10 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies
         bme680Sensor.getMetrics(&m);
     if (mcp9808Sensor.hasSensor())
         mcp9808Sensor.getMetrics(&m);
+    if (ina219Sensor.hasSensor())
+        ina219Sensor.getMetrics(&m);
+    if (ina260Sensor.hasSensor())
+        ina260Sensor.getMetrics(&m);
 
     DEBUG_MSG("Telemetry->time: %i\n", m.time);
     DEBUG_MSG("Telemetry->barometric_pressure: %f\n", m.variant.environment_metrics.barometric_pressure);

src/modules/Telemetry/Sensor/BME280Sensor.cpp

@@ -11,11 +11,11 @@ BME280Sensor::BME280Sensor() :
 }
 
 int32_t BME280Sensor::runOnce() {
-    DEBUG_MSG("Init sensor: TelemetrySensorType_BME280\n");
+    DEBUG_MSG("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = bme280.begin(nodeTelemetrySensorsMap[TelemetrySensorType_BME280]); 
+    status = bme280.begin(nodeTelemetrySensorsMap[sensorType]); 
     return initI2CSensor();
 }
 

src/modules/Telemetry/Sensor/BME680Sensor.cpp

@@ -10,11 +10,11 @@ BME680Sensor::BME680Sensor() :
 }
 
 int32_t BME680Sensor::runOnce() {
-    DEBUG_MSG("runOnce: TelemetrySensorType_BME680\n");
+    DEBUG_MSG("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = bme680.begin(nodeTelemetrySensorsMap[TelemetrySensorType_BME680]); 
+    status = bme680.begin(nodeTelemetrySensorsMap[sensorType]); 
     return initI2CSensor();
 }
 
@@ -29,7 +29,6 @@ void BME680Sensor::setup()
 }
 
 bool BME680Sensor::getMetrics(Telemetry *measurement) {
-    
     measurement->variant.environment_metrics.temperature = bme680.readTemperature();
     measurement->variant.environment_metrics.relative_humidity = bme680.readHumidity();
     measurement->variant.environment_metrics.barometric_pressure = bme680.readPressure() / 100.0F;

src/modules/Telemetry/Sensor/INA219Sensor.cpp

@@ -0,0 +1,30 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "configuration.h"
+#include "TelemetrySensor.h"
+#include "INA219Sensor.h"
+#include <Adafruit_INA219.h>
+
+INA219Sensor::INA219Sensor() : 
+    TelemetrySensor(TelemetrySensorType_INA219, "INA219") 
+{
+}
+
+int32_t INA219Sensor::runOnce() {
+    DEBUG_MSG("Init sensor: %s\n", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    ina219 = Adafruit_INA219(nodeTelemetrySensorsMap[sensorType]);
+    status = ina219.begin();
+    return initI2CSensor();
+}
+
+void INA219Sensor::setup() 
+{
+}
+
+bool INA219Sensor::getMetrics(Telemetry *measurement) {
+    measurement->variant.environment_metrics.voltage = ina219.getBusVoltage_V();
+    measurement->variant.environment_metrics.current = ina219.getCurrent_mA();
+    return true;
+}    

src/modules/Telemetry/Sensor/INA219Sensor.h

@@ -0,0 +1,17 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_INA219.h>
+
+
+class INA219Sensor : virtual public TelemetrySensor {
+private:
+    Adafruit_INA219 ina219;
+
+protected:
+    virtual void setup() override;
+    
+public:
+    INA219Sensor();
+    virtual int32_t runOnce() override;
+    virtual bool getMetrics(Telemetry *measurement) override;
+};    

src/modules/Telemetry/Sensor/INA260Sensor.cpp

@@ -0,0 +1,30 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "configuration.h"
+#include "TelemetrySensor.h"
+#include "INA260Sensor.h"
+#include <Adafruit_INA260.h>
+
+INA260Sensor::INA260Sensor() : 
+    TelemetrySensor(TelemetrySensorType_INA260, "INA260") 
+{
+}
+
+int32_t INA260Sensor::runOnce() {
+    DEBUG_MSG("Init sensor: %s\n", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    status = ina260.begin(nodeTelemetrySensorsMap[sensorType]);
+    return initI2CSensor();
+}
+
+void INA260Sensor::setup() 
+{
+}
+
+bool INA260Sensor::getMetrics(Telemetry *measurement) {
+    // mV conversion to V
+    measurement->variant.environment_metrics.voltage = ina260.readBusVoltage() / 1000;
+    measurement->variant.environment_metrics.current = ina260.readCurrent();
+    return true;
+}    

src/modules/Telemetry/Sensor/INA260Sensor.h

@@ -0,0 +1,17 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_INA260.h>
+
+
+class INA260Sensor : virtual public TelemetrySensor {
+private:
+    Adafruit_INA260 ina260 = Adafruit_INA260();
+
+protected:
+    virtual void setup() override;
+    
+public:
+    INA260Sensor();
+    virtual int32_t runOnce() override;
+    virtual bool getMetrics(Telemetry *measurement) override;
+};    

src/modules/Telemetry/Sensor/MCP9808Sensor.cpp

@@ -10,11 +10,11 @@ MCP9808Sensor::MCP9808Sensor() :
 }
 
 int32_t MCP9808Sensor::runOnce() {
-    DEBUG_MSG("Init sensor: TelemetrySensorType_MCP9808\n");
+    DEBUG_MSG("Init sensor: %s\n", sensorName);
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = mcp9808.begin(nodeTelemetrySensorsMap[TelemetrySensorType_MCP9808]);
+    status = mcp9808.begin(nodeTelemetrySensorsMap[sensorType]);
     return initI2CSensor();
 }