From 22764425f7ddf165cdcdd28d8558a0b5bf897354 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sat, 21 May 2022 17:10:24 -0700 Subject: [PATCH 1/3] updating proto submodule to latest --- proto | 1 + 1 file changed, 1 insertion(+) create mode 160000 proto diff --git a/proto b/proto new file mode 160000 index 00000000..ebc270f1 --- /dev/null +++ b/proto @@ -0,0 +1 @@ +Subproject commit ebc270f10558cc4537d1b60f2f03d759167f4d08 From b1f309545ed4283869147d648fdfaf99959309a9 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sat, 21 May 2022 17:39:50 -0700 Subject: [PATCH 2/3] Delete proto --- proto | 1 - 1 file changed, 1 deletion(-) delete mode 160000 proto diff --git a/proto b/proto deleted file mode 160000 index ebc270f1..00000000 --- a/proto +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ebc270f10558cc4537d1b60f2f03d759167f4d08 From 2e45d4f0fd188b3b41f6fc6ddae9594eabe699a6 Mon Sep 17 00:00:00 2001 From: mc-hamster Date: Sun, 22 May 2022 00:44:37 +0000 Subject: [PATCH 3/3] [create-pull-request] automated change --- protobufs | 2 +- src/mesh/generated/config.pb.h | 13 ++++++++----- src/mesh/generated/deviceonly.pb.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/protobufs b/protobufs index 30584d84..ebc270f1 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 30584d849812640500a8fc1b5396eb807bbd28ff +Subproject commit ebc270f10558cc4537d1b60f2f03d759167f4d08 diff --git a/src/mesh/generated/config.pb.h b/src/mesh/generated/config.pb.h index 63b94497..39d51d3d 100644 --- a/src/mesh/generated/config.pb.h +++ b/src/mesh/generated/config.pb.h @@ -144,6 +144,7 @@ typedef struct _Config_WiFiConfig { char ssid[33]; char psk[64]; bool ap_mode; + bool ap_hidden; } Config_WiFiConfig; typedef struct _Config { @@ -195,14 +196,14 @@ extern "C" { #define Config_DeviceConfig_init_default {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""} #define Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0} #define Config_PowerConfig_init_default {_Config_PowerConfig_ChargeCurrent_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} -#define Config_WiFiConfig_init_default {"", "", 0} +#define Config_WiFiConfig_init_default {"", "", 0, 0} #define Config_DisplayConfig_init_default {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0} #define Config_LoRaConfig_init_default {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, {0, 0, 0}} #define Config_init_zero {0, {Config_DeviceConfig_init_zero}} #define Config_DeviceConfig_init_zero {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""} #define Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0} #define Config_PowerConfig_init_zero {_Config_PowerConfig_ChargeCurrent_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} -#define Config_WiFiConfig_init_zero {"", "", 0} +#define Config_WiFiConfig_init_zero {"", "", 0, 0} #define Config_DisplayConfig_init_zero {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0} #define Config_LoRaConfig_init_zero {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, {0, 0, 0}} @@ -249,6 +250,7 @@ extern "C" { #define Config_WiFiConfig_ssid_tag 1 #define Config_WiFiConfig_psk_tag 2 #define Config_WiFiConfig_ap_mode_tag 3 +#define Config_WiFiConfig_ap_hidden_tag 4 #define Config_device_tag 1 #define Config_position_tag 2 #define Config_power_tag 3 @@ -314,7 +316,8 @@ X(a, STATIC, SINGULAR, UINT32, min_wake_secs, 12) #define Config_WiFiConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, STRING, ssid, 1) \ X(a, STATIC, SINGULAR, STRING, psk, 2) \ -X(a, STATIC, SINGULAR, BOOL, ap_mode, 3) +X(a, STATIC, SINGULAR, BOOL, ap_mode, 3) \ +X(a, STATIC, SINGULAR, BOOL, ap_hidden, 4) #define Config_WiFiConfig_CALLBACK NULL #define Config_WiFiConfig_DEFAULT NULL @@ -362,8 +365,8 @@ extern const pb_msgdesc_t Config_LoRaConfig_msg; #define Config_LoRaConfig_size 67 #define Config_PositionConfig_size 38 #define Config_PowerConfig_size 55 -#define Config_WiFiConfig_size 101 -#define Config_size 103 +#define Config_WiFiConfig_size 103 +#define Config_size 105 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/deviceonly.pb.h b/src/mesh/generated/deviceonly.pb.h index 9844bb70..b0fe9220 100644 --- a/src/mesh/generated/deviceonly.pb.h +++ b/src/mesh/generated/deviceonly.pb.h @@ -208,7 +208,7 @@ extern const pb_msgdesc_t LocalConfig_msg; /* Maximum encoded size of messages (where known) */ #define ChannelFile_size 624 #define DeviceState_size 19184 -#define LocalConfig_size 329 +#define LocalConfig_size 331 #define OEMStore_size 2106 #ifdef __cplusplus