Merge pull request #1522 from meshtastic/create-pull-request/patch

Changes by create-pull-request action
pull/1519/head^2
Thomas Göttgens 2022-06-16 21:41:23 +02:00 zatwierdzone przez GitHub
commit 22fca01323
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 4 dodań i 4 usunięć

@ -1 +1 @@
Subproject commit a7bbc358664c83f5148bae2a502cb294e7cafee5
Subproject commit 94a4dbb842961e75f89de13dc6d0437a256098aa

Wyświetl plik

@ -4,7 +4,7 @@
#ifndef PB_MESH_PB_H_INCLUDED
#define PB_MESH_PB_H_INCLUDED
#include <pb.h>
#include "localonly.pb.h"
#include "config.pb.h"
#include "portnums.pb.h"
#include "telemetry.pb.h"
@ -631,7 +631,7 @@ typedef struct _FromRadio {
union {
MyNodeInfo my_info;
NodeInfo node_info;
LocalConfig config;
Config config;
LogRecord log_record;
uint32_t config_complete_id;
bool rebooted;
@ -980,7 +980,7 @@ X(a, STATIC, ONEOF, MESSAGE, (payloadVariant,packet,packet), 11)
#define FromRadio_DEFAULT NULL
#define FromRadio_payloadVariant_my_info_MSGTYPE MyNodeInfo
#define FromRadio_payloadVariant_node_info_MSGTYPE NodeInfo
#define FromRadio_payloadVariant_config_MSGTYPE LocalConfig
#define FromRadio_payloadVariant_config_MSGTYPE Config
#define FromRadio_payloadVariant_log_record_MSGTYPE LogRecord
#define FromRadio_payloadVariant_packet_MSGTYPE MeshPacket