mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-15 07:51:19 +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.
55 lines
1.4 KiB
C++
55 lines
1.4 KiB
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_BMP3XX.h>)
|
|
|
|
#ifndef _BMP3XX_SENSOR_H
|
|
#define _BMP3XX_SENSOR_H
|
|
|
|
#define SEAL_LEVEL_HPA 1013.2f
|
|
|
|
#include "TelemetrySensor.h"
|
|
#include <Adafruit_BMP3XX.h>
|
|
#include <typeinfo>
|
|
|
|
// Singleton wrapper for the Adafruit_BMP3XX class
|
|
class BMP3XXSingleton : public Adafruit_BMP3XX
|
|
{
|
|
private:
|
|
static BMP3XXSingleton *pinstance;
|
|
|
|
protected:
|
|
BMP3XXSingleton();
|
|
~BMP3XXSingleton();
|
|
|
|
public:
|
|
// Create a singleton instance (not thread safe)
|
|
static BMP3XXSingleton *GetInstance();
|
|
|
|
// Singletons should not be cloneable.
|
|
BMP3XXSingleton(BMP3XXSingleton &other) = delete;
|
|
|
|
// Singletons should not be assignable.
|
|
void operator=(const BMP3XXSingleton &) = delete;
|
|
|
|
// Performs a full reading of all sensors in the BMP3XX. Assigns
|
|
// the internal temperature, pressure and altitudeAmsl variables
|
|
bool performReading();
|
|
|
|
// Altitude in metres above mean sea level, assigned after calling performReading()
|
|
double altitudeAmslMetres = 0.0f;
|
|
};
|
|
|
|
class BMP3XXSensor : public TelemetrySensor
|
|
{
|
|
protected:
|
|
BMP3XXSingleton *bmp3xx = nullptr;
|
|
|
|
public:
|
|
BMP3XXSensor();
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif |