mirror of
https://github.com/meshtastic/firmware.git
synced 2025-12-23 11:10:52 +00:00
Added mute state to channel settings
This commit is contained in:
Submodule protobufs updated: 8985852d75...550702a695
@@ -55,7 +55,7 @@ extern const pb_msgdesc_t meshtastic_ChannelSet_msg;
|
|||||||
|
|
||||||
/* Maximum encoded size of messages (where known) */
|
/* Maximum encoded size of messages (where known) */
|
||||||
#define MESHTASTIC_MESHTASTIC_APPONLY_PB_H_MAX_SIZE meshtastic_ChannelSet_size
|
#define MESHTASTIC_MESHTASTIC_APPONLY_PB_H_MAX_SIZE meshtastic_ChannelSet_size
|
||||||
#define meshtastic_ChannelSet_size 679
|
#define meshtastic_ChannelSet_size 695
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
|
|||||||
@@ -97,6 +97,8 @@ typedef struct _meshtastic_ChannelSettings {
|
|||||||
/* Per-channel module settings. */
|
/* Per-channel module settings. */
|
||||||
bool has_module_settings;
|
bool has_module_settings;
|
||||||
meshtastic_ModuleSettings module_settings;
|
meshtastic_ModuleSettings module_settings;
|
||||||
|
/* Whether or not we should receive notifactions / alerts from this channel */
|
||||||
|
bool mute;
|
||||||
} meshtastic_ChannelSettings;
|
} meshtastic_ChannelSettings;
|
||||||
|
|
||||||
/* A pair of a channel number, mode and the (sharable) settings for that channel */
|
/* A pair of a channel number, mode and the (sharable) settings for that channel */
|
||||||
@@ -128,10 +130,10 @@ extern "C" {
|
|||||||
|
|
||||||
|
|
||||||
/* Initializer values for message structs */
|
/* Initializer values for message structs */
|
||||||
#define meshtastic_ChannelSettings_init_default {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_default}
|
#define meshtastic_ChannelSettings_init_default {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_default, 0}
|
||||||
#define meshtastic_ModuleSettings_init_default {0, 0}
|
#define meshtastic_ModuleSettings_init_default {0, 0}
|
||||||
#define meshtastic_Channel_init_default {0, false, meshtastic_ChannelSettings_init_default, _meshtastic_Channel_Role_MIN}
|
#define meshtastic_Channel_init_default {0, false, meshtastic_ChannelSettings_init_default, _meshtastic_Channel_Role_MIN}
|
||||||
#define meshtastic_ChannelSettings_init_zero {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_zero}
|
#define meshtastic_ChannelSettings_init_zero {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_zero, 0}
|
||||||
#define meshtastic_ModuleSettings_init_zero {0, 0}
|
#define meshtastic_ModuleSettings_init_zero {0, 0}
|
||||||
#define meshtastic_Channel_init_zero {0, false, meshtastic_ChannelSettings_init_zero, _meshtastic_Channel_Role_MIN}
|
#define meshtastic_Channel_init_zero {0, false, meshtastic_ChannelSettings_init_zero, _meshtastic_Channel_Role_MIN}
|
||||||
|
|
||||||
@@ -145,6 +147,7 @@ extern "C" {
|
|||||||
#define meshtastic_ChannelSettings_uplink_enabled_tag 5
|
#define meshtastic_ChannelSettings_uplink_enabled_tag 5
|
||||||
#define meshtastic_ChannelSettings_downlink_enabled_tag 6
|
#define meshtastic_ChannelSettings_downlink_enabled_tag 6
|
||||||
#define meshtastic_ChannelSettings_module_settings_tag 7
|
#define meshtastic_ChannelSettings_module_settings_tag 7
|
||||||
|
#define meshtastic_ChannelSettings_mute_tag 8
|
||||||
#define meshtastic_Channel_index_tag 1
|
#define meshtastic_Channel_index_tag 1
|
||||||
#define meshtastic_Channel_settings_tag 2
|
#define meshtastic_Channel_settings_tag 2
|
||||||
#define meshtastic_Channel_role_tag 3
|
#define meshtastic_Channel_role_tag 3
|
||||||
@@ -157,7 +160,8 @@ X(a, STATIC, SINGULAR, STRING, name, 3) \
|
|||||||
X(a, STATIC, SINGULAR, FIXED32, id, 4) \
|
X(a, STATIC, SINGULAR, FIXED32, id, 4) \
|
||||||
X(a, STATIC, SINGULAR, BOOL, uplink_enabled, 5) \
|
X(a, STATIC, SINGULAR, BOOL, uplink_enabled, 5) \
|
||||||
X(a, STATIC, SINGULAR, BOOL, downlink_enabled, 6) \
|
X(a, STATIC, SINGULAR, BOOL, downlink_enabled, 6) \
|
||||||
X(a, STATIC, OPTIONAL, MESSAGE, module_settings, 7)
|
X(a, STATIC, OPTIONAL, MESSAGE, module_settings, 7) \
|
||||||
|
X(a, STATIC, SINGULAR, BOOL, mute, 8)
|
||||||
#define meshtastic_ChannelSettings_CALLBACK NULL
|
#define meshtastic_ChannelSettings_CALLBACK NULL
|
||||||
#define meshtastic_ChannelSettings_DEFAULT NULL
|
#define meshtastic_ChannelSettings_DEFAULT NULL
|
||||||
#define meshtastic_ChannelSettings_module_settings_MSGTYPE meshtastic_ModuleSettings
|
#define meshtastic_ChannelSettings_module_settings_MSGTYPE meshtastic_ModuleSettings
|
||||||
@@ -187,8 +191,8 @@ extern const pb_msgdesc_t meshtastic_Channel_msg;
|
|||||||
|
|
||||||
/* Maximum encoded size of messages (where known) */
|
/* Maximum encoded size of messages (where known) */
|
||||||
#define MESHTASTIC_MESHTASTIC_CHANNEL_PB_H_MAX_SIZE meshtastic_Channel_size
|
#define MESHTASTIC_MESHTASTIC_CHANNEL_PB_H_MAX_SIZE meshtastic_Channel_size
|
||||||
#define meshtastic_ChannelSettings_size 72
|
#define meshtastic_ChannelSettings_size 74
|
||||||
#define meshtastic_Channel_size 87
|
#define meshtastic_Channel_size 89
|
||||||
#define meshtastic_ModuleSettings_size 8
|
#define meshtastic_ModuleSettings_size 8
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|||||||
@@ -360,8 +360,8 @@ extern const pb_msgdesc_t meshtastic_BackupPreferences_msg;
|
|||||||
/* Maximum encoded size of messages (where known) */
|
/* Maximum encoded size of messages (where known) */
|
||||||
/* meshtastic_NodeDatabase_size depends on runtime parameters */
|
/* meshtastic_NodeDatabase_size depends on runtime parameters */
|
||||||
#define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_BackupPreferences_size
|
#define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_BackupPreferences_size
|
||||||
#define meshtastic_BackupPreferences_size 2271
|
#define meshtastic_BackupPreferences_size 2287
|
||||||
#define meshtastic_ChannelFile_size 718
|
#define meshtastic_ChannelFile_size 734
|
||||||
#define meshtastic_DeviceState_size 1737
|
#define meshtastic_DeviceState_size 1737
|
||||||
#define meshtastic_NodeInfoLite_size 196
|
#define meshtastic_NodeInfoLite_size 196
|
||||||
#define meshtastic_PositionLite_size 28
|
#define meshtastic_PositionLite_size 28
|
||||||
|
|||||||
Reference in New Issue
Block a user