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

Update of Appliance Cluster XML to reflect Spec changes that took place in 1.4 #36994

Draft
wants to merge 25 commits into
base: master
Choose a base branch
from
+430 −3,726
Draft

Update of Appliance Cluster XML to reflect Spec changes that took place in 1.4 #36994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c05c603
Update of Appliance Cluster XML to reflect Spec changes that took place
marktrayer Jan 8, 2025
b527893
Zap regen results
marktrayer Jan 22, 2025
2e4da23
Remove Feature Id from Mode Base derived clusters where all features …
marktrayer Jan 22, 2025
46ade79
Restyled by clang-format
restyled-commits Jan 22, 2025
0523fb1
Update to all clusters
marktrayer Jan 22, 2025
4bc96e5
Merge branch 'master' into issue_30383_appliancexmlcleanup-2
marktrayer Jan 23, 2025
4b86731
Merging master and regen of zap to avoid backing out other work
marktrayer Jan 23, 2025
cda0fdd
Addition regen artifacts
marktrayer Jan 23, 2025
e2f37a1
Update of Appliance Cluster XML to reflect Spec changes that took place
marktrayer Jan 8, 2025
31317d7
Zap regen results
marktrayer Jan 22, 2025
98f44ce
Remove Feature Id from Mode Base derived clusters where all features …
marktrayer Jan 22, 2025
8205f72
Restyled by clang-format
restyled-commits Jan 22, 2025
12b71d9
Update to all clusters
marktrayer Jan 22, 2025
fb53e4b
Merging master and regen of zap to avoid backing out other work
marktrayer Jan 23, 2025
3d4e9b3
Addition regen artifacts
marktrayer Jan 23, 2025
5fc7482
Merge branch 'issue_30383_appliancexmlcleanup-2' of https://github.co…
marktrayer Jan 23, 2025
8649f7e
Merge branch 'master' into issue_30383_appliancexmlcleanup-2
marktrayer Jan 24, 2025
fdb4c58
Merge branch 'master' into issue_30383_appliancexmlcleanup-2
marktrayer Mar 5, 2025
e685aea
Merge branch 'master' into issue_30383_appliancexmlcleanup-2
marktrayer Mar 5, 2025
d7eb0ee
Zap regen
marktrayer Mar 5, 2025
f371ce0
Merge branch 'issue_30383_appliancexmlcleanup-2' of https://github.co…
marktrayer Mar 6, 2025
8758fda
Redo zap generation, trying to get past formatter differences
marktrayer Mar 6, 2025
c6c7dc1
Regenerating .zap files reflecting removal of attributes from derivat…
marktrayer Mar 10, 2025
47e9806
Merge branch 'master' into issue_30383_appliancexmlcleanup-2
marktrayer Mar 11, 2025
7e657d5
Updating the Dishwasher Apps
marktrayer Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 60 additions & 38 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2966,14 +2966,10 @@ cluster OvenCavityOperationalState = 72 {
ErrorStateStruct commandResponseState = 0;
}

/** Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. */
command Pause(): OperationalCommandResponse = 0;
/** Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. */
command Stop(): OperationalCommandResponse = 1;
/** Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started. */
command Start(): OperationalCommandResponse = 2;
/** Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press). */
command Resume(): OperationalCommandResponse = 3;
}

/** Attributes and commands for selecting a mode from a list of supported options. */
Expand Down Expand Up @@ -3034,7 +3030,7 @@ cluster OvenMode = 73 {

response struct ChangeToModeResponse = 1 {
enum8 status = 0;
optional char_string statusText = 1;
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
Expand Down Expand Up @@ -3128,10 +3124,6 @@ cluster LaundryWasherMode = 81 {
kWhites = 16387;
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
Expand All @@ -3145,8 +3137,6 @@ cluster LaundryWasherMode = 81 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -3160,7 +3150,7 @@ cluster LaundryWasherMode = 81 {

response struct ChangeToModeResponse = 1 {
enum8 status = 0;
optional char_string statusText = 1;
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
Expand All @@ -3187,10 +3177,6 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
kRapidFreeze = 16385;
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
Expand All @@ -3204,8 +3190,6 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -3219,7 +3203,7 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {

response struct ChangeToModeResponse = 1 {
enum8 status = 0;
optional char_string statusText = 1;
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
Expand Down Expand Up @@ -3464,10 +3448,6 @@ cluster DishwasherMode = 89 {
kLight = 16386;
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
Expand All @@ -3481,8 +3461,6 @@ cluster DishwasherMode = 89 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -3496,7 +3474,7 @@ cluster DishwasherMode = 89 {

response struct ChangeToModeResponse = 1 {
enum8 status = 0;
optional char_string statusText = 1;
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
Expand Down Expand Up @@ -3714,10 +3692,6 @@ cluster MicrowaveOvenMode = 94 {
kDefrost = 16385;
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
Expand All @@ -3739,6 +3713,50 @@ cluster MicrowaveOvenMode = 94 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring the microwave oven control, and reporting cooking stats. */
cluster MicrowaveOvenControl = 95 {
revision 1; // NOTE: Default/not specifically set

bitmap Feature : bitmap32 {
kPowerAsNumber = 0x1;
kPowerInWatts = 0x2;
kPowerNumberLimits = 0x4;
}

readonly attribute elapsed_s cookTime = 0;
readonly attribute elapsed_s maxCookTime = 1;
readonly attribute optional int8u powerSetting = 2;
readonly attribute optional int8u minPower = 3;
readonly attribute optional int8u maxPower = 4;
readonly attribute optional int8u powerStep = 5;
provisional readonly attribute optional int16u supportedWatts[] = 6;
provisional readonly attribute optional int8u selectedWattIndex = 7;
readonly attribute optional int16u wattRating = 8;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct SetCookingParametersRequest {
optional int8u cookMode = 0;
optional elapsed_s cookTime = 1;
optional int8u powerSetting = 2;
optional int8u wattSettingIndex = 3;
optional boolean startAfterSetting = 4;
}

request struct AddMoreTimeRequest {
elapsed_s timeToAdd = 0;
}

/** Set Cooking Parameters */
command SetCookingParameters(SetCookingParametersRequest): DefaultSuccess = 0;
/** Add More Cooking Time */
command AddMoreTime(AddMoreTimeRequest): DefaultSuccess = 1;
}

/** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
cluster OperationalState = 96 {
revision 1;
Expand Down Expand Up @@ -8264,10 +8282,8 @@ endpoint 1 {
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;

handle command Pause;
handle command Stop;
handle command Start;
handle command Resume;
handle command OperationalCommandResponse;
}

Expand Down Expand Up @@ -8314,8 +8330,6 @@ endpoint 1 {
server cluster LaundryWasherMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute startUpMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
Expand All @@ -8329,8 +8343,6 @@ endpoint 1 {
server cluster RefrigeratorAndTemperatureControlledCabinetMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute startUpMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
Expand Down Expand Up @@ -8406,8 +8418,6 @@ endpoint 1 {
server cluster DishwasherMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute startUpMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
Expand Down Expand Up @@ -8484,6 +8494,18 @@ endpoint 1 {
ram attribute clusterRevision default = 1;
}

server cluster MicrowaveOvenControl {
callback attribute cookTime;
callback attribute maxCookTime;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 1;

handle command SetCookingParameters;
}

server cluster OperationalState {
emits event OperationalError;
emits event OperationCompletion;
Expand Down
Loading
Loading