mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-26 11:47:51 +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.
25 lines
832 B
C++
25 lines
832 B
C++
#include "ReplyModule.h"
|
|
#include "MeshService.h"
|
|
#include "configuration.h"
|
|
#include "main.h"
|
|
|
|
#include <assert.h>
|
|
|
|
meshtastic_MeshPacket *ReplyModule::allocReply()
|
|
{
|
|
assert(currentRequest); // should always be !NULL
|
|
#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
|
|
auto req = *currentRequest;
|
|
auto &p = req.decoded;
|
|
// The incoming message is in p.payload
|
|
LOG_INFO("Received message from=0x%0x, id=%d, msg=%.*s", req.from, req.id, p.payload.size, p.payload.bytes);
|
|
#endif
|
|
|
|
const char *replyStr = "Message Received";
|
|
auto reply = allocDataPacket(); // Allocate a packet for sending
|
|
reply->decoded.payload.size = strlen(replyStr); // You must specify how many bytes are in the reply
|
|
memcpy(reply->decoded.payload.bytes, replyStr, reply->decoded.payload.size);
|
|
|
|
return reply;
|
|
}
|