pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-26 09:59:01 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into potential-sx1262-fix

Browse Source
This commit is contained in:
Ben Meadors 2022-11-26 09:07:59 -06:00 committed by GitHub
commit a703ab4418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitmodules vendored
View File

@ -1,4 +1,3 @@
[submodule "protobufs"] [submodule "protobufs"]
path = protobufs path = protobufs
url = https://github.com/meshtastic/protobufs.git url = https://github.com/meshtastic/protobufs.git
branch = develop

2
protobufs

@ -1 +1 @@
Subproject commit 3aca01ac82487de8aa3d5eefdd907b4d80714501 Subproject commit afa4605699e9ba9e2d0f0407bbc32dcd133f76af

2
src/mesh/generated/localonly.pb.h
View File

@ -151,7 +151,7 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
/* Maximum encoded size of messages (where known) */ /* Maximum encoded size of messages (where known) */
#define LocalConfig_size 385 #define LocalConfig_size 385
#define LocalModuleConfig_size 296 #define LocalModuleConfig_size 361
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

8
src/mesh/generated/module_config.pb.h
View File

@ -96,8 +96,8 @@ typedef struct _ModuleConfig_ExternalNotificationConfig {
typedef struct _ModuleConfig_MQTTConfig { typedef struct _ModuleConfig_MQTTConfig {
bool enabled; bool enabled;
char address[32]; char address[32];
char username[32]; char username[64];
char password[32]; char password[64];
bool encryption_enabled; bool encryption_enabled;
bool json_enabled; bool json_enabled;
} ModuleConfig_MQTTConfig; } ModuleConfig_MQTTConfig;
@ -386,12 +386,12 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg;
#define ModuleConfig_AudioConfig_size 22 #define ModuleConfig_AudioConfig_size 22
#define ModuleConfig_CannedMessageConfig_size 49 #define ModuleConfig_CannedMessageConfig_size 49
#define ModuleConfig_ExternalNotificationConfig_size 22 #define ModuleConfig_ExternalNotificationConfig_size 22
#define ModuleConfig_MQTTConfig_size 105 #define ModuleConfig_MQTTConfig_size 169
#define ModuleConfig_RangeTestConfig_size 10 #define ModuleConfig_RangeTestConfig_size 10
#define ModuleConfig_SerialConfig_size 26 #define ModuleConfig_SerialConfig_size 26
#define ModuleConfig_StoreForwardConfig_size 22 #define ModuleConfig_StoreForwardConfig_size 22
#define ModuleConfig_TelemetryConfig_size 18 #define ModuleConfig_TelemetryConfig_size 18
#define ModuleConfig_size 107 #define ModuleConfig_size 172
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */