mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-15 16:01:19 +10:00
Jorropo
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.
13 lines
548 B
C
13 lines
548 B
C
#pragma once
|
|
|
|
#include "mesh/generated/meshtastic/mqtt.pb.h"
|
|
|
|
// meshtastic_ServiceEnvelope that automatically releases dynamically allocated memory when it goes out of scope.
|
|
struct DecodedServiceEnvelope : public meshtastic_ServiceEnvelope {
|
|
DecodedServiceEnvelope(const uint8_t *payload, size_t length);
|
|
DecodedServiceEnvelope(DecodedServiceEnvelope &) = delete;
|
|
DecodedServiceEnvelope(DecodedServiceEnvelope &&);
|
|
~DecodedServiceEnvelope();
|
|
// Clients must check that this is true before using.
|
|
const bool validDecode;
|
|
}; |