mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 14:57:41 +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.
54 lines
1.7 KiB
C++
54 lines
1.7 KiB
C++
#pragma once
|
|
#include "ProtobufModule.h"
|
|
#include <map>
|
|
|
|
/**
|
|
* NodeInfo module for sending/receiving NodeInfos into the mesh
|
|
*/
|
|
class NodeInfoModule : public ProtobufModule<meshtastic_User>, private concurrency::OSThread
|
|
{
|
|
/// The id of the last packet we sent, to allow us to cancel it if we make something fresher
|
|
PacketId prevPacketId = 0;
|
|
|
|
uint32_t currentGeneration = 0;
|
|
|
|
public:
|
|
/** Constructor
|
|
* name is for debugging output
|
|
*/
|
|
NodeInfoModule();
|
|
|
|
/**
|
|
* Send our NodeInfo into the mesh
|
|
*/
|
|
void sendOurNodeInfo(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false, uint8_t channel = 0,
|
|
bool _shorterTimeout = false);
|
|
|
|
protected:
|
|
/** Called to handle a particular incoming message
|
|
|
|
@return true if you've guaranteed you've handled this message and no other handlers should be considered for it
|
|
*/
|
|
virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_User *p) override;
|
|
|
|
/** Called to alter received User protobuf */
|
|
virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_User *p) override;
|
|
|
|
/** Messages can be received that have the want_response bit set. If set, this callback will be invoked
|
|
* so that subclasses can (optionally) send a response back to the original sender. */
|
|
virtual meshtastic_MeshPacket *allocReply() override;
|
|
|
|
/** Does our periodic broadcast */
|
|
virtual int32_t runOnce() override;
|
|
|
|
private:
|
|
uint32_t lastSentToMesh = 0; // Last time we sent our NodeInfo to the mesh
|
|
bool shorterTimeout = false;
|
|
bool suppressReplyForCurrentRequest = false;
|
|
std::map<NodeNum, uint32_t> lastNodeInfoSeen;
|
|
|
|
void pruneLastNodeInfoCache();
|
|
};
|
|
|
|
extern NodeInfoModule *nodeInfoModule;
|