mirror of
https://github.com/meshtastic/firmware.git
synced 2026-03-29 12:33:28 -04: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.
26 lines
747 B
C++
26 lines
747 B
C++
#pragma once
|
|
#include "ProtobufModule.h"
|
|
#include "meshtastic/atak.pb.h"
|
|
|
|
/**
|
|
* Waypoint message handling for meshtastic
|
|
*/
|
|
class AtakPluginModule : public ProtobufModule<meshtastic_TAKPacket>, private concurrency::OSThread
|
|
{
|
|
public:
|
|
/** Constructor
|
|
* name is for debugging output
|
|
*/
|
|
AtakPluginModule();
|
|
|
|
protected:
|
|
virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) override;
|
|
virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) override;
|
|
/* Does our periodic broadcast */
|
|
int32_t runOnce() override;
|
|
|
|
private:
|
|
meshtastic_TAKPacket cloneTAKPacketData(meshtastic_TAKPacket *t);
|
|
};
|
|
|
|
extern AtakPluginModule *atakPluginModule; |