mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-16 08:31:35 +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.
29 lines
738 B
C++
29 lines
738 B
C++
/*
|
|
* Support for the ClimateGuard RadSens Dosimeter
|
|
* A fun and educational sensor for Meshtastic; not for safety critical applications.
|
|
*/
|
|
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <Wire.h>
|
|
|
|
class CGRadSensSensor : public TelemetrySensor
|
|
{
|
|
private:
|
|
uint8_t _addr = 0x66;
|
|
TwoWire *_wire = &Wire;
|
|
|
|
protected:
|
|
void begin(TwoWire *wire = &Wire, uint8_t addr = 0x66);
|
|
float getStaticRadiation();
|
|
|
|
public:
|
|
CGRadSensSensor();
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
|
|
};
|
|
|
|
#endif |