From a5ba3dd44567d96b92596a5c63d347b386a4fdf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Sat, 26 Nov 2022 16:03:17 +0100 Subject: [PATCH 1/2] revert protobuf change to develop --- .gitmodules | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 238eda7de..e6f376a0b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ [submodule "protobufs"] path = protobufs url = https://github.com/meshtastic/protobufs.git - branch = develop From 7c9cada50e4ac77937c10661d4413cc84a5cdec9 Mon Sep 17 00:00:00 2001 From: caveman99 Date: Sat, 26 Nov 2022 15:04:12 +0000 Subject: [PATCH 2/2] [create-pull-request] automated change --- protobufs | 2 +- src/mesh/generated/localonly.pb.h | 2 +- src/mesh/generated/module_config.pb.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/protobufs b/protobufs index 3aca01ac8..afa460569 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 3aca01ac82487de8aa3d5eefdd907b4d80714501 +Subproject commit afa4605699e9ba9e2d0f0407bbc32dcd133f76af diff --git a/src/mesh/generated/localonly.pb.h b/src/mesh/generated/localonly.pb.h index f2c12b104..054cae4db 100644 --- a/src/mesh/generated/localonly.pb.h +++ b/src/mesh/generated/localonly.pb.h @@ -151,7 +151,7 @@ extern const pb_msgdesc_t LocalModuleConfig_msg; /* Maximum encoded size of messages (where known) */ #define LocalConfig_size 385 -#define LocalModuleConfig_size 296 +#define LocalModuleConfig_size 361 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/module_config.pb.h b/src/mesh/generated/module_config.pb.h index d4e54642a..12018203e 100644 --- a/src/mesh/generated/module_config.pb.h +++ b/src/mesh/generated/module_config.pb.h @@ -96,8 +96,8 @@ typedef struct _ModuleConfig_ExternalNotificationConfig { typedef struct _ModuleConfig_MQTTConfig { bool enabled; char address[32]; - char username[32]; - char password[32]; + char username[64]; + char password[64]; bool encryption_enabled; bool json_enabled; } ModuleConfig_MQTTConfig; @@ -386,12 +386,12 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg; #define ModuleConfig_AudioConfig_size 22 #define ModuleConfig_CannedMessageConfig_size 49 #define ModuleConfig_ExternalNotificationConfig_size 22 -#define ModuleConfig_MQTTConfig_size 105 +#define ModuleConfig_MQTTConfig_size 169 #define ModuleConfig_RangeTestConfig_size 10 #define ModuleConfig_SerialConfig_size 26 #define ModuleConfig_StoreForwardConfig_size 22 #define ModuleConfig_TelemetryConfig_size 18 -#define ModuleConfig_size 107 +#define ModuleConfig_size 172 #ifdef __cplusplus } /* extern "C" */