From 0c3ec9254d8d2648a1404e3b0a06cc66ce1c98dd Mon Sep 17 00:00:00 2001 From: caveman99 Date: Wed, 26 Oct 2022 15:56:26 +0000 Subject: [PATCH] [create-pull-request] automated change --- protobufs | 2 +- src/mesh/generated/config.pb.h | 11 ++++------- src/mesh/generated/localonly.pb.h | 2 +- src/mesh/generated/mesh.pb.c | 3 --- src/mesh/generated/mesh.pb.h | 30 +++--------------------------- 5 files changed, 9 insertions(+), 39 deletions(-) diff --git a/protobufs b/protobufs index 863a1d799..579a36afd 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 863a1d7997ae54471cbeea9baeb877924cc850cf +Subproject commit 579a36afded1edca9b0ba94f278ad1f637d56bf5 diff --git a/src/mesh/generated/config.pb.h b/src/mesh/generated/config.pb.h index e98aff60a..c83d97d51 100644 --- a/src/mesh/generated/config.pb.h +++ b/src/mesh/generated/config.pb.h @@ -157,7 +157,6 @@ typedef struct _Config_PowerConfig { typedef struct _Config_NetworkConfig { bool wifi_enabled; - Config_NetworkConfig_WiFiMode wifi_mode; char wifi_ssid[33]; char wifi_psk[64]; char ntp_server[33]; @@ -228,7 +227,7 @@ extern "C" { #define Config_DeviceConfig_init_default {_Config_DeviceConfig_Role_MIN, 0, 0} #define Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0} #define Config_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0} -#define Config_NetworkConfig_init_default {0, _Config_NetworkConfig_WiFiMode_MIN, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_NetworkConfig_init_default} +#define Config_NetworkConfig_init_default {0, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_NetworkConfig_init_default} #define Config_NetworkConfig_NetworkConfig_init_default {0, 0, 0, 0} #define Config_DisplayConfig_init_default {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN} #define Config_LoRaConfig_init_default {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, {0, 0, 0}} @@ -237,7 +236,7 @@ extern "C" { #define Config_DeviceConfig_init_zero {_Config_DeviceConfig_Role_MIN, 0, 0} #define Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0} #define Config_PowerConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0} -#define Config_NetworkConfig_init_zero {0, _Config_NetworkConfig_WiFiMode_MIN, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_NetworkConfig_init_zero} +#define Config_NetworkConfig_init_zero {0, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_NetworkConfig_init_zero} #define Config_NetworkConfig_NetworkConfig_init_zero {0, 0, 0, 0} #define Config_DisplayConfig_init_zero {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN} #define Config_LoRaConfig_init_zero {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, {0, 0, 0}} @@ -288,7 +287,6 @@ extern "C" { #define Config_PowerConfig_ls_secs_tag 7 #define Config_PowerConfig_min_wake_secs_tag 8 #define Config_NetworkConfig_wifi_enabled_tag 1 -#define Config_NetworkConfig_wifi_mode_tag 2 #define Config_NetworkConfig_wifi_ssid_tag 3 #define Config_NetworkConfig_wifi_psk_tag 4 #define Config_NetworkConfig_ntp_server_tag 5 @@ -354,7 +352,6 @@ X(a, STATIC, SINGULAR, UINT32, min_wake_secs, 8) #define Config_NetworkConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, wifi_enabled, 1) \ -X(a, STATIC, SINGULAR, UENUM, wifi_mode, 2) \ X(a, STATIC, SINGULAR, STRING, wifi_ssid, 3) \ X(a, STATIC, SINGULAR, STRING, wifi_psk, 4) \ X(a, STATIC, SINGULAR, STRING, ntp_server, 5) \ @@ -433,10 +430,10 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg; #define Config_DisplayConfig_size 20 #define Config_LoRaConfig_size 68 #define Config_NetworkConfig_NetworkConfig_size 20 -#define Config_NetworkConfig_size 163 +#define Config_NetworkConfig_size 161 #define Config_PositionConfig_size 30 #define Config_PowerConfig_size 43 -#define Config_size 166 +#define Config_size 164 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/localonly.pb.h b/src/mesh/generated/localonly.pb.h index 8e4199d48..b691ee408 100644 --- a/src/mesh/generated/localonly.pb.h +++ b/src/mesh/generated/localonly.pb.h @@ -144,7 +144,7 @@ extern const pb_msgdesc_t LocalModuleConfig_msg; #define LocalModuleConfig_fields &LocalModuleConfig_msg /* Maximum encoded size of messages (where known) */ -#define LocalConfig_size 361 +#define LocalConfig_size 359 #define LocalModuleConfig_size 270 #ifdef __cplusplus diff --git a/src/mesh/generated/mesh.pb.c b/src/mesh/generated/mesh.pb.c index 2d46c960c..f98316a5d 100644 --- a/src/mesh/generated/mesh.pb.c +++ b/src/mesh/generated/mesh.pb.c @@ -42,9 +42,6 @@ PB_BIND(FromRadio, FromRadio, 2) PB_BIND(ToRadio, ToRadio, 2) -PB_BIND(ToRadio_PeerInfo, ToRadio_PeerInfo, AUTO) - - PB_BIND(Compressed, Compressed, AUTO) diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h index d4407a2f1..3f2a8839c 100644 --- a/src/mesh/generated/mesh.pb.h +++ b/src/mesh/generated/mesh.pb.h @@ -243,8 +243,11 @@ typedef enum _LogRecord_Level { /* Struct definitions */ typedef PB_BYTES_ARRAY_T(237) Compressed_data_t; +/* Compressed message payload */ typedef struct _Compressed { + /* PortNum to determine the how to handle the compressed payload. */ PortNum portnum; + /* Compressed data. */ Compressed_data_t data; } Compressed; @@ -425,14 +428,6 @@ typedef struct _RouteDiscovery { uint32_t route[8]; } RouteDiscovery; -/* Compressed message payload */ -typedef struct _ToRadio_PeerInfo { - /* PortNum to determine the how to handle the compressed payload. */ - uint32_t app_version; - /* Compressed data. */ - bool mqtt_gateway; -} ToRadio_PeerInfo; - /* Broadcast when a newly powered mesh node wants to find a node num it can use Sent from the phone over bluetooth to set the user id for the owner of this node. Also sent from nodes to each other when a new node signs on (so all clients can have this info) @@ -665,9 +660,6 @@ typedef struct _ToRadio { union { /* Send this packet on the mesh */ MeshPacket packet; - /* Information about the peer, sent after the phone sneds want_config_id. - Old clients do not send this, which is fine. */ - ToRadio_PeerInfo peer_info; /* Phone wants radio to send full node db to the phone, This is typically the first packet sent to the radio when the phone gets a bluetooth connection. The radio will respond by sending back a @@ -740,7 +732,6 @@ extern "C" { #define LogRecord_init_default {"", 0, "", _LogRecord_Level_MIN} #define FromRadio_init_default {0, 0, {MeshPacket_init_default}} #define ToRadio_init_default {0, {MeshPacket_init_default}} -#define ToRadio_PeerInfo_init_default {0, 0} #define Compressed_init_default {_PortNum_MIN, {0, {0}}} #define Position_init_zero {0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #define User_init_zero {"", "", "", {0}, _HardwareModel_MIN, 0} @@ -754,7 +745,6 @@ extern "C" { #define LogRecord_init_zero {"", 0, "", _LogRecord_Level_MIN} #define FromRadio_init_zero {0, 0, {MeshPacket_init_zero}} #define ToRadio_init_zero {0, {MeshPacket_init_zero}} -#define ToRadio_PeerInfo_init_zero {0, 0} #define Compressed_init_zero {_PortNum_MIN, {0, {0}}} /* Field tags (for use in manual encoding/decoding) */ @@ -811,8 +801,6 @@ extern "C" { #define Position_next_update_tag 21 #define Position_seq_number_tag 22 #define RouteDiscovery_route_tag 1 -#define ToRadio_PeerInfo_app_version_tag 1 -#define ToRadio_PeerInfo_mqtt_gateway_tag 2 #define User_id_tag 1 #define User_long_name_tag 2 #define User_short_name_tag 3 @@ -859,7 +847,6 @@ extern "C" { #define FromRadio_moduleConfig_tag 9 #define FromRadio_channel_tag 10 #define ToRadio_packet_tag 1 -#define ToRadio_peer_info_tag 2 #define ToRadio_want_config_id_tag 3 #define ToRadio_disconnect_tag 4 @@ -1019,19 +1006,11 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,channel,channel), 10) #define ToRadio_FIELDLIST(X, a) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,packet,packet), 1) \ -X(a, STATIC, ONEOF, MESSAGE, (payload_variant,peer_info,peer_info), 2) \ X(a, STATIC, ONEOF, UINT32, (payload_variant,want_config_id,want_config_id), 3) \ X(a, STATIC, ONEOF, BOOL, (payload_variant,disconnect,disconnect), 4) #define ToRadio_CALLBACK NULL #define ToRadio_DEFAULT NULL #define ToRadio_payload_variant_packet_MSGTYPE MeshPacket -#define ToRadio_payload_variant_peer_info_MSGTYPE ToRadio_PeerInfo - -#define ToRadio_PeerInfo_FIELDLIST(X, a) \ -X(a, STATIC, SINGULAR, UINT32, app_version, 1) \ -X(a, STATIC, SINGULAR, BOOL, mqtt_gateway, 2) -#define ToRadio_PeerInfo_CALLBACK NULL -#define ToRadio_PeerInfo_DEFAULT NULL #define Compressed_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UENUM, portnum, 1) \ @@ -1051,7 +1030,6 @@ extern const pb_msgdesc_t MyNodeInfo_msg; extern const pb_msgdesc_t LogRecord_msg; extern const pb_msgdesc_t FromRadio_msg; extern const pb_msgdesc_t ToRadio_msg; -extern const pb_msgdesc_t ToRadio_PeerInfo_msg; extern const pb_msgdesc_t Compressed_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ @@ -1067,7 +1045,6 @@ extern const pb_msgdesc_t Compressed_msg; #define LogRecord_fields &LogRecord_msg #define FromRadio_fields &FromRadio_msg #define ToRadio_fields &ToRadio_msg -#define ToRadio_PeerInfo_fields &ToRadio_PeerInfo_msg #define Compressed_fields &Compressed_msg /* Maximum encoded size of messages (where known) */ @@ -1081,7 +1058,6 @@ extern const pb_msgdesc_t Compressed_msg; #define Position_size 137 #define RouteDiscovery_size 40 #define Routing_size 42 -#define ToRadio_PeerInfo_size 8 #define ToRadio_size 324 #define User_size 77 #define Waypoint_size 156