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.
26 lines
617 B
C++
26 lines
617 B
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !MESHTASTIC_EXCLUDE_HEALTH_TELEMETRY && __has_include(<MAX30105.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <MAX30105.h>
|
|
|
|
#define MAX30102_BUFFER_LEN 100
|
|
|
|
class MAX30102Sensor : public TelemetrySensor
|
|
{
|
|
private:
|
|
MAX30105 max30102 = MAX30105();
|
|
uint32_t _speed = 200000UL;
|
|
|
|
protected:
|
|
virtual void setup() override;
|
|
|
|
public:
|
|
MAX30102Sensor();
|
|
virtual int32_t runOnce() override;
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
};
|
|
|
|
#endif |