From f36d7f11ecc24686641b367ec02215ebe33272ac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2026 15:51:44 +0200 Subject: [PATCH] Update protobufs (#11762) Co-authored-by: caveman99 <25002+caveman99@users.noreply.github.com> --- protobufs | 2 +- src/mesh/generated/meshtastic/module_config.pb.h | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/protobufs b/protobufs index 3808a392e3..f008c459d7 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 3808a392e3317a7cbf1e6ded00bb3c570e3cfc7e +Subproject commit f008c459d78de46779408d5bdb7bc0634550bb49 diff --git a/src/mesh/generated/meshtastic/module_config.pb.h b/src/mesh/generated/meshtastic/module_config.pb.h index 5d6585f036..e689ace5c5 100644 --- a/src/mesh/generated/meshtastic/module_config.pb.h +++ b/src/mesh/generated/meshtastic/module_config.pb.h @@ -48,8 +48,14 @@ typedef enum _meshtastic_ModuleConfig_AudioConfig_Audio_Baud { meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1400 = 4, meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1300 = 5, meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1200 = 6, + /* Removed from libcodec2 upstream. A device configured to one of these + falls back to CODEC2_700C. */ meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700 = 7, - meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B = 8 + meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B = 8, + /* Replaces CODEC2_700. Default for new configurations. */ + meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700C = 9, + /* Lowest rate, and the only one usable on slower modem presets. */ + meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_450 = 10 } meshtastic_ModuleConfig_AudioConfig_Audio_Baud; /* TODO: REPLACE */ @@ -225,7 +231,7 @@ typedef struct _meshtastic_ModuleConfig_AudioConfig { bool codec2_enabled; /* PTT Pin */ uint8_t ptt_pin; - /* The audio sample rate to use for codec2 */ + /* The codec2 bitrate to encode at. Sample rate is always 8 kHz. */ meshtastic_ModuleConfig_AudioConfig_Audio_Baud bitrate; /* I2S Word Select */ uint8_t i2s_ws; @@ -588,8 +594,8 @@ extern "C" { #define _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_ARRAYSIZE ((meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType)(meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_EITHER_EDGE_ACTIVE_HIGH+1)) #define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT -#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MAX meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B -#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_ARRAYSIZE ((meshtastic_ModuleConfig_AudioConfig_Audio_Baud)(meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B+1)) +#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MAX meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_450 +#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_ARRAYSIZE ((meshtastic_ModuleConfig_AudioConfig_Audio_Baud)(meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_450+1)) #define _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_DEFAULT #define _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MAX meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600