Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move AudioOutput cluster up to spec #29948

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Move AudioOutput cluster up to spec #29948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
667a8de
Audio output to spec
andreilitvin Oct 24, 2023
f0d6991
zap regen
andreilitvin Oct 24, 2023
d6ae6f7
Minor change to re-kick CI
andreilitvin Oct 24, 2023
7bd7bc3
Enalbe AudioOutput::CurrentOutput as a required attribute in the chef…
andreilitvin Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3528,7 +3528,7 @@ server cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
Expand Down
4 changes: 3 additions & 1 deletion examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,10 +1420,11 @@ server cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
readonly attribute int8u currentOutput = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -1779,6 +1780,7 @@ endpoint 1 {

server cluster AudioOutput {
callback attribute outputList;
ram attribute currentOutput default = 0x00;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down
19 changes: 18 additions & 1 deletion examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3790,6 +3790,22 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "CurrentOutput",
"code": 1,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
Expand Down Expand Up @@ -3906,5 +3922,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
10 changes: 5 additions & 5 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6216,11 +6216,11 @@ client cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
readonly attribute optional int8u currentOutput = 1;
readonly attribute int8u currentOutput = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -6240,7 +6240,7 @@ client cluster AudioOutput = 1291 {
/** Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. */
command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
/** Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. */
command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
}

/** This cluster provides an interface for controlling the Output on a media device such as a TV. */
Expand All @@ -6261,7 +6261,7 @@ server cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
Expand All @@ -6283,7 +6283,7 @@ server cluster AudioOutput = 1291 {
}

command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
}

/** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
Expand Down
10 changes: 5 additions & 5 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6175,11 +6175,11 @@ client cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
readonly attribute optional int8u currentOutput = 1;
readonly attribute int8u currentOutput = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -6199,7 +6199,7 @@ client cluster AudioOutput = 1291 {
/** Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. */
command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
/** Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. */
command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
}

/** This cluster provides an interface for controlling the Output on a media device such as a TV. */
Expand All @@ -6220,7 +6220,7 @@ server cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
Expand All @@ -6242,7 +6242,7 @@ server cluster AudioOutput = 1291 {
}

command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
}

/** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
Expand Down
4 changes: 2 additions & 2 deletions examples/tv-app/tv-common/tv-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2288,7 +2288,7 @@ server cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
Expand All @@ -2310,7 +2310,7 @@ server cluster AudioOutput = 1291 {
}

command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
}

/** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
Expand Down
6 changes: 3 additions & 3 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,11 +1841,11 @@ client cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
readonly attribute optional int8u currentOutput = 1;
readonly attribute int8u currentOutput = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -1865,7 +1865,7 @@ client cluster AudioOutput = 1291 {
/** Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. */
command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
/** Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. */
command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
}

/** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
Expand Down
7 changes: 4 additions & 3 deletions src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2021 Project CHIP Authors
Copyright (c) 2023 Project CHIP Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -25,7 +25,7 @@ limitations under the License.
<server init="false" tick="false">true</server>
<description>This cluster provides an interface for controlling the Output on a media device such as a TV.</description>
<attribute side="server" code="0x0000" define="AUDIO_OUTPUT_LIST" type="ARRAY" entryType="OutputInfoStruct" length="254" writable="false" optional="false">OutputList</attribute>
<attribute side="server" code="0x0001" define="AUDIO_OUTPUT_CURRENT_OUTPUT" type="int8u" default="0x00" min="0x00" max="0xFF" writable="false" optional="true">CurrentOutput</attribute>
<attribute side="server" code="0x0001" define="AUDIO_OUTPUT_CURRENT_OUTPUT" type="int8u" default="0x00" min="0x00" max="0xFF" writable="false" optional="false">CurrentOutput</attribute>

<command source="client" code="0x00" name="SelectOutput" optional="false">
<description>Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List.</description>
Expand All @@ -34,6 +34,7 @@ limitations under the License.

<command source="client" code="0x01" name="RenameOutput" optional="true">
<description>Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus.</description>
<access op="invoke" role="manage" />
<arg name="Index" type="int8u"/>
<arg name="Name" type="char_string"/>
</command>
Expand All @@ -44,7 +45,7 @@ limitations under the License.
<cluster code="0x050b"/>
<item name="Index" type="int8u"/>
<item name="OutputType" type="OutputTypeEnum"/>
<item name="Name" type="char_string" length="32"/>
<item name="Name" type="char_string"/>
</struct>

<enum name="OutputTypeEnum" type="enum8">
Expand Down
6 changes: 3 additions & 3 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6264,11 +6264,11 @@ client cluster AudioOutput = 1291 {
struct OutputInfoStruct {
int8u index = 0;
OutputTypeEnum outputType = 1;
char_string<32> name = 2;
char_string name = 2;
}

readonly attribute OutputInfoStruct outputList[] = 0;
readonly attribute optional int8u currentOutput = 1;
readonly attribute int8u currentOutput = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -6288,7 +6288,7 @@ client cluster AudioOutput = 1291 {
/** Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. */
command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
/** Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. */
command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
}

/** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
Expand Down
8 changes: 4 additions & 4 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.