From cb26bc38716c9fef9d615456a8f69ca713849d9a Mon Sep 17 00:00:00 2001 From: caveman99 Date: Sat, 22 Oct 2022 14:18:18 +0000 Subject: [PATCH] [create-pull-request] automated change --- protobufs | 2 +- src/mesh/generated/config.pb.c | 4 ++ src/mesh/generated/config.pb.h | 78 ++++++++++++++++++++++++------- src/mesh/generated/localonly.pb.h | 2 +- src/mesh/generated/mesh.pb.h | 2 +- 5 files changed, 68 insertions(+), 20 deletions(-) diff --git a/protobufs b/protobufs index d0559bfa3..863a1d799 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit d0559bfa3c31023ed2f2aa3807b6a0a1da9a6feb +Subproject commit 863a1d7997ae54471cbeea9baeb877924cc850cf diff --git a/src/mesh/generated/config.pb.c b/src/mesh/generated/config.pb.c index 7d2efe91d..f29dd7012 100644 --- a/src/mesh/generated/config.pb.c +++ b/src/mesh/generated/config.pb.c @@ -21,6 +21,9 @@ PB_BIND(Config_PowerConfig, Config_PowerConfig, AUTO) PB_BIND(Config_NetworkConfig, Config_NetworkConfig, AUTO) +PB_BIND(Config_NetworkConfig_NetworkConfig, Config_NetworkConfig_NetworkConfig, AUTO) + + PB_BIND(Config_DisplayConfig, Config_DisplayConfig, AUTO) @@ -39,3 +42,4 @@ PB_BIND(Config_BluetoothConfig, Config_BluetoothConfig, AUTO) + diff --git a/src/mesh/generated/config.pb.h b/src/mesh/generated/config.pb.h index 940771580..e98aff60a 100644 --- a/src/mesh/generated/config.pb.h +++ b/src/mesh/generated/config.pb.h @@ -37,6 +37,11 @@ typedef enum _Config_NetworkConfig_WiFiMode { Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN = 2 } Config_NetworkConfig_WiFiMode; +typedef enum _Config_NetworkConfig_EthMode { + Config_NetworkConfig_EthMode_DHCP = 0, + Config_NetworkConfig_EthMode_STATIC = 1 +} Config_NetworkConfig_EthMode; + typedef enum _Config_DisplayConfig_GpsCoordinateFormat { Config_DisplayConfig_GpsCoordinateFormat_DEC = 0, Config_DisplayConfig_GpsCoordinateFormat_DMS = 1, @@ -122,13 +127,12 @@ typedef struct _Config_LoRaConfig { uint32_t ignore_incoming[3]; } Config_LoRaConfig; -typedef struct _Config_NetworkConfig { - bool wifi_enabled; - Config_NetworkConfig_WiFiMode wifi_mode; - char wifi_ssid[33]; - char wifi_psk[64]; - char ntp_server[33]; -} Config_NetworkConfig; +typedef struct _Config_NetworkConfig_NetworkConfig { + uint32_t ip; + uint32_t gateway; + uint32_t subnet; + uint32_t dns; +} Config_NetworkConfig_NetworkConfig; typedef struct _Config_PositionConfig { uint32_t position_broadcast_secs; @@ -151,6 +155,18 @@ typedef struct _Config_PowerConfig { uint32_t min_wake_secs; } 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]; + bool eth_enabled; + Config_NetworkConfig_EthMode eth_mode; + bool has_eth_config; + Config_NetworkConfig_NetworkConfig eth_config; +} Config_NetworkConfig; + typedef struct _Config { pb_size_t which_payload_variant; union { @@ -178,6 +194,10 @@ typedef struct _Config { #define _Config_NetworkConfig_WiFiMode_MAX Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN #define _Config_NetworkConfig_WiFiMode_ARRAYSIZE ((Config_NetworkConfig_WiFiMode)(Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN+1)) +#define _Config_NetworkConfig_EthMode_MIN Config_NetworkConfig_EthMode_DHCP +#define _Config_NetworkConfig_EthMode_MAX Config_NetworkConfig_EthMode_STATIC +#define _Config_NetworkConfig_EthMode_ARRAYSIZE ((Config_NetworkConfig_EthMode)(Config_NetworkConfig_EthMode_STATIC+1)) + #define _Config_DisplayConfig_GpsCoordinateFormat_MIN Config_DisplayConfig_GpsCoordinateFormat_DEC #define _Config_DisplayConfig_GpsCoordinateFormat_MAX Config_DisplayConfig_GpsCoordinateFormat_OSGR #define _Config_DisplayConfig_GpsCoordinateFormat_ARRAYSIZE ((Config_DisplayConfig_GpsCoordinateFormat)(Config_DisplayConfig_GpsCoordinateFormat_OSGR+1)) @@ -208,7 +228,8 @@ 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, "", "", ""} +#define Config_NetworkConfig_init_default {0, _Config_NetworkConfig_WiFiMode_MIN, "", "", "", 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}} #define Config_BluetoothConfig_init_default {0, _Config_BluetoothConfig_PairingMode_MIN, 0} @@ -216,7 +237,8 @@ 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, "", "", ""} +#define Config_NetworkConfig_init_zero {0, _Config_NetworkConfig_WiFiMode_MIN, "", "", "", 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}} #define Config_BluetoothConfig_init_zero {0, _Config_BluetoothConfig_PairingMode_MIN, 0} @@ -246,11 +268,10 @@ extern "C" { #define Config_LoRaConfig_tx_power_tag 10 #define Config_LoRaConfig_channel_num_tag 11 #define Config_LoRaConfig_ignore_incoming_tag 103 -#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 +#define Config_NetworkConfig_NetworkConfig_ip_tag 1 +#define Config_NetworkConfig_NetworkConfig_gateway_tag 2 +#define Config_NetworkConfig_NetworkConfig_subnet_tag 3 +#define Config_NetworkConfig_NetworkConfig_dns_tag 4 #define Config_PositionConfig_position_broadcast_secs_tag 1 #define Config_PositionConfig_position_broadcast_smart_enabled_tag 2 #define Config_PositionConfig_fixed_position_tag 3 @@ -266,6 +287,14 @@ extern "C" { #define Config_PowerConfig_sds_secs_tag 6 #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 +#define Config_NetworkConfig_eth_enabled_tag 6 +#define Config_NetworkConfig_eth_mode_tag 7 +#define Config_NetworkConfig_eth_config_tag 8 #define Config_device_tag 1 #define Config_position_tag 2 #define Config_power_tag 3 @@ -328,9 +357,21 @@ 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) +X(a, STATIC, SINGULAR, STRING, ntp_server, 5) \ +X(a, STATIC, SINGULAR, BOOL, eth_enabled, 6) \ +X(a, STATIC, SINGULAR, UENUM, eth_mode, 7) \ +X(a, STATIC, OPTIONAL, MESSAGE, eth_config, 8) #define Config_NetworkConfig_CALLBACK NULL #define Config_NetworkConfig_DEFAULT NULL +#define Config_NetworkConfig_eth_config_MSGTYPE Config_NetworkConfig_NetworkConfig + +#define Config_NetworkConfig_NetworkConfig_FIELDLIST(X, a) \ +X(a, STATIC, SINGULAR, FIXED32, ip, 1) \ +X(a, STATIC, SINGULAR, FIXED32, gateway, 2) \ +X(a, STATIC, SINGULAR, FIXED32, subnet, 3) \ +X(a, STATIC, SINGULAR, FIXED32, dns, 4) +#define Config_NetworkConfig_NetworkConfig_CALLBACK NULL +#define Config_NetworkConfig_NetworkConfig_DEFAULT NULL #define Config_DisplayConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UINT32, screen_on_secs, 1) \ @@ -370,6 +411,7 @@ extern const pb_msgdesc_t Config_DeviceConfig_msg; extern const pb_msgdesc_t Config_PositionConfig_msg; extern const pb_msgdesc_t Config_PowerConfig_msg; extern const pb_msgdesc_t Config_NetworkConfig_msg; +extern const pb_msgdesc_t Config_NetworkConfig_NetworkConfig_msg; extern const pb_msgdesc_t Config_DisplayConfig_msg; extern const pb_msgdesc_t Config_LoRaConfig_msg; extern const pb_msgdesc_t Config_BluetoothConfig_msg; @@ -380,6 +422,7 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg; #define Config_PositionConfig_fields &Config_PositionConfig_msg #define Config_PowerConfig_fields &Config_PowerConfig_msg #define Config_NetworkConfig_fields &Config_NetworkConfig_msg +#define Config_NetworkConfig_NetworkConfig_fields &Config_NetworkConfig_NetworkConfig_msg #define Config_DisplayConfig_fields &Config_DisplayConfig_msg #define Config_LoRaConfig_fields &Config_LoRaConfig_msg #define Config_BluetoothConfig_fields &Config_BluetoothConfig_msg @@ -389,10 +432,11 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg; #define Config_DeviceConfig_size 6 #define Config_DisplayConfig_size 20 #define Config_LoRaConfig_size 68 -#define Config_NetworkConfig_size 137 +#define Config_NetworkConfig_NetworkConfig_size 20 +#define Config_NetworkConfig_size 163 #define Config_PositionConfig_size 30 #define Config_PowerConfig_size 43 -#define Config_size 140 +#define Config_size 166 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/localonly.pb.h b/src/mesh/generated/localonly.pb.h index d4c5fb012..8e4199d48 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 335 +#define LocalConfig_size 361 #define LocalModuleConfig_size 270 #ifdef __cplusplus diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h index ee72ff504..d4407a2f1 100644 --- a/src/mesh/generated/mesh.pb.h +++ b/src/mesh/generated/mesh.pb.h @@ -352,7 +352,7 @@ typedef struct _MyNodeInfo { /* a gps position */ typedef struct _Position { - /* The new preferred location encoding, divide by 1e-7 to get degrees + /* The new preferred location encoding, multiply by 1e-7 to get degrees in floating point */ int32_t latitude_i; /* TODO: REPLACE */