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.
28 lines
636 B
C++
28 lines
636 B
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
|
#pragma once
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
|
|
#include "CurrentSensor.h"
|
|
#include "TelemetrySensor.h"
|
|
#include "VoltageSensor.h"
|
|
|
|
class NullSensor : public TelemetrySensor, VoltageSensor, CurrentSensor
|
|
{
|
|
|
|
protected:
|
|
virtual void setup() override;
|
|
|
|
public:
|
|
NullSensor();
|
|
virtual int32_t runOnce() override;
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
int32_t runTrigger() { return 0; }
|
|
|
|
virtual uint16_t getBusVoltageMv() override;
|
|
virtual int16_t getCurrentMa() override;
|
|
};
|
|
|
|
#endif |