Merge remote-tracking branch 'origin/master' into trying-again

.github/workflows/main_matrix.yml

@@ -2,14 +2,14 @@ name: CI
 on:
   # # Triggers the workflow on push but only for the master branch
   push:
-    branches: [master]
+    branches: [master, develop]
     paths-ignore:
       - "**.md"
       - "version.properties"
 
   # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
   pull_request_target:
-    branches: [master]
+    branches: [master, develop]
     paths-ignore:
       - "**.md"
       #- "**.yml"

src/mesh/generated/config.pb.c

@@ -43,3 +43,4 @@ PB_BIND(Config_BluetoothConfig, Config_BluetoothConfig, AUTO)
 
 
 
+

src/mesh/generated/localonly.pb.h

@@ -150,8 +150,8 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
 #define LocalModuleConfig_fields &LocalModuleConfig_msg
 
 /* Maximum encoded size of messages (where known) */
-#define LocalConfig_size                         363
-#define LocalModuleConfig_size                   294
+#define LocalConfig_size                         359
+#define LocalModuleConfig_size                   270
 
 #ifdef __cplusplus
 } /* extern "C" */