mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-06 18:08:00 +00:00
fix: ina226 was not calibrated during init (#7547)
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
@@ -32,16 +32,42 @@ void INA226Sensor::begin(TwoWire *wire, uint8_t addr)
|
|||||||
_addr = addr;
|
_addr = addr;
|
||||||
ina226 = INA226(_addr, _wire);
|
ina226 = INA226(_addr, _wire);
|
||||||
_wire->begin();
|
_wire->begin();
|
||||||
|
ina226.setMaxCurrentShunt(0.8, 0.100);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool INA226Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
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_voltage = true;
|
||||||
measurement->variant.environment_metrics.has_current = true;
|
measurement->variant.environment_metrics.has_current = true;
|
||||||
|
|
||||||
// mV conversion to V
|
|
||||||
measurement->variant.environment_metrics.voltage = ina226.getBusVoltage();
|
measurement->variant.environment_metrics.voltage = ina226.getBusVoltage();
|
||||||
measurement->variant.environment_metrics.current = ina226.getCurrent_mA();
|
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;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,9 @@ class INA226Sensor : public TelemetrySensor, VoltageSensor, CurrentSensor
|
|||||||
TwoWire *_wire = &Wire;
|
TwoWire *_wire = &Wire;
|
||||||
INA226 ina226 = INA226(_addr, _wire);
|
INA226 ina226 = INA226(_addr, _wire);
|
||||||
|
|
||||||
|
bool getEnvironmentMetrics(meshtastic_Telemetry *measurement);
|
||||||
|
bool getPowerMetrics(meshtastic_Telemetry *measurement);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void setup() override;
|
virtual void setup() override;
|
||||||
void begin(TwoWire *wire = &Wire, uint8_t addr = INA_ADDR);
|
void begin(TwoWire *wire = &Wire, uint8_t addr = INA_ADDR);
|
||||||
|
|||||||
Reference in New Issue
Block a user