[create-pull-request] automated change (#5062)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>

protobufs

@@ -1 +1 @@
-Subproject commit 30ba090346c6e67fcfed0fef1ad52c0844101382
+Subproject commit e22381a3c6bbdd428f127ed8c0aa0a37789c3907

src/mesh/generated/meshtastic/deviceonly.pb.cpp

@@ -21,9 +21,4 @@ PB_BIND(meshtastic_DeviceState, meshtastic_DeviceState, 2)
 PB_BIND(meshtastic_ChannelFile, meshtastic_ChannelFile, 2)
 
 
-PB_BIND(meshtastic_OEMStore, meshtastic_OEMStore, 2)
-
-
-
-
 

src/mesh/generated/meshtastic/deviceonly.pb.h

@@ -6,7 +6,6 @@
 #include <pb.h>
 #include <vector>
 #include "meshtastic/channel.pb.h"
-#include "meshtastic/localonly.pb.h"
 #include "meshtastic/mesh.pb.h"
 #include "meshtastic/telemetry.pb.h"
 #include "meshtastic/config.pb.h"
@@ -15,17 +14,6 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-/* Enum definitions */
-/* Font sizes for the device screen */
-typedef enum _meshtastic_ScreenFonts {
-    /* TODO: REPLACE */
-    meshtastic_ScreenFonts_FONT_SMALL = 0,
-    /* TODO: REPLACE */
-    meshtastic_ScreenFonts_FONT_MEDIUM = 1,
-    /* TODO: REPLACE */
-    meshtastic_ScreenFonts_FONT_LARGE = 2
-} meshtastic_ScreenFonts;
-
 /* Struct definitions */
 /* Position with static location information only for NodeDBLite */
 typedef struct _meshtastic_PositionLite {
@@ -154,65 +142,22 @@ typedef struct _meshtastic_ChannelFile {
     uint32_t version;
 } meshtastic_ChannelFile;
 
-typedef PB_BYTES_ARRAY_T(2048) meshtastic_OEMStore_oem_icon_bits_t;
-typedef PB_BYTES_ARRAY_T(32) meshtastic_OEMStore_oem_aes_key_t;
-/* This can be used for customizing the firmware distribution. If populated,
- show a secondary bootup screen with custom logo and text for 2.5 seconds. */
-typedef struct _meshtastic_OEMStore {
-    /* The Logo width in Px */
-    uint32_t oem_icon_width;
-    /* The Logo height in Px */
-    uint32_t oem_icon_height;
-    /* The Logo in XBM bytechar format */
-    meshtastic_OEMStore_oem_icon_bits_t oem_icon_bits;
-    /* Use this font for the OEM text. */
-    meshtastic_ScreenFonts oem_font;
-    /* Use this font for the OEM text. */
-    char oem_text[40];
-    /* The default device encryption key, 16 or 32 byte */
-    meshtastic_OEMStore_oem_aes_key_t oem_aes_key;
-    /* A Preset LocalConfig to apply during factory reset */
-    bool has_oem_local_config;
-    meshtastic_LocalConfig oem_local_config;
-    /* A Preset LocalModuleConfig to apply during factory reset */
-    bool has_oem_local_module_config;
-    meshtastic_LocalModuleConfig oem_local_module_config;
-} meshtastic_OEMStore;
-
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Helper constants for enums */
-#define _meshtastic_ScreenFonts_MIN meshtastic_ScreenFonts_FONT_SMALL
-#define _meshtastic_ScreenFonts_MAX meshtastic_ScreenFonts_FONT_LARGE
-#define _meshtastic_ScreenFonts_ARRAYSIZE ((meshtastic_ScreenFonts)(meshtastic_ScreenFonts_FONT_LARGE+1))
-
-#define meshtastic_PositionLite_location_source_ENUMTYPE meshtastic_Position_LocSource
-
-#define meshtastic_UserLite_hw_model_ENUMTYPE meshtastic_HardwareModel
-#define meshtastic_UserLite_role_ENUMTYPE meshtastic_Config_DeviceConfig_Role
-
-
-
-
-#define meshtastic_OEMStore_oem_font_ENUMTYPE meshtastic_ScreenFonts
-
-
 /* Initializer values for message structs */
 #define meshtastic_PositionLite_init_default     {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
 #define meshtastic_UserLite_init_default         {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
 #define meshtastic_NodeInfoLite_init_default     {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0}
 #define meshtastic_DeviceState_init_default      {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default, 0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}, {0}}
 #define meshtastic_ChannelFile_init_default      {0, {meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default}, 0}
-#define meshtastic_OEMStore_init_default         {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default}
 #define meshtastic_PositionLite_init_zero        {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
 #define meshtastic_UserLite_init_zero            {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
 #define meshtastic_NodeInfoLite_init_zero        {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0}
 #define meshtastic_DeviceState_init_zero         {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero, 0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}, {0}}
 #define meshtastic_ChannelFile_init_zero         {0, {meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero}, 0}
-#define meshtastic_OEMStore_init_zero            {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_PositionLite_latitude_i_tag   1
@@ -249,14 +194,6 @@ extern "C" {
 #define meshtastic_DeviceState_node_db_lite_tag  14
 #define meshtastic_ChannelFile_channels_tag      1
 #define meshtastic_ChannelFile_version_tag       2
-#define meshtastic_OEMStore_oem_icon_width_tag   1
-#define meshtastic_OEMStore_oem_icon_height_tag  2
-#define meshtastic_OEMStore_oem_icon_bits_tag    3
-#define meshtastic_OEMStore_oem_font_tag         4
-#define meshtastic_OEMStore_oem_text_tag         5
-#define meshtastic_OEMStore_oem_aes_key_tag      6
-#define meshtastic_OEMStore_oem_local_config_tag 7
-#define meshtastic_OEMStore_oem_local_module_config_tag 8
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_PositionLite_FIELDLIST(X, a) \
@@ -325,26 +262,11 @@ X(a, STATIC,   SINGULAR, UINT32,   version,           2)
 #define meshtastic_ChannelFile_DEFAULT NULL
 #define meshtastic_ChannelFile_channels_MSGTYPE meshtastic_Channel
 
-#define meshtastic_OEMStore_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT32,   oem_icon_width,    1) \
-X(a, STATIC,   SINGULAR, UINT32,   oem_icon_height,   2) \
-X(a, STATIC,   SINGULAR, BYTES,    oem_icon_bits,     3) \
-X(a, STATIC,   SINGULAR, UENUM,    oem_font,          4) \
-X(a, STATIC,   SINGULAR, STRING,   oem_text,          5) \
-X(a, STATIC,   SINGULAR, BYTES,    oem_aes_key,       6) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  oem_local_config,   7) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  oem_local_module_config,   8)
-#define meshtastic_OEMStore_CALLBACK NULL
-#define meshtastic_OEMStore_DEFAULT NULL
-#define meshtastic_OEMStore_oem_local_config_MSGTYPE meshtastic_LocalConfig
-#define meshtastic_OEMStore_oem_local_module_config_MSGTYPE meshtastic_LocalModuleConfig
-
 extern const pb_msgdesc_t meshtastic_PositionLite_msg;
 extern const pb_msgdesc_t meshtastic_UserLite_msg;
 extern const pb_msgdesc_t meshtastic_NodeInfoLite_msg;
 extern const pb_msgdesc_t meshtastic_DeviceState_msg;
 extern const pb_msgdesc_t meshtastic_ChannelFile_msg;
-extern const pb_msgdesc_t meshtastic_OEMStore_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_PositionLite_fields &meshtastic_PositionLite_msg
@@ -352,14 +274,12 @@ extern const pb_msgdesc_t meshtastic_OEMStore_msg;
 #define meshtastic_NodeInfoLite_fields &meshtastic_NodeInfoLite_msg
 #define meshtastic_DeviceState_fields &meshtastic_DeviceState_msg
 #define meshtastic_ChannelFile_fields &meshtastic_ChannelFile_msg
-#define meshtastic_OEMStore_fields &meshtastic_OEMStore_msg
 
 /* Maximum encoded size of messages (where known) */
 /* meshtastic_DeviceState_size depends on runtime parameters */
-#define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_OEMStore_size
+#define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_ChannelFile_size
 #define meshtastic_ChannelFile_size              718
 #define meshtastic_NodeInfoLite_size             183
-#define meshtastic_OEMStore_size                 3578
 #define meshtastic_PositionLite_size             28
 #define meshtastic_UserLite_size                 96