mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-14 22:07:25 +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.
23 lines
604 B
C++
23 lines
604 B
C++
#pragma once
|
|
#include "SinglePortModule.h"
|
|
|
|
class DetectionSensorModule : public SinglePortModule, private concurrency::OSThread
|
|
{
|
|
public:
|
|
DetectionSensorModule() : SinglePortModule("detection", meshtastic_PortNum_DETECTION_SENSOR_APP), OSThread("DetectionSensor")
|
|
{
|
|
}
|
|
|
|
protected:
|
|
virtual int32_t runOnce() override;
|
|
|
|
private:
|
|
bool firstTime = true;
|
|
uint32_t lastSentToMesh = 0;
|
|
bool wasDetected = false;
|
|
void sendDetectionMessage();
|
|
void sendCurrentStateMessage(bool state);
|
|
bool hasDetectionEvent();
|
|
};
|
|
|
|
extern DetectionSensorModule *detectionSensorModule; |