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.
24 lines
612 B
C++
24 lines
612 B
C++
#pragma once
|
|
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<ClosedCube_OPT3001.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <ClosedCube_OPT3001.h>
|
|
|
|
class OPT3001Sensor : public TelemetrySensor
|
|
{
|
|
private:
|
|
ClosedCube_OPT3001 opt3001;
|
|
|
|
public:
|
|
OPT3001Sensor();
|
|
#if WIRE_INTERFACES_COUNT > 1
|
|
virtual bool onlyWire1() { return true; }
|
|
#endif
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
|
|
};
|
|
|
|
#endif |