mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-22 01:37:52 +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.
49 lines
1.6 KiB
C++
49 lines
1.6 KiB
C++
#pragma once
|
|
|
|
#include "MeshTypes.h"
|
|
|
|
#include <queue>
|
|
|
|
/**
|
|
* A priority queue of packets
|
|
*/
|
|
class MeshPacketQueue
|
|
{
|
|
size_t maxLen;
|
|
std::vector<meshtastic_MeshPacket *> queue;
|
|
|
|
/** Replace a lower priority package in the queue with 'mp' (provided there are lower pri packages). Return true if replaced.
|
|
*/
|
|
bool replaceLowerPriorityPacket(meshtastic_MeshPacket *mp);
|
|
|
|
public:
|
|
explicit MeshPacketQueue(size_t _maxLen);
|
|
|
|
/** enqueue a packet, return false if full
|
|
* @param dropped Optional pointer to a bool that will be set to true if a packet was dropped
|
|
*/
|
|
bool enqueue(meshtastic_MeshPacket *p, bool *dropped = nullptr);
|
|
|
|
/** return true if the queue is empty */
|
|
bool empty();
|
|
|
|
/** return amount of free packets in Queue */
|
|
size_t getFree() { return maxLen - queue.size(); }
|
|
|
|
/** return total size of the Queue */
|
|
size_t getMaxLen() { return maxLen; }
|
|
|
|
meshtastic_MeshPacket *dequeue();
|
|
|
|
meshtastic_MeshPacket *getFront();
|
|
|
|
/** Get a packet from this queue. Returns a pointer to the packet, or NULL if not found. */
|
|
meshtastic_MeshPacket *getPacketFromQueue(NodeNum from, PacketId id);
|
|
|
|
/** Attempt to find and remove a packet from this queue. Returns the packet which was removed from the queue */
|
|
meshtastic_MeshPacket *remove(NodeNum from, PacketId id, bool tx_normal = true, bool tx_late = true,
|
|
uint8_t hop_limit_lt = 0);
|
|
|
|
/* Attempt to find a packet from this queue. Return true if it was found. */
|
|
bool find(const NodeNum from, const PacketId id);
|
|
}; |