mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-13 07:01:18 +10:00
Jorropo
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
60 lines
1.6 KiB
C++
60 lines
1.6 KiB
C++
#include "configuration.h"
|
|
|
|
#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<INA3221.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "CurrentSensor.h"
|
|
#include "TelemetrySensor.h"
|
|
#include "VoltageSensor.h"
|
|
#include <INA3221.h>
|
|
|
|
#ifndef INA3221_ENV_CH
|
|
#define INA3221_ENV_CH INA3221_CH1
|
|
#endif
|
|
|
|
#ifndef INA3221_BAT_CH
|
|
#define INA3221_BAT_CH INA3221_CH1
|
|
#endif
|
|
|
|
class INA3221Sensor : public TelemetrySensor, VoltageSensor, CurrentSensor
|
|
{
|
|
private:
|
|
INA3221 ina3221 = INA3221(INA3221_ADDR42_SDA);
|
|
|
|
// channel to report voltage/current for environment metrics
|
|
static const ina3221_ch_t ENV_CH = INA3221_ENV_CH;
|
|
|
|
// channel to report battery voltage for device_battery_ina_address
|
|
static const ina3221_ch_t BAT_CH = INA3221_BAT_CH;
|
|
|
|
// get a single measurement for a channel
|
|
struct _INA3221Measurement getMeasurement(ina3221_ch_t ch);
|
|
|
|
// get all measurements for all channels
|
|
struct _INA3221Measurements getMeasurements();
|
|
|
|
bool getEnvironmentMetrics(meshtastic_Telemetry *measurement);
|
|
bool getPowerMetrics(meshtastic_Telemetry *measurement);
|
|
|
|
protected:
|
|
void setup() override;
|
|
|
|
public:
|
|
INA3221Sensor();
|
|
int32_t runOnce() override;
|
|
bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
virtual uint16_t getBusVoltageMv() override;
|
|
virtual int16_t getCurrentMa() override;
|
|
};
|
|
|
|
struct _INA3221Measurement {
|
|
float voltage;
|
|
float current;
|
|
};
|
|
|
|
struct _INA3221Measurements {
|
|
// INA3221 has 3 channels
|
|
struct _INA3221Measurement measurements[3];
|
|
};
|
|
|
|
#endif |