mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-22 09:47:28 +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.
16 lines
585 B
C++
16 lines
585 B
C++
#include "mesh/generated/meshtastic/deviceonly.pb.h"
|
|
#include "mesh/generated/meshtastic/mesh.pb.h"
|
|
|
|
#pragma once
|
|
#include "NodeDB.h"
|
|
|
|
class TypeConversions
|
|
{
|
|
public:
|
|
static meshtastic_NodeInfo ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite);
|
|
static meshtastic_PositionLite ConvertToPositionLite(meshtastic_Position position);
|
|
static meshtastic_Position ConvertToPosition(meshtastic_PositionLite lite);
|
|
static meshtastic_UserLite ConvertToUserLite(meshtastic_User user);
|
|
static meshtastic_User ConvertToUser(uint32_t nodeNum, meshtastic_UserLite lite);
|
|
};
|