Skip to content

Commit

Permalink
Merge branch 'master' into esp32/mdns_endpoint_queue_fiter
Browse files Browse the repository at this point in the history
  • Loading branch information
@wqx6
wqx6 authored Jan 26, 2024
2 parents 3345a1d + a9edb72 commit c7c468c
Show file tree
Hide file tree
Showing 19 changed files with 164 additions and 144 deletions.
21 changes: 11 additions & 10 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4467,12 +4467,13 @@ cluster WakeOnLan = 1283 {

/** This cluster provides an interface for controlling the current Channel on a device. */
cluster Channel = 1284 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum ChannelTypeEnum : enum8 {
kSatellite = 0;
kCable = 1;
kTerrestrial = 2;
kOTT = 3;
}

enum LineupInfoTypeEnum : enum8 {
Expand All @@ -4488,14 +4489,14 @@ cluster Channel = 1284 {
bitmap Feature : bitmap32 {
kChannelList = 0x1;
kLineupInfo = 0x2;
kElectronicGuide = 0x3;
kRecordProgram = 0x4;
kElectronicGuide = 0x4;
kRecordProgram = 0x8;
}

bitmap RecordingFlagBitmap : bitmap32 {
kScheduled = 0x1;
kRecordSeries = 0x2;
kRecorded = 0x3;
kRecorded = 0x4;
}

struct ProgramCastStruct {
Expand Down Expand Up @@ -4641,7 +4642,7 @@ cluster Channel = 1284 {

/** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
cluster TargetNavigator = 1285 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum StatusEnum : enum8 {
kSuccess = 0;
Expand Down Expand Up @@ -4685,7 +4686,7 @@ cluster TargetNavigator = 1285 {

/** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
cluster MediaPlayback = 1286 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum CharacteristicEnum : enum8 {
kForcedSubtitles = 0;
Expand Down Expand Up @@ -4727,9 +4728,9 @@ cluster MediaPlayback = 1286 {
bitmap Feature : bitmap32 {
kAdvancedSeek = 0x1;
kVariableSpeed = 0x2;
kTextTracks = 0x3;
kAudioTracks = 0x4;
kAudioAdvance = 0x5;
kTextTracks = 0x4;
kAudioTracks = 0x8;
kAudioAdvance = 0x10;
}

struct TrackAttributesStruct {
Expand Down Expand Up @@ -5332,7 +5333,7 @@ cluster ApplicationBasic = 1293 {

/** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
cluster AccountLogin = 1294 {
revision 1; // NOTE: Default/not specifically set
revision 2;

critical event LoggedOut = 0 {
optional node_id node = 0;
Expand Down
19 changes: 10 additions & 9 deletions examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1230,12 +1230,13 @@ cluster WakeOnLan = 1283 {

/** This cluster provides an interface for controlling the current Channel on a device. */
cluster Channel = 1284 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum ChannelTypeEnum : enum8 {
kSatellite = 0;
kCable = 1;
kTerrestrial = 2;
kOTT = 3;
}

enum LineupInfoTypeEnum : enum8 {
Expand All @@ -1251,14 +1252,14 @@ cluster Channel = 1284 {
bitmap Feature : bitmap32 {
kChannelList = 0x1;
kLineupInfo = 0x2;
kElectronicGuide = 0x3;
kRecordProgram = 0x4;
kElectronicGuide = 0x4;
kRecordProgram = 0x8;
}

bitmap RecordingFlagBitmap : bitmap32 {
kScheduled = 0x1;
kRecordSeries = 0x2;
kRecorded = 0x3;
kRecorded = 0x4;
}

struct ProgramCastStruct {
Expand Down Expand Up @@ -1404,7 +1405,7 @@ cluster Channel = 1284 {

/** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
cluster TargetNavigator = 1285 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum StatusEnum : enum8 {
kSuccess = 0;
Expand Down Expand Up @@ -1448,7 +1449,7 @@ cluster TargetNavigator = 1285 {

/** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
cluster MediaPlayback = 1286 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum CharacteristicEnum : enum8 {
kForcedSubtitles = 0;
Expand Down Expand Up @@ -1490,9 +1491,9 @@ cluster MediaPlayback = 1286 {
bitmap Feature : bitmap32 {
kAdvancedSeek = 0x1;
kVariableSpeed = 0x2;
kTextTracks = 0x3;
kAudioTracks = 0x4;
kAudioAdvance = 0x5;
kTextTracks = 0x4;
kAudioTracks = 0x8;
kAudioAdvance = 0x10;
}

struct TrackAttributesStruct {
Expand Down
42 changes: 22 additions & 20 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6338,12 +6338,13 @@ cluster OccupancySensing = 1030 {

/** This cluster provides an interface for controlling the current Channel on a device. */
cluster Channel = 1284 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum ChannelTypeEnum : enum8 {
kSatellite = 0;
kCable = 1;
kTerrestrial = 2;
kOTT = 3;
}

enum LineupInfoTypeEnum : enum8 {
Expand All @@ -6359,14 +6360,14 @@ cluster Channel = 1284 {
bitmap Feature : bitmap32 {
kChannelList = 0x1;
kLineupInfo = 0x2;
kElectronicGuide = 0x3;
kRecordProgram = 0x4;
kElectronicGuide = 0x4;
kRecordProgram = 0x8;
}

bitmap RecordingFlagBitmap : bitmap32 {
kScheduled = 0x1;
kRecordSeries = 0x2;
kRecorded = 0x3;
kRecorded = 0x4;
}

struct ProgramCastStruct {
Expand Down Expand Up @@ -6512,12 +6513,13 @@ cluster Channel = 1284 {

/** This cluster provides an interface for controlling the current Channel on a device. */
cluster Channel = 1284 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum ChannelTypeEnum : enum8 {
kSatellite = 0;
kCable = 1;
kTerrestrial = 2;
kOTT = 3;
}

enum LineupInfoTypeEnum : enum8 {
Expand All @@ -6533,14 +6535,14 @@ cluster Channel = 1284 {
bitmap Feature : bitmap32 {
kChannelList = 0x1;
kLineupInfo = 0x2;
kElectronicGuide = 0x3;
kRecordProgram = 0x4;
kElectronicGuide = 0x4;
kRecordProgram = 0x8;
}

bitmap RecordingFlagBitmap : bitmap32 {
kScheduled = 0x1;
kRecordSeries = 0x2;
kRecorded = 0x3;
kRecorded = 0x4;
}

struct ProgramCastStruct {
Expand Down Expand Up @@ -6686,7 +6688,7 @@ cluster Channel = 1284 {

/** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
cluster TargetNavigator = 1285 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum StatusEnum : enum8 {
kSuccess = 0;
Expand Down Expand Up @@ -6730,7 +6732,7 @@ cluster TargetNavigator = 1285 {

/** This cluster provides an interface for UX navigation within a set of targets on a device or endpoint. */
cluster TargetNavigator = 1285 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum StatusEnum : enum8 {
kSuccess = 0;
Expand Down Expand Up @@ -6774,7 +6776,7 @@ cluster TargetNavigator = 1285 {

/** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
cluster MediaPlayback = 1286 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum CharacteristicEnum : enum8 {
kForcedSubtitles = 0;
Expand Down Expand Up @@ -6816,9 +6818,9 @@ cluster MediaPlayback = 1286 {
bitmap Feature : bitmap32 {
kAdvancedSeek = 0x1;
kVariableSpeed = 0x2;
kTextTracks = 0x3;
kAudioTracks = 0x4;
kAudioAdvance = 0x5;
kTextTracks = 0x4;
kAudioTracks = 0x8;
kAudioAdvance = 0x10;
}

struct TrackAttributesStruct {
Expand Down Expand Up @@ -6932,7 +6934,7 @@ cluster MediaPlayback = 1286 {

/** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
cluster MediaPlayback = 1286 {
revision 1; // NOTE: Default/not specifically set
revision 2;

enum CharacteristicEnum : enum8 {
kForcedSubtitles = 0;
Expand Down Expand Up @@ -6974,9 +6976,9 @@ cluster MediaPlayback = 1286 {
bitmap Feature : bitmap32 {
kAdvancedSeek = 0x1;
kVariableSpeed = 0x2;
kTextTracks = 0x3;
kAudioTracks = 0x4;
kAudioAdvance = 0x5;
kTextTracks = 0x4;
kAudioTracks = 0x8;
kAudioAdvance = 0x10;
}

struct TrackAttributesStruct {
Expand Down Expand Up @@ -8053,7 +8055,7 @@ cluster ApplicationBasic = 1293 {

/** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
cluster AccountLogin = 1294 {
revision 1; // NOTE: Default/not specifically set
revision 2;

critical event LoggedOut = 0 {
optional node_id node = 0;
Expand Down Expand Up @@ -8094,7 +8096,7 @@ cluster AccountLogin = 1294 {

/** This cluster provides commands that facilitate user account login on a Content App or a node. For example, a Content App running on a Video Player device, which is represented as an endpoint (see [TV Architecture]), can use this cluster to help make the user account on the Content App match the user account on the Client. */
cluster AccountLogin = 1294 {
revision 1; // NOTE: Default/not specifically set
revision 2;

critical event LoggedOut = 0 {
optional node_id node = 0;
Expand Down
Loading

0 comments on commit c7c468c

Please sign in to comment.