mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-17 23:37:44 +00:00
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.
30 lines
838 B
C++
30 lines
838 B
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && defined(HAS_RAKPROT)
|
|
|
|
#ifndef _RAK9154SENSOR_H
|
|
#define _RAK9154SENSOR_H 1
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "CurrentSensor.h"
|
|
#include "TelemetrySensor.h"
|
|
#include "VoltageSensor.h"
|
|
|
|
class RAK9154Sensor : public TelemetrySensor, VoltageSensor, CurrentSensor
|
|
{
|
|
private:
|
|
protected:
|
|
virtual void setup() override;
|
|
uint32_t lastRead = 0;
|
|
|
|
public:
|
|
RAK9154Sensor();
|
|
virtual int32_t runOnce() override;
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
virtual uint16_t getBusVoltageMv() override;
|
|
virtual int16_t getCurrentMa() override;
|
|
int getBusBatteryPercent();
|
|
bool isCharging();
|
|
void setLastRead(uint32_t lastRead);
|
|
};
|
|
#endif // _RAK9154SENSOR_H
|
|
#endif // HAS_RAKPROT
|