Merge branch 'master' into dismiss_frames

src/modules/Telemetry/Sensor/INA226Sensor.cpp

@@ -32,16 +32,42 @@ void INA226Sensor::begin(TwoWire *wire, uint8_t addr)
     _addr = addr;
     ina226 = INA226(_addr, _wire);
     _wire->begin();
+    ina226.setMaxCurrentShunt(0.8, 0.100);
 }
 
 bool INA226Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    switch (measurement->which_variant) {
+    case meshtastic_Telemetry_environment_metrics_tag:
+        return getEnvironmentMetrics(measurement);
+
+    case meshtastic_Telemetry_power_metrics_tag:
+        return getPowerMetrics(measurement);
+    }
+
+    // unsupported metric
+    return false;
+}
+
+bool INA226Sensor::getEnvironmentMetrics(meshtastic_Telemetry *measurement)
 {
     measurement->variant.environment_metrics.has_voltage = true;
     measurement->variant.environment_metrics.has_current = true;
 
-    // mV conversion to V
     measurement->variant.environment_metrics.voltage = ina226.getBusVoltage();
     measurement->variant.environment_metrics.current = ina226.getCurrent_mA();
+
+    return true;
+}
+
+bool INA226Sensor::getPowerMetrics(meshtastic_Telemetry *measurement)
+{
+    measurement->variant.power_metrics.has_ch1_voltage = true;
+    measurement->variant.power_metrics.has_ch1_current = true;
+
+    measurement->variant.power_metrics.ch1_voltage = ina226.getBusVoltage();
+    measurement->variant.power_metrics.ch1_current = ina226.getCurrent_mA();
+
     return true;
 }
 

src/modules/Telemetry/Sensor/INA226Sensor.h

@@ -15,6 +15,9 @@ class INA226Sensor : public TelemetrySensor, VoltageSensor, CurrentSensor
     TwoWire *_wire = &Wire;
     INA226 ina226 = INA226(_addr, _wire);
 
+    bool getEnvironmentMetrics(meshtastic_Telemetry *measurement);
+    bool getPowerMetrics(meshtastic_Telemetry *measurement);
+
   protected:
     virtual void setup() override;
     void begin(TwoWire *wire = &Wire, uint8_t addr = INA_ADDR);