mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-23 02:07:32 +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.
25 lines
591 B
C++
25 lines
591 B
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_MLX90614.h>)
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <Adafruit_MLX90614.h>
|
|
|
|
#define MLX90614_EMISSIVITY 0.98 // human skin
|
|
|
|
class MLX90614Sensor : public TelemetrySensor
|
|
{
|
|
private:
|
|
Adafruit_MLX90614 mlx = Adafruit_MLX90614();
|
|
|
|
protected:
|
|
virtual void setup() override;
|
|
|
|
public:
|
|
MLX90614Sensor();
|
|
virtual int32_t runOnce() override;
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
};
|
|
|
|
#endif
|