diff --git a/protobufs b/protobufs index 79e213fbc..e406029f6 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 79e213fbcc6f432923ab131bfa7b8630eb93270e +Subproject commit e406029f68d8a554f43fd1f250baca6b3c1a9a33 diff --git a/src/mesh/generated/admin.pb.h b/src/mesh/generated/admin.pb.h index cdc62c795..a00376f21 100644 --- a/src/mesh/generated/admin.pb.h +++ b/src/mesh/generated/admin.pb.h @@ -50,7 +50,9 @@ typedef enum _AdminMessage_ModuleConfigType { /* TODO: REPLACE */ AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG = 6, /* TODO: REPLACE */ - AdminMessage_ModuleConfigType_AUDIO_CONFIG = 7 + AdminMessage_ModuleConfigType_AUDIO_CONFIG = 7, + /* TODO: REPLACE */ + AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG = 8 } AdminMessage_ModuleConfigType; /* Struct definitions */ @@ -85,6 +87,10 @@ typedef struct _AdminMessage { bool get_device_metadata_request; /* Device metadata response */ DeviceMetadata get_device_metadata_response; + /* Get the Ringtone in the response to this message. */ + bool get_ringtone_request; + /* Get the Ringtone in the response to this message. */ + char get_ringtone_response[231]; /* Set the owner for this node */ User set_owner; /* Set channels (using the new API). @@ -99,6 +105,8 @@ typedef struct _AdminMessage { ModuleConfig set_module_config; /* Set the Canned Message Module messages text. */ char set_canned_message_module_messages[201]; + /* Set the ringtone for ExternalNotification. */ + char set_ringtone_message[231]; /* Begins an edit transaction for config, module config, owner, and channel settings changes This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings) */ bool begin_edit_settings; @@ -139,8 +147,8 @@ extern "C" { #define _AdminMessage_ConfigType_ARRAYSIZE ((AdminMessage_ConfigType)(AdminMessage_ConfigType_BLUETOOTH_CONFIG+1)) #define _AdminMessage_ModuleConfigType_MIN AdminMessage_ModuleConfigType_MQTT_CONFIG -#define _AdminMessage_ModuleConfigType_MAX AdminMessage_ModuleConfigType_AUDIO_CONFIG -#define _AdminMessage_ModuleConfigType_ARRAYSIZE ((AdminMessage_ModuleConfigType)(AdminMessage_ModuleConfigType_AUDIO_CONFIG+1)) +#define _AdminMessage_ModuleConfigType_MAX AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG +#define _AdminMessage_ModuleConfigType_ARRAYSIZE ((AdminMessage_ModuleConfigType)(AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG+1)) #define AdminMessage_payload_variant_get_config_request_ENUMTYPE AdminMessage_ConfigType #define AdminMessage_payload_variant_get_module_config_request_ENUMTYPE AdminMessage_ModuleConfigType @@ -163,11 +171,14 @@ extern "C" { #define AdminMessage_get_canned_message_module_messages_response_tag 11 #define AdminMessage_get_device_metadata_request_tag 12 #define AdminMessage_get_device_metadata_response_tag 13 +#define AdminMessage_get_ringtone_request_tag 14 +#define AdminMessage_get_ringtone_response_tag 15 #define AdminMessage_set_owner_tag 32 #define AdminMessage_set_channel_tag 33 #define AdminMessage_set_config_tag 34 #define AdminMessage_set_module_config_tag 35 #define AdminMessage_set_canned_message_module_messages_tag 36 +#define AdminMessage_set_ringtone_message_tag 37 #define AdminMessage_begin_edit_settings_tag 64 #define AdminMessage_commit_edit_settings_tag 65 #define AdminMessage_confirm_set_channel_tag 66 @@ -193,11 +204,14 @@ X(a, STATIC, ONEOF, BOOL, (payload_variant,get_canned_message_module_me X(a, STATIC, ONEOF, STRING, (payload_variant,get_canned_message_module_messages_response,get_canned_message_module_messages_response), 11) \ X(a, STATIC, ONEOF, BOOL, (payload_variant,get_device_metadata_request,get_device_metadata_request), 12) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,get_device_metadata_response,get_device_metadata_response), 13) \ +X(a, STATIC, ONEOF, BOOL, (payload_variant,get_ringtone_request,get_ringtone_request), 14) \ +X(a, STATIC, ONEOF, STRING, (payload_variant,get_ringtone_response,get_ringtone_response), 15) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,set_owner,set_owner), 32) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,set_channel,set_channel), 33) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,set_config,set_config), 34) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,set_module_config,set_module_config), 35) \ X(a, STATIC, ONEOF, STRING, (payload_variant,set_canned_message_module_messages,set_canned_message_module_messages), 36) \ +X(a, STATIC, ONEOF, STRING, (payload_variant,set_ringtone_message,set_ringtone_message), 37) \ X(a, STATIC, ONEOF, BOOL, (payload_variant,begin_edit_settings,begin_edit_settings), 64) \ X(a, STATIC, ONEOF, BOOL, (payload_variant,commit_edit_settings,commit_edit_settings), 65) \ X(a, STATIC, ONEOF, BOOL, (payload_variant,confirm_set_channel,confirm_set_channel), 66) \ @@ -226,7 +240,7 @@ extern const pb_msgdesc_t AdminMessage_msg; #define AdminMessage_fields &AdminMessage_msg /* Maximum encoded size of messages (where known) */ -#define AdminMessage_size 204 +#define AdminMessage_size 234 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/config.pb.c b/src/mesh/generated/config.pb.c index 8d1c55934..d43f4beae 100644 --- a/src/mesh/generated/config.pb.c +++ b/src/mesh/generated/config.pb.c @@ -43,3 +43,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 95252bb4e..a5f7694cb 100644 --- a/src/mesh/generated/config.pb.h +++ b/src/mesh/generated/config.pb.h @@ -108,6 +108,17 @@ typedef enum _Config_DisplayConfig_OledType { Config_DisplayConfig_OledType_OLED_SH1106 = 2 } Config_DisplayConfig_OledType; +typedef enum _Config_DisplayConfig_DisplayMode { + /* Default. The old style for the 128x64 OLED screen */ + Config_DisplayConfig_DisplayMode_DEFAULT = 0, + /* Rearrange display elements to cater for bicolor OLED displays */ + Config_DisplayConfig_DisplayMode_TWOCOLOR = 1, + /* Same as TwoColor, but with inverted top bar. Not so good for Epaper displays */ + Config_DisplayConfig_DisplayMode_INVERTED = 2, + /* TFT Full Color Displays (not implemented yet) */ + Config_DisplayConfig_DisplayMode_COLOR = 3 +} Config_DisplayConfig_DisplayMode; + typedef enum _Config_LoRaConfig_RegionCode { /* Region is not set */ Config_LoRaConfig_RegionCode_UNSET = 0, @@ -306,6 +317,10 @@ typedef struct _Config_DisplayConfig { Config_DisplayConfig_DisplayUnits units; /* Override auto-detect in screen */ Config_DisplayConfig_OledType oled; + /* Display Mode */ + Config_DisplayConfig_DisplayMode displaymode; + /* Print first line in pseudo-bold? FALSE is original style, TRUE is bold */ + bool heading_bold; } Config_DisplayConfig; /* Lora Config */ @@ -417,6 +432,10 @@ extern "C" { #define _Config_DisplayConfig_OledType_MAX Config_DisplayConfig_OledType_OLED_SH1106 #define _Config_DisplayConfig_OledType_ARRAYSIZE ((Config_DisplayConfig_OledType)(Config_DisplayConfig_OledType_OLED_SH1106+1)) +#define _Config_DisplayConfig_DisplayMode_MIN Config_DisplayConfig_DisplayMode_DEFAULT +#define _Config_DisplayConfig_DisplayMode_MAX Config_DisplayConfig_DisplayMode_COLOR +#define _Config_DisplayConfig_DisplayMode_ARRAYSIZE ((Config_DisplayConfig_DisplayMode)(Config_DisplayConfig_DisplayMode_COLOR+1)) + #define _Config_LoRaConfig_RegionCode_MIN Config_LoRaConfig_RegionCode_UNSET #define _Config_LoRaConfig_RegionCode_MAX Config_LoRaConfig_RegionCode_LORA_24 #define _Config_LoRaConfig_RegionCode_ARRAYSIZE ((Config_LoRaConfig_RegionCode)(Config_LoRaConfig_RegionCode_LORA_24+1)) @@ -440,6 +459,7 @@ extern "C" { #define Config_DisplayConfig_gps_format_ENUMTYPE Config_DisplayConfig_GpsCoordinateFormat #define Config_DisplayConfig_units_ENUMTYPE Config_DisplayConfig_DisplayUnits #define Config_DisplayConfig_oled_ENUMTYPE Config_DisplayConfig_OledType +#define Config_DisplayConfig_displaymode_ENUMTYPE Config_DisplayConfig_DisplayMode #define Config_LoRaConfig_modem_preset_ENUMTYPE Config_LoRaConfig_ModemPreset #define Config_LoRaConfig_region_ENUMTYPE Config_LoRaConfig_RegionCode @@ -454,7 +474,7 @@ extern "C" { #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} -#define Config_DisplayConfig_init_default {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN} +#define Config_DisplayConfig_init_default {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN, _Config_DisplayConfig_DisplayMode_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, {0, 0, 0}} #define Config_BluetoothConfig_init_default {0, _Config_BluetoothConfig_PairingMode_MIN, 0} #define Config_init_zero {0, {Config_DeviceConfig_init_zero}} @@ -463,7 +483,7 @@ extern "C" { #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} -#define Config_DisplayConfig_init_zero {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN} +#define Config_DisplayConfig_init_zero {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN, _Config_DisplayConfig_DisplayMode_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, {0, 0, 0}} #define Config_BluetoothConfig_init_zero {0, _Config_BluetoothConfig_PairingMode_MIN, 0} @@ -508,6 +528,8 @@ extern "C" { #define Config_DisplayConfig_flip_screen_tag 5 #define Config_DisplayConfig_units_tag 6 #define Config_DisplayConfig_oled_tag 7 +#define Config_DisplayConfig_displaymode_tag 8 +#define Config_DisplayConfig_heading_bold_tag 9 #define Config_LoRaConfig_use_preset_tag 1 #define Config_LoRaConfig_modem_preset_tag 2 #define Config_LoRaConfig_bandwidth_tag 3 @@ -612,7 +634,9 @@ X(a, STATIC, SINGULAR, UINT32, auto_screen_carousel_secs, 3) \ X(a, STATIC, SINGULAR, BOOL, compass_north_top, 4) \ X(a, STATIC, SINGULAR, BOOL, flip_screen, 5) \ X(a, STATIC, SINGULAR, UENUM, units, 6) \ -X(a, STATIC, SINGULAR, UENUM, oled, 7) +X(a, STATIC, SINGULAR, UENUM, oled, 7) \ +X(a, STATIC, SINGULAR, UENUM, displaymode, 8) \ +X(a, STATIC, SINGULAR, BOOL, heading_bold, 9) #define Config_DisplayConfig_CALLBACK NULL #define Config_DisplayConfig_DEFAULT NULL @@ -664,7 +688,7 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg; /* Maximum encoded size of messages (where known) */ #define Config_BluetoothConfig_size 10 #define Config_DeviceConfig_size 18 -#define Config_DisplayConfig_size 22 +#define Config_DisplayConfig_size 26 #define Config_LoRaConfig_size 70 #define Config_NetworkConfig_IpV4Config_size 20 #define Config_NetworkConfig_size 161 diff --git a/src/mesh/generated/localonly.pb.h b/src/mesh/generated/localonly.pb.h index 3f024d013..d2b9dfcae 100644 --- a/src/mesh/generated/localonly.pb.h +++ b/src/mesh/generated/localonly.pb.h @@ -69,6 +69,9 @@ typedef struct _LocalModuleConfig { /* The part of the config that is specific to the Audio module */ bool has_audio; ModuleConfig_AudioConfig audio; + /* The part of the config that is specific to the Remote Hardware module */ + bool has_remote_hardware; + ModuleConfig_RemoteHardwareConfig remote_hardware; } LocalModuleConfig; @@ -78,9 +81,9 @@ extern "C" { /* Initializer values for message structs */ #define LocalConfig_init_default {false, Config_DeviceConfig_init_default, false, Config_PositionConfig_init_default, false, Config_PowerConfig_init_default, false, Config_NetworkConfig_init_default, false, Config_DisplayConfig_init_default, false, Config_LoRaConfig_init_default, false, Config_BluetoothConfig_init_default, 0} -#define LocalModuleConfig_init_default {false, ModuleConfig_MQTTConfig_init_default, false, ModuleConfig_SerialConfig_init_default, false, ModuleConfig_ExternalNotificationConfig_init_default, false, ModuleConfig_StoreForwardConfig_init_default, false, ModuleConfig_RangeTestConfig_init_default, false, ModuleConfig_TelemetryConfig_init_default, false, ModuleConfig_CannedMessageConfig_init_default, 0, false, ModuleConfig_AudioConfig_init_default} +#define LocalModuleConfig_init_default {false, ModuleConfig_MQTTConfig_init_default, false, ModuleConfig_SerialConfig_init_default, false, ModuleConfig_ExternalNotificationConfig_init_default, false, ModuleConfig_StoreForwardConfig_init_default, false, ModuleConfig_RangeTestConfig_init_default, false, ModuleConfig_TelemetryConfig_init_default, false, ModuleConfig_CannedMessageConfig_init_default, 0, false, ModuleConfig_AudioConfig_init_default, false, ModuleConfig_RemoteHardwareConfig_init_default} #define LocalConfig_init_zero {false, Config_DeviceConfig_init_zero, false, Config_PositionConfig_init_zero, false, Config_PowerConfig_init_zero, false, Config_NetworkConfig_init_zero, false, Config_DisplayConfig_init_zero, false, Config_LoRaConfig_init_zero, false, Config_BluetoothConfig_init_zero, 0} -#define LocalModuleConfig_init_zero {false, ModuleConfig_MQTTConfig_init_zero, false, ModuleConfig_SerialConfig_init_zero, false, ModuleConfig_ExternalNotificationConfig_init_zero, false, ModuleConfig_StoreForwardConfig_init_zero, false, ModuleConfig_RangeTestConfig_init_zero, false, ModuleConfig_TelemetryConfig_init_zero, false, ModuleConfig_CannedMessageConfig_init_zero, 0, false, ModuleConfig_AudioConfig_init_zero} +#define LocalModuleConfig_init_zero {false, ModuleConfig_MQTTConfig_init_zero, false, ModuleConfig_SerialConfig_init_zero, false, ModuleConfig_ExternalNotificationConfig_init_zero, false, ModuleConfig_StoreForwardConfig_init_zero, false, ModuleConfig_RangeTestConfig_init_zero, false, ModuleConfig_TelemetryConfig_init_zero, false, ModuleConfig_CannedMessageConfig_init_zero, 0, false, ModuleConfig_AudioConfig_init_zero, false, ModuleConfig_RemoteHardwareConfig_init_zero} /* Field tags (for use in manual encoding/decoding) */ #define LocalConfig_device_tag 1 @@ -100,6 +103,7 @@ extern "C" { #define LocalModuleConfig_canned_message_tag 7 #define LocalModuleConfig_version_tag 8 #define LocalModuleConfig_audio_tag 9 +#define LocalModuleConfig_remote_hardware_tag 10 /* Struct field encoding specification for nanopb */ #define LocalConfig_FIELDLIST(X, a) \ @@ -130,7 +134,8 @@ X(a, STATIC, OPTIONAL, MESSAGE, range_test, 5) \ X(a, STATIC, OPTIONAL, MESSAGE, telemetry, 6) \ X(a, STATIC, OPTIONAL, MESSAGE, canned_message, 7) \ X(a, STATIC, SINGULAR, UINT32, version, 8) \ -X(a, STATIC, OPTIONAL, MESSAGE, audio, 9) +X(a, STATIC, OPTIONAL, MESSAGE, audio, 9) \ +X(a, STATIC, OPTIONAL, MESSAGE, remote_hardware, 10) #define LocalModuleConfig_CALLBACK NULL #define LocalModuleConfig_DEFAULT NULL #define LocalModuleConfig_mqtt_MSGTYPE ModuleConfig_MQTTConfig @@ -141,6 +146,7 @@ X(a, STATIC, OPTIONAL, MESSAGE, audio, 9) #define LocalModuleConfig_telemetry_MSGTYPE ModuleConfig_TelemetryConfig #define LocalModuleConfig_canned_message_MSGTYPE ModuleConfig_CannedMessageConfig #define LocalModuleConfig_audio_MSGTYPE ModuleConfig_AudioConfig +#define LocalModuleConfig_remote_hardware_MSGTYPE ModuleConfig_RemoteHardwareConfig extern const pb_msgdesc_t LocalConfig_msg; extern const pb_msgdesc_t LocalModuleConfig_msg; @@ -150,8 +156,8 @@ extern const pb_msgdesc_t LocalModuleConfig_msg; #define LocalModuleConfig_fields &LocalModuleConfig_msg /* Maximum encoded size of messages (where known) */ -#define LocalConfig_size 387 -#define LocalModuleConfig_size 376 +#define LocalConfig_size 391 +#define LocalModuleConfig_size 380 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/module_config.pb.c b/src/mesh/generated/module_config.pb.c index 7d7de956e..eb22a5ec3 100644 --- a/src/mesh/generated/module_config.pb.c +++ b/src/mesh/generated/module_config.pb.c @@ -12,6 +12,9 @@ PB_BIND(ModuleConfig, ModuleConfig, AUTO) PB_BIND(ModuleConfig_MQTTConfig, ModuleConfig_MQTTConfig, AUTO) +PB_BIND(ModuleConfig_RemoteHardwareConfig, ModuleConfig_RemoteHardwareConfig, AUTO) + + PB_BIND(ModuleConfig_AudioConfig, ModuleConfig_AudioConfig, AUTO) diff --git a/src/mesh/generated/module_config.pb.h b/src/mesh/generated/module_config.pb.h index 6d677fd41..da13ac706 100644 --- a/src/mesh/generated/module_config.pb.h +++ b/src/mesh/generated/module_config.pb.h @@ -98,6 +98,12 @@ typedef struct _ModuleConfig_MQTTConfig { bool json_enabled; } ModuleConfig_MQTTConfig; +/* RemoteHardwareModule Config */ +typedef struct _ModuleConfig_RemoteHardwareConfig { + /* Whether the Module is enabled */ + bool enabled; +} ModuleConfig_RemoteHardwareConfig; + /* Audio Config for codec2 voice */ typedef struct _ModuleConfig_AudioConfig { /* Whether Audio is enabled */ @@ -266,6 +272,8 @@ typedef struct _ModuleConfig { ModuleConfig_CannedMessageConfig canned_message; /* TODO: REPLACE */ ModuleConfig_AudioConfig audio; + /* TODO: REPLACE */ + ModuleConfig_RemoteHardwareConfig remote_hardware; } payload_variant; } ModuleConfig; @@ -293,6 +301,7 @@ extern "C" { + #define ModuleConfig_AudioConfig_bitrate_ENUMTYPE ModuleConfig_AudioConfig_Audio_Baud #define ModuleConfig_SerialConfig_baud_ENUMTYPE ModuleConfig_SerialConfig_Serial_Baud @@ -310,6 +319,7 @@ extern "C" { /* Initializer values for message structs */ #define ModuleConfig_init_default {0, {ModuleConfig_MQTTConfig_init_default}} #define ModuleConfig_MQTTConfig_init_default {0, "", "", "", 0, 0} +#define ModuleConfig_RemoteHardwareConfig_init_default {0} #define ModuleConfig_AudioConfig_init_default {0, 0, _ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0} #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, 0, 0, 0, 0, 0, 0, 0, 0} @@ -319,6 +329,7 @@ extern "C" { #define ModuleConfig_CannedMessageConfig_init_default {0, 0, 0, 0, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0} #define ModuleConfig_init_zero {0, {ModuleConfig_MQTTConfig_init_zero}} #define ModuleConfig_MQTTConfig_init_zero {0, "", "", "", 0, 0} +#define ModuleConfig_RemoteHardwareConfig_init_zero {0} #define ModuleConfig_AudioConfig_init_zero {0, 0, _ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0} #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, 0, 0, 0, 0, 0, 0, 0, 0} @@ -334,6 +345,7 @@ extern "C" { #define ModuleConfig_MQTTConfig_password_tag 4 #define ModuleConfig_MQTTConfig_encryption_enabled_tag 5 #define ModuleConfig_MQTTConfig_json_enabled_tag 6 +#define ModuleConfig_RemoteHardwareConfig_enabled_tag 1 #define ModuleConfig_AudioConfig_codec2_enabled_tag 1 #define ModuleConfig_AudioConfig_ptt_pin_tag 2 #define ModuleConfig_AudioConfig_bitrate_tag 3 @@ -394,6 +406,7 @@ extern "C" { #define ModuleConfig_telemetry_tag 6 #define ModuleConfig_canned_message_tag 7 #define ModuleConfig_audio_tag 8 +#define ModuleConfig_remote_hardware_tag 9 /* Struct field encoding specification for nanopb */ #define ModuleConfig_FIELDLIST(X, a) \ @@ -404,7 +417,8 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,store_forward,payload_varian X(a, STATIC, ONEOF, MESSAGE, (payload_variant,range_test,payload_variant.range_test), 5) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,telemetry,payload_variant.telemetry), 6) \ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,canned_message,payload_variant.canned_message), 7) \ -X(a, STATIC, ONEOF, MESSAGE, (payload_variant,audio,payload_variant.audio), 8) +X(a, STATIC, ONEOF, MESSAGE, (payload_variant,audio,payload_variant.audio), 8) \ +X(a, STATIC, ONEOF, MESSAGE, (payload_variant,remote_hardware,payload_variant.remote_hardware), 9) #define ModuleConfig_CALLBACK NULL #define ModuleConfig_DEFAULT NULL #define ModuleConfig_payload_variant_mqtt_MSGTYPE ModuleConfig_MQTTConfig @@ -415,6 +429,7 @@ X(a, STATIC, ONEOF, MESSAGE, (payload_variant,audio,payload_variant.audio) #define ModuleConfig_payload_variant_telemetry_MSGTYPE ModuleConfig_TelemetryConfig #define ModuleConfig_payload_variant_canned_message_MSGTYPE ModuleConfig_CannedMessageConfig #define ModuleConfig_payload_variant_audio_MSGTYPE ModuleConfig_AudioConfig +#define ModuleConfig_payload_variant_remote_hardware_MSGTYPE ModuleConfig_RemoteHardwareConfig #define ModuleConfig_MQTTConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, enabled, 1) \ @@ -426,6 +441,11 @@ X(a, STATIC, SINGULAR, BOOL, json_enabled, 6) #define ModuleConfig_MQTTConfig_CALLBACK NULL #define ModuleConfig_MQTTConfig_DEFAULT NULL +#define ModuleConfig_RemoteHardwareConfig_FIELDLIST(X, a) \ +X(a, STATIC, SINGULAR, BOOL, enabled, 1) +#define ModuleConfig_RemoteHardwareConfig_CALLBACK NULL +#define ModuleConfig_RemoteHardwareConfig_DEFAULT NULL + #define ModuleConfig_AudioConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, BOOL, codec2_enabled, 1) \ X(a, STATIC, SINGULAR, UINT32, ptt_pin, 2) \ @@ -508,6 +528,7 @@ X(a, STATIC, SINGULAR, BOOL, send_bell, 11) extern const pb_msgdesc_t ModuleConfig_msg; extern const pb_msgdesc_t ModuleConfig_MQTTConfig_msg; +extern const pb_msgdesc_t ModuleConfig_RemoteHardwareConfig_msg; extern const pb_msgdesc_t ModuleConfig_AudioConfig_msg; extern const pb_msgdesc_t ModuleConfig_SerialConfig_msg; extern const pb_msgdesc_t ModuleConfig_ExternalNotificationConfig_msg; @@ -519,6 +540,7 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ #define ModuleConfig_fields &ModuleConfig_msg #define ModuleConfig_MQTTConfig_fields &ModuleConfig_MQTTConfig_msg +#define ModuleConfig_RemoteHardwareConfig_fields &ModuleConfig_RemoteHardwareConfig_msg #define ModuleConfig_AudioConfig_fields &ModuleConfig_AudioConfig_msg #define ModuleConfig_SerialConfig_fields &ModuleConfig_SerialConfig_msg #define ModuleConfig_ExternalNotificationConfig_fields &ModuleConfig_ExternalNotificationConfig_msg @@ -533,6 +555,7 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg; #define ModuleConfig_ExternalNotificationConfig_size 40 #define ModuleConfig_MQTTConfig_size 169 #define ModuleConfig_RangeTestConfig_size 10 +#define ModuleConfig_RemoteHardwareConfig_size 2 #define ModuleConfig_SerialConfig_size 26 #define ModuleConfig_StoreForwardConfig_size 22 #define ModuleConfig_TelemetryConfig_size 18 diff --git a/src/mesh/generated/rtttl.pb.c b/src/mesh/generated/rtttl.pb.c new file mode 100644 index 000000000..960d1ebcd --- /dev/null +++ b/src/mesh/generated/rtttl.pb.c @@ -0,0 +1,12 @@ +/* Automatically generated nanopb constant definitions */ +/* Generated by nanopb-0.4.7 */ + +#include "rtttl.pb.h" +#if PB_PROTO_HEADER_VERSION != 40 +#error Regenerate this file with the current version of nanopb generator. +#endif + +PB_BIND(RTTTLConfig, RTTTLConfig, AUTO) + + + diff --git a/src/mesh/generated/rtttl.pb.h b/src/mesh/generated/rtttl.pb.h new file mode 100644 index 000000000..7c4de8f73 --- /dev/null +++ b/src/mesh/generated/rtttl.pb.h @@ -0,0 +1,49 @@ +/* Automatically generated nanopb header */ +/* Generated by nanopb-0.4.7 */ + +#ifndef PB_RTTTL_PB_H_INCLUDED +#define PB_RTTTL_PB_H_INCLUDED +#include + +#if PB_PROTO_HEADER_VERSION != 40 +#error Regenerate this file with the current version of nanopb generator. +#endif + +/* Struct definitions */ +/* Canned message module configuration. */ +typedef struct _RTTTLConfig { + /* Ringtone for PWM Buzzer in RTTTL Format. */ + char ringtone[230]; +} RTTTLConfig; + + +#ifdef __cplusplus +extern "C" { +#endif + +/* Initializer values for message structs */ +#define RTTTLConfig_init_default {""} +#define RTTTLConfig_init_zero {""} + +/* Field tags (for use in manual encoding/decoding) */ +#define RTTTLConfig_ringtone_tag 1 + +/* Struct field encoding specification for nanopb */ +#define RTTTLConfig_FIELDLIST(X, a) \ +X(a, STATIC, SINGULAR, STRING, ringtone, 1) +#define RTTTLConfig_CALLBACK NULL +#define RTTTLConfig_DEFAULT NULL + +extern const pb_msgdesc_t RTTTLConfig_msg; + +/* Defines for backwards compatibility with code written before nanopb-0.4.0 */ +#define RTTTLConfig_fields &RTTTLConfig_msg + +/* Maximum encoded size of messages (where known) */ +#define RTTTLConfig_size 232 + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif