mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-28 02:32:09 +00:00
[create-pull-request] automated change (#5153)
Co-authored-by: caveman99 <25002+caveman99@users.noreply.github.com>
This commit is contained in:
parent
adf1bc4b0e
commit
2568d4fcd8
@ -1 +1 @@
|
|||||||
Subproject commit 7960241ccdd6b262a11b79523857037f755ab847
|
Subproject commit 7dc7a6d21991efe362c7cbb556573f6bb285e407
|
@ -4,6 +4,7 @@
|
|||||||
#ifndef PB_MESHTASTIC_MESHTASTIC_CONFIG_PB_H_INCLUDED
|
#ifndef PB_MESHTASTIC_MESHTASTIC_CONFIG_PB_H_INCLUDED
|
||||||
#define PB_MESHTASTIC_MESHTASTIC_CONFIG_PB_H_INCLUDED
|
#define PB_MESHTASTIC_MESHTASTIC_CONFIG_PB_H_INCLUDED
|
||||||
#include <pb.h>
|
#include <pb.h>
|
||||||
|
#include "meshtastic/device_ui.pb.h"
|
||||||
|
|
||||||
#if PB_PROTO_HEADER_VERSION != 40
|
#if PB_PROTO_HEADER_VERSION != 40
|
||||||
#error Regenerate this file with the current version of nanopb generator.
|
#error Regenerate this file with the current version of nanopb generator.
|
||||||
@ -576,6 +577,7 @@ typedef struct _meshtastic_Config {
|
|||||||
meshtastic_Config_BluetoothConfig bluetooth;
|
meshtastic_Config_BluetoothConfig bluetooth;
|
||||||
meshtastic_Config_SecurityConfig security;
|
meshtastic_Config_SecurityConfig security;
|
||||||
meshtastic_Config_SessionkeyConfig sessionkey;
|
meshtastic_Config_SessionkeyConfig sessionkey;
|
||||||
|
meshtastic_DeviceUIConfig device_ui;
|
||||||
} payload_variant;
|
} payload_variant;
|
||||||
} meshtastic_Config;
|
} meshtastic_Config;
|
||||||
|
|
||||||
@ -779,6 +781,7 @@ extern "C" {
|
|||||||
#define meshtastic_Config_bluetooth_tag 7
|
#define meshtastic_Config_bluetooth_tag 7
|
||||||
#define meshtastic_Config_security_tag 8
|
#define meshtastic_Config_security_tag 8
|
||||||
#define meshtastic_Config_sessionkey_tag 9
|
#define meshtastic_Config_sessionkey_tag 9
|
||||||
|
#define meshtastic_Config_device_ui_tag 10
|
||||||
|
|
||||||
/* Struct field encoding specification for nanopb */
|
/* Struct field encoding specification for nanopb */
|
||||||
#define meshtastic_Config_FIELDLIST(X, a) \
|
#define meshtastic_Config_FIELDLIST(X, a) \
|
||||||
@ -790,7 +793,8 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,display,payload_variant.disp
|
|||||||
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,lora,payload_variant.lora), 6) \
|
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,lora,payload_variant.lora), 6) \
|
||||||
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,bluetooth,payload_variant.bluetooth), 7) \
|
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,bluetooth,payload_variant.bluetooth), 7) \
|
||||||
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,security,payload_variant.security), 8) \
|
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,security,payload_variant.security), 8) \
|
||||||
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,sessionkey,payload_variant.sessionkey), 9)
|
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,sessionkey,payload_variant.sessionkey), 9) \
|
||||||
|
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,device_ui,payload_variant.device_ui), 10)
|
||||||
#define meshtastic_Config_CALLBACK NULL
|
#define meshtastic_Config_CALLBACK NULL
|
||||||
#define meshtastic_Config_DEFAULT NULL
|
#define meshtastic_Config_DEFAULT NULL
|
||||||
#define meshtastic_Config_payload_variant_device_MSGTYPE meshtastic_Config_DeviceConfig
|
#define meshtastic_Config_payload_variant_device_MSGTYPE meshtastic_Config_DeviceConfig
|
||||||
@ -802,6 +806,7 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,sessionkey,payload_variant.s
|
|||||||
#define meshtastic_Config_payload_variant_bluetooth_MSGTYPE meshtastic_Config_BluetoothConfig
|
#define meshtastic_Config_payload_variant_bluetooth_MSGTYPE meshtastic_Config_BluetoothConfig
|
||||||
#define meshtastic_Config_payload_variant_security_MSGTYPE meshtastic_Config_SecurityConfig
|
#define meshtastic_Config_payload_variant_security_MSGTYPE meshtastic_Config_SecurityConfig
|
||||||
#define meshtastic_Config_payload_variant_sessionkey_MSGTYPE meshtastic_Config_SessionkeyConfig
|
#define meshtastic_Config_payload_variant_sessionkey_MSGTYPE meshtastic_Config_SessionkeyConfig
|
||||||
|
#define meshtastic_Config_payload_variant_device_ui_MSGTYPE meshtastic_DeviceUIConfig
|
||||||
|
|
||||||
#define meshtastic_Config_DeviceConfig_FIELDLIST(X, a) \
|
#define meshtastic_Config_DeviceConfig_FIELDLIST(X, a) \
|
||||||
X(a, STATIC, SINGULAR, UENUM, role, 1) \
|
X(a, STATIC, SINGULAR, UENUM, role, 1) \
|
||||||
|
Loading…
Reference in New Issue
Block a user