mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-26 01:52:48 +00:00
update protobufs
This commit is contained in:
parent
4c215530f6
commit
ca1e687fd4
@ -1 +1 @@
|
|||||||
Subproject commit a8c022fb719a8e9fc83ad0b51c4dd03a23d82737
|
Subproject commit 6bddcd2647af44cb9997e08871897a3aa2157362
|
@ -52,10 +52,9 @@ typedef enum _Config_PowerConfig_ChargeCurrent {
|
|||||||
} Config_PowerConfig_ChargeCurrent;
|
} Config_PowerConfig_ChargeCurrent;
|
||||||
|
|
||||||
typedef enum _Config_WiFiConfig_WiFiMode {
|
typedef enum _Config_WiFiConfig_WiFiMode {
|
||||||
Config_WiFiConfig_WiFiMode_Disabled = 0,
|
Config_WiFiConfig_WiFiMode_Client = 0,
|
||||||
Config_WiFiConfig_WiFiMode_Client = 1,
|
Config_WiFiConfig_WiFiMode_AccessPoint = 1,
|
||||||
Config_WiFiConfig_WiFiMode_AccessPoint = 2,
|
Config_WiFiConfig_WiFiMode_AccessPointHidden = 2
|
||||||
Config_WiFiConfig_WiFiMode_AccessPointHidden = 3
|
|
||||||
} Config_WiFiConfig_WiFiMode;
|
} Config_WiFiConfig_WiFiMode;
|
||||||
|
|
||||||
typedef enum _Config_DisplayConfig_GpsCoordinateFormat {
|
typedef enum _Config_DisplayConfig_GpsCoordinateFormat {
|
||||||
@ -146,6 +145,7 @@ typedef struct _Config_PowerConfig {
|
|||||||
} Config_PowerConfig;
|
} Config_PowerConfig;
|
||||||
|
|
||||||
typedef struct _Config_WiFiConfig {
|
typedef struct _Config_WiFiConfig {
|
||||||
|
bool enabled;
|
||||||
Config_WiFiConfig_WiFiMode mode;
|
Config_WiFiConfig_WiFiMode mode;
|
||||||
char ssid[33];
|
char ssid[33];
|
||||||
char psk[64];
|
char psk[64];
|
||||||
@ -177,7 +177,7 @@ typedef struct _Config {
|
|||||||
#define _Config_PowerConfig_ChargeCurrent_MAX Config_PowerConfig_ChargeCurrent_MA1320
|
#define _Config_PowerConfig_ChargeCurrent_MAX Config_PowerConfig_ChargeCurrent_MA1320
|
||||||
#define _Config_PowerConfig_ChargeCurrent_ARRAYSIZE ((Config_PowerConfig_ChargeCurrent)(Config_PowerConfig_ChargeCurrent_MA1320+1))
|
#define _Config_PowerConfig_ChargeCurrent_ARRAYSIZE ((Config_PowerConfig_ChargeCurrent)(Config_PowerConfig_ChargeCurrent_MA1320+1))
|
||||||
|
|
||||||
#define _Config_WiFiConfig_WiFiMode_MIN Config_WiFiConfig_WiFiMode_Disabled
|
#define _Config_WiFiConfig_WiFiMode_MIN Config_WiFiConfig_WiFiMode_Client
|
||||||
#define _Config_WiFiConfig_WiFiMode_MAX Config_WiFiConfig_WiFiMode_AccessPointHidden
|
#define _Config_WiFiConfig_WiFiMode_MAX Config_WiFiConfig_WiFiMode_AccessPointHidden
|
||||||
#define _Config_WiFiConfig_WiFiMode_ARRAYSIZE ((Config_WiFiConfig_WiFiMode)(Config_WiFiConfig_WiFiMode_AccessPointHidden+1))
|
#define _Config_WiFiConfig_WiFiMode_ARRAYSIZE ((Config_WiFiConfig_WiFiMode)(Config_WiFiConfig_WiFiMode_AccessPointHidden+1))
|
||||||
|
|
||||||
@ -203,14 +203,14 @@ extern "C" {
|
|||||||
#define Config_DeviceConfig_init_default {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""}
|
#define Config_DeviceConfig_init_default {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""}
|
||||||
#define Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0}
|
#define Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0}
|
||||||
#define Config_PowerConfig_init_default {_Config_PowerConfig_ChargeCurrent_MIN, 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}
|
||||||
#define Config_WiFiConfig_init_default {_Config_WiFiConfig_WiFiMode_MIN, "", ""}
|
#define Config_WiFiConfig_init_default {0, _Config_WiFiConfig_WiFiMode_MIN, "", ""}
|
||||||
#define Config_DisplayConfig_init_default {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0}
|
#define Config_DisplayConfig_init_default {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 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_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_init_zero {0, {Config_DeviceConfig_init_zero}}
|
||||||
#define Config_DeviceConfig_init_zero {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""}
|
#define Config_DeviceConfig_init_zero {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""}
|
||||||
#define Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0}
|
#define Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0}
|
||||||
#define Config_PowerConfig_init_zero {_Config_PowerConfig_ChargeCurrent_MIN, 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}
|
||||||
#define Config_WiFiConfig_init_zero {_Config_WiFiConfig_WiFiMode_MIN, "", ""}
|
#define Config_WiFiConfig_init_zero {0, _Config_WiFiConfig_WiFiMode_MIN, "", ""}
|
||||||
#define Config_DisplayConfig_init_zero {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0}
|
#define Config_DisplayConfig_init_zero {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 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}}
|
#define Config_LoRaConfig_init_zero {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, {0, 0, 0}}
|
||||||
|
|
||||||
@ -250,9 +250,10 @@ extern "C" {
|
|||||||
#define Config_PowerConfig_sds_secs_tag 10
|
#define Config_PowerConfig_sds_secs_tag 10
|
||||||
#define Config_PowerConfig_ls_secs_tag 11
|
#define Config_PowerConfig_ls_secs_tag 11
|
||||||
#define Config_PowerConfig_min_wake_secs_tag 12
|
#define Config_PowerConfig_min_wake_secs_tag 12
|
||||||
#define Config_WiFiConfig_mode_tag 1
|
#define Config_WiFiConfig_enabled_tag 1
|
||||||
#define Config_WiFiConfig_ssid_tag 2
|
#define Config_WiFiConfig_mode_tag 2
|
||||||
#define Config_WiFiConfig_psk_tag 3
|
#define Config_WiFiConfig_ssid_tag 3
|
||||||
|
#define Config_WiFiConfig_psk_tag 4
|
||||||
#define Config_device_tag 1
|
#define Config_device_tag 1
|
||||||
#define Config_position_tag 2
|
#define Config_position_tag 2
|
||||||
#define Config_power_tag 3
|
#define Config_power_tag 3
|
||||||
@ -311,9 +312,10 @@ X(a, STATIC, SINGULAR, UINT32, min_wake_secs, 12)
|
|||||||
#define Config_PowerConfig_DEFAULT NULL
|
#define Config_PowerConfig_DEFAULT NULL
|
||||||
|
|
||||||
#define Config_WiFiConfig_FIELDLIST(X, a) \
|
#define Config_WiFiConfig_FIELDLIST(X, a) \
|
||||||
X(a, STATIC, SINGULAR, UENUM, mode, 1) \
|
X(a, STATIC, SINGULAR, BOOL, enabled, 1) \
|
||||||
X(a, STATIC, SINGULAR, STRING, ssid, 2) \
|
X(a, STATIC, SINGULAR, UENUM, mode, 2) \
|
||||||
X(a, STATIC, SINGULAR, STRING, psk, 3)
|
X(a, STATIC, SINGULAR, STRING, ssid, 3) \
|
||||||
|
X(a, STATIC, SINGULAR, STRING, psk, 4)
|
||||||
#define Config_WiFiConfig_CALLBACK NULL
|
#define Config_WiFiConfig_CALLBACK NULL
|
||||||
#define Config_WiFiConfig_DEFAULT NULL
|
#define Config_WiFiConfig_DEFAULT NULL
|
||||||
|
|
||||||
@ -362,8 +364,8 @@ extern const pb_msgdesc_t Config_LoRaConfig_msg;
|
|||||||
#define Config_LoRaConfig_size 67
|
#define Config_LoRaConfig_size 67
|
||||||
#define Config_PositionConfig_size 30
|
#define Config_PositionConfig_size 30
|
||||||
#define Config_PowerConfig_size 45
|
#define Config_PowerConfig_size 45
|
||||||
#define Config_WiFiConfig_size 101
|
#define Config_WiFiConfig_size 103
|
||||||
#define Config_size 103
|
#define Config_size 105
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
|
@ -138,7 +138,7 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
|
|||||||
#define LocalModuleConfig_fields &LocalModuleConfig_msg
|
#define LocalModuleConfig_fields &LocalModuleConfig_msg
|
||||||
|
|
||||||
/* Maximum encoded size of messages (where known) */
|
/* Maximum encoded size of messages (where known) */
|
||||||
#define LocalConfig_size 319
|
#define LocalConfig_size 321
|
||||||
#define LocalModuleConfig_size 268
|
#define LocalModuleConfig_size 268
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
Loading…
Reference in New Issue
Block a user