From 32e5ced814a0713cdff6dbf17e23cfd5f7912da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 24 Nov 2022 09:22:50 +0100 Subject: [PATCH] regen protos --- protobufs | 2 +- src/mesh/generated/config.pb.h | 28 +++++++++++++++++++-------- src/mesh/generated/localonly.pb.h | 4 ++-- src/mesh/generated/module_config.pb.h | 11 +++++++---- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/protobufs b/protobufs index 24874086..3aca01ac 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 24874086e392b0ec504f9f89137e7b7f8b5bfcbd +Subproject commit 3aca01ac82487de8aa3d5eefdd907b4d80714501 diff --git a/src/mesh/generated/config.pb.h b/src/mesh/generated/config.pb.h index 9748383c..2d6f3a1d 100644 --- a/src/mesh/generated/config.pb.h +++ b/src/mesh/generated/config.pb.h @@ -100,6 +100,8 @@ typedef struct _Config_DeviceConfig { Config_DeviceConfig_Role role; bool serial_enabled; bool debug_log_enabled; + uint32_t button_gpio; + uint32_t buzzer_gpio; } Config_DeviceConfig; typedef struct _Config_DisplayConfig { @@ -143,6 +145,8 @@ typedef struct _Config_PositionConfig { uint32_t gps_update_interval; uint32_t gps_attempt_time; uint32_t position_flags; + uint32_t rx_gpio; + uint32_t tx_gpio; } Config_PositionConfig; typedef struct _Config_PowerConfig { @@ -225,8 +229,8 @@ extern "C" { /* Initializer values for message structs */ #define Config_init_default {0, {Config_DeviceConfig_init_default}} -#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_DeviceConfig_init_default {_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0} +#define Config_PositionConfig_init_default {0, 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, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_IpV4Config_init_default} #define Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0} @@ -234,8 +238,8 @@ extern "C" { #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} #define Config_init_zero {0, {Config_DeviceConfig_init_zero}} -#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_DeviceConfig_init_zero {_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0} +#define Config_PositionConfig_init_zero {0, 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, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_IpV4Config_init_zero} #define Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0} @@ -250,6 +254,8 @@ extern "C" { #define Config_DeviceConfig_role_tag 1 #define Config_DeviceConfig_serial_enabled_tag 2 #define Config_DeviceConfig_debug_log_enabled_tag 3 +#define Config_DeviceConfig_button_gpio_tag 4 +#define Config_DeviceConfig_buzzer_gpio_tag 5 #define Config_DisplayConfig_screen_on_secs_tag 1 #define Config_DisplayConfig_gps_format_tag 2 #define Config_DisplayConfig_auto_screen_carousel_secs_tag 3 @@ -280,6 +286,8 @@ extern "C" { #define Config_PositionConfig_gps_update_interval_tag 5 #define Config_PositionConfig_gps_attempt_time_tag 6 #define Config_PositionConfig_position_flags_tag 7 +#define Config_PositionConfig_rx_gpio_tag 8 +#define Config_PositionConfig_tx_gpio_tag 9 #define Config_PowerConfig_is_power_saving_tag 1 #define Config_PowerConfig_on_battery_shutdown_after_secs_tag 2 #define Config_PowerConfig_adc_multiplier_override_tag 3 @@ -325,7 +333,9 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,bluetooth,payload_variant.bl #define Config_DeviceConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, UENUM, role, 1) \ X(a, STATIC, SINGULAR, BOOL, serial_enabled, 2) \ -X(a, STATIC, SINGULAR, BOOL, debug_log_enabled, 3) +X(a, STATIC, SINGULAR, BOOL, debug_log_enabled, 3) \ +X(a, STATIC, SINGULAR, UINT32, button_gpio, 4) \ +X(a, STATIC, SINGULAR, UINT32, buzzer_gpio, 5) #define Config_DeviceConfig_CALLBACK NULL #define Config_DeviceConfig_DEFAULT NULL @@ -336,7 +346,9 @@ X(a, STATIC, SINGULAR, BOOL, fixed_position, 3) \ X(a, STATIC, SINGULAR, BOOL, gps_enabled, 4) \ X(a, STATIC, SINGULAR, UINT32, gps_update_interval, 5) \ X(a, STATIC, SINGULAR, UINT32, gps_attempt_time, 6) \ -X(a, STATIC, SINGULAR, UINT32, position_flags, 7) +X(a, STATIC, SINGULAR, UINT32, position_flags, 7) \ +X(a, STATIC, SINGULAR, UINT32, rx_gpio, 8) \ +X(a, STATIC, SINGULAR, UINT32, tx_gpio, 9) #define Config_PositionConfig_CALLBACK NULL #define Config_PositionConfig_DEFAULT NULL @@ -429,12 +441,12 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg; /* Maximum encoded size of messages (where known) */ #define Config_BluetoothConfig_size 10 -#define Config_DeviceConfig_size 6 +#define Config_DeviceConfig_size 18 #define Config_DisplayConfig_size 22 #define Config_LoRaConfig_size 68 #define Config_NetworkConfig_IpV4Config_size 20 #define Config_NetworkConfig_size 161 -#define Config_PositionConfig_size 30 +#define Config_PositionConfig_size 42 #define Config_PowerConfig_size 43 #define Config_size 164 diff --git a/src/mesh/generated/localonly.pb.h b/src/mesh/generated/localonly.pb.h index 783c523c..f2c12b10 100644 --- a/src/mesh/generated/localonly.pb.h +++ b/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 361 -#define LocalModuleConfig_size 294 +#define LocalConfig_size 385 +#define LocalModuleConfig_size 296 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/module_config.pb.h b/src/mesh/generated/module_config.pb.h index af4d4dce..d4e54642 100644 --- a/src/mesh/generated/module_config.pb.h +++ b/src/mesh/generated/module_config.pb.h @@ -90,6 +90,7 @@ typedef struct _ModuleConfig_ExternalNotificationConfig { bool active; bool alert_message; bool alert_bell; + bool use_pwm; } ModuleConfig_ExternalNotificationConfig; typedef struct _ModuleConfig_MQTTConfig { @@ -184,7 +185,7 @@ extern "C" { #define ModuleConfig_MQTTConfig_init_default {0, "", "", "", 0, 0} #define ModuleConfig_AudioConfig_init_default {0, 0, 0, 0, _ModuleConfig_AudioConfig_Audio_Baud_MIN} #define ModuleConfig_SerialConfig_init_default {0, 0, 0, 0, _ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _ModuleConfig_SerialConfig_Serial_Mode_MIN} -#define ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0} +#define ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0} #define ModuleConfig_StoreForwardConfig_init_default {0, 0, 0, 0, 0} #define ModuleConfig_RangeTestConfig_init_default {0, 0, 0} #define ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0} @@ -193,7 +194,7 @@ extern "C" { #define ModuleConfig_MQTTConfig_init_zero {0, "", "", "", 0, 0} #define ModuleConfig_AudioConfig_init_zero {0, 0, 0, 0, _ModuleConfig_AudioConfig_Audio_Baud_MIN} #define ModuleConfig_SerialConfig_init_zero {0, 0, 0, 0, _ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _ModuleConfig_SerialConfig_Serial_Mode_MIN} -#define ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0} +#define ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0} #define ModuleConfig_StoreForwardConfig_init_zero {0, 0, 0, 0, 0} #define ModuleConfig_RangeTestConfig_init_zero {0, 0, 0} #define ModuleConfig_TelemetryConfig_init_zero {0, 0, 0, 0, 0} @@ -222,6 +223,7 @@ extern "C" { #define ModuleConfig_ExternalNotificationConfig_active_tag 4 #define ModuleConfig_ExternalNotificationConfig_alert_message_tag 5 #define ModuleConfig_ExternalNotificationConfig_alert_bell_tag 6 +#define ModuleConfig_ExternalNotificationConfig_use_pwm_tag 7 #define ModuleConfig_MQTTConfig_enabled_tag 1 #define ModuleConfig_MQTTConfig_address_tag 2 #define ModuleConfig_MQTTConfig_username_tag 3 @@ -314,7 +316,8 @@ X(a, STATIC, SINGULAR, UINT32, output_ms, 2) \ X(a, STATIC, SINGULAR, UINT32, output, 3) \ X(a, STATIC, SINGULAR, BOOL, active, 4) \ X(a, STATIC, SINGULAR, BOOL, alert_message, 5) \ -X(a, STATIC, SINGULAR, BOOL, alert_bell, 6) +X(a, STATIC, SINGULAR, BOOL, alert_bell, 6) \ +X(a, STATIC, SINGULAR, BOOL, use_pwm, 7) #define ModuleConfig_ExternalNotificationConfig_CALLBACK NULL #define ModuleConfig_ExternalNotificationConfig_DEFAULT NULL @@ -382,7 +385,7 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg; /* Maximum encoded size of messages (where known) */ #define ModuleConfig_AudioConfig_size 22 #define ModuleConfig_CannedMessageConfig_size 49 -#define ModuleConfig_ExternalNotificationConfig_size 20 +#define ModuleConfig_ExternalNotificationConfig_size 22 #define ModuleConfig_MQTTConfig_size 105 #define ModuleConfig_RangeTestConfig_size 10 #define ModuleConfig_SerialConfig_size 26