JorropoandGitHub
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.
28 lines
725 B
C++
28 lines
725 B
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <Wire.h>
|
|
|
|
class RCWL9620Sensor : public TelemetrySensor
|
|
{
|
|
private:
|
|
uint8_t _addr = 0x57;
|
|
TwoWire *_wire = &Wire;
|
|
uint8_t _scl = -1;
|
|
uint8_t _sda = -1;
|
|
uint32_t _speed = 200000UL;
|
|
|
|
protected:
|
|
void begin(TwoWire *wire = &Wire, uint8_t addr = 0x57, uint8_t sda = -1, uint8_t scl = -1, uint32_t speed = 200000UL);
|
|
float getDistance();
|
|
|
|
public:
|
|
RCWL9620Sensor();
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
|
|
};
|
|
|
|
#endif |