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.
34 lines
599 B
C++
34 lines
599 B
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TelemetrySensor.h"
|
|
#include "nullSensor.h"
|
|
#include <typeinfo>
|
|
|
|
NullSensor::NullSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SENSOR_UNSET, "nullSensor") {}
|
|
|
|
int32_t NullSensor::runOnce()
|
|
{
|
|
return INT32_MAX;
|
|
}
|
|
|
|
void NullSensor::setup() {}
|
|
|
|
bool NullSensor::getMetrics(meshtastic_Telemetry *measurement)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
uint16_t NullSensor::getBusVoltageMv()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int16_t NullSensor::getCurrentMa()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif |