pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-26 22:33:24 +00:00
Code Issues Actions3 Packages Projects Releases Wiki Activity

Merge pull request from meshtastic/create-pull-request/patch

Browse Source 
Changes by create-pull-request action
This commit is contained in:
Thomas Göttgens 2022-09-09 12:04:43 +02:00 committed by GitHub
commit 0c46ad91ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 28 deletions

2
protobufs

@ -1 +1 @@
Subproject commit e72af95951ba4664f34374de492469a024dc64c5 Subproject commit fdfa8209ca51020dc4f46ec5598c50fb205e8201

7
src/mesh/generated/admin.pb.h
View File

@ -199,12 +199,7 @@ extern const pb_msgdesc_t AdminMessage_msg;
#define AdminMessage_fields &AdminMessage_msg #define AdminMessage_fields &AdminMessage_msg
/* Maximum encoded size of messages (where known) */ /* Maximum encoded size of messages (where known) */
#if defined(Config_size) && defined(Config_size) #define AdminMessage_size 204
union AdminMessage_payload_variant_size_union {char f6[(6 + Config_size)]; char f34[(7 + Config_size)]; char f0[204];};
#endif
#if defined(Config_size) && defined(Config_size)
#define AdminMessage_size (0 + sizeof(union AdminMessage_payload_variant_size_union))
#endif
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

22
src/mesh/generated/config.pb.h
View File

@ -115,9 +115,9 @@ typedef struct _Config_LoRaConfig {
typedef struct _Config_NetworkConfig { typedef struct _Config_NetworkConfig {
bool wifi_enabled; bool wifi_enabled;
Config_NetworkConfig_WiFiMode wifi_mode; Config_NetworkConfig_WiFiMode wifi_mode;
pb_callback_t wifi_ssid; char wifi_ssid[33];
pb_callback_t wifi_psk; char wifi_psk[64];
pb_callback_t ntp_server; char ntp_server[33];
} Config_NetworkConfig; } Config_NetworkConfig;
typedef struct _Config_PositionConfig { typedef struct _Config_PositionConfig {
@ -194,7 +194,7 @@ extern "C" {
#define Config_DeviceConfig_init_default {_Config_DeviceConfig_Role_MIN, 0, 0} #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_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_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0}
#define Config_NetworkConfig_init_default {0, _Config_NetworkConfig_WiFiMode_MIN, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}} #define Config_NetworkConfig_init_default {0, _Config_NetworkConfig_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_BluetoothConfig_init_default {0, _Config_BluetoothConfig_PairingMode_MIN, 0} #define Config_BluetoothConfig_init_default {0, _Config_BluetoothConfig_PairingMode_MIN, 0}
@ -202,7 +202,7 @@ extern "C" {
#define Config_DeviceConfig_init_zero {_Config_DeviceConfig_Role_MIN, 0, 0} #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_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_PowerConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0}
#define Config_NetworkConfig_init_zero {0, _Config_NetworkConfig_WiFiMode_MIN, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}} #define Config_NetworkConfig_init_zero {0, _Config_NetworkConfig_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}}
#define Config_BluetoothConfig_init_zero {0, _Config_BluetoothConfig_PairingMode_MIN, 0} #define Config_BluetoothConfig_init_zero {0, _Config_BluetoothConfig_PairingMode_MIN, 0}
@ -308,10 +308,10 @@ X(a, STATIC, SINGULAR, UINT32, min_wake_secs, 8)
#define Config_NetworkConfig_FIELDLIST(X, a) \ #define Config_NetworkConfig_FIELDLIST(X, a) \
X(a, STATIC, SINGULAR, BOOL, wifi_enabled, 1) \ X(a, STATIC, SINGULAR, BOOL, wifi_enabled, 1) \
X(a, STATIC, SINGULAR, UENUM, wifi_mode, 2) \ X(a, STATIC, SINGULAR, UENUM, wifi_mode, 2) \
X(a, CALLBACK, SINGULAR, STRING, wifi_ssid, 3) \ X(a, STATIC, SINGULAR, STRING, wifi_ssid, 3) \
X(a, CALLBACK, SINGULAR, STRING, wifi_psk, 4) \ X(a, STATIC, SINGULAR, STRING, wifi_psk, 4) \
X(a, CALLBACK, SINGULAR, STRING, ntp_server, 5) X(a, STATIC, SINGULAR, STRING, ntp_server, 5)
#define Config_NetworkConfig_CALLBACK pb_default_field_callback #define Config_NetworkConfig_CALLBACK NULL
#define Config_NetworkConfig_DEFAULT NULL #define Config_NetworkConfig_DEFAULT NULL
#define Config_DisplayConfig_FIELDLIST(X, a) \ #define Config_DisplayConfig_FIELDLIST(X, a) \
@ -363,14 +363,14 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg;
#define Config_BluetoothConfig_fields &Config_BluetoothConfig_msg #define Config_BluetoothConfig_fields &Config_BluetoothConfig_msg
/* Maximum encoded size of messages (where known) */ /* Maximum encoded size of messages (where known) */
/* Config_size depends on runtime parameters */
/* Config_NetworkConfig_size depends on runtime parameters */
#define Config_BluetoothConfig_size 10 #define Config_BluetoothConfig_size 10
#define Config_DeviceConfig_size 6 #define Config_DeviceConfig_size 6
#define Config_DisplayConfig_size 16 #define Config_DisplayConfig_size 16
#define Config_LoRaConfig_size 67 #define Config_LoRaConfig_size 67
#define Config_NetworkConfig_size 137
#define Config_PositionConfig_size 30 #define Config_PositionConfig_size 30
#define Config_PowerConfig_size 43 #define Config_PowerConfig_size 43
#define Config_size 140
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

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

@ -6,7 +6,7 @@
#error Regenerate this file with the current version of nanopb generator. #error Regenerate this file with the current version of nanopb generator.
#endif #endif
PB_BIND(LocalConfig, LocalConfig, AUTO) PB_BIND(LocalConfig, LocalConfig, 2)
PB_BIND(LocalModuleConfig, LocalModuleConfig, 2) PB_BIND(LocalModuleConfig, LocalModuleConfig, 2)

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

@ -144,9 +144,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) */
#if defined(Config_NetworkConfig_size) #define LocalConfig_size 330
#define LocalConfig_size (196 + Config_NetworkConfig_size)
#endif
#define LocalModuleConfig_size 270 #define LocalModuleConfig_size 270
#ifdef __cplusplus #ifdef __cplusplus

7
src/mesh/generated/mesh.pb.h
View File

@ -1065,11 +1065,9 @@ extern const pb_msgdesc_t Compressed_msg;
#define Compressed_fields &Compressed_msg #define Compressed_fields &Compressed_msg
/* Maximum encoded size of messages (where known) */ /* Maximum encoded size of messages (where known) */
#if defined(Config_size)
union FromRadio_payload_variant_size_union {char f5[(6 + Config_size)]; char f0[324];};
#endif
#define Compressed_size 243 #define Compressed_size 243
#define Data_size 270 #define Data_size 270
#define FromRadio_size 330
#define LogRecord_size 81 #define LogRecord_size 81
#define MeshPacket_size 321 #define MeshPacket_size 321
#define MyNodeInfo_size 179 #define MyNodeInfo_size 179
@ -1081,9 +1079,6 @@ union FromRadio_payload_variant_size_union {char f5[(6 + Config_size)]; char f0[
#define ToRadio_size 324 #define ToRadio_size 324
#define User_size 77 #define User_size 77
#define Waypoint_size 156 #define Waypoint_size 156
#if defined(Config_size)
#define FromRadio_size (6 + sizeof(union FromRadio_payload_variant_size_union))
#endif
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */