Skip to content

Commit

Permalink
regenerate zap
Browse files Browse the repository at this point in the history
  • Loading branch information
@eahove
eahove committed Dec 19, 2023
1 parent 9aa43db commit 4f98175
Show file tree
Hide file tree
Showing 50 changed files with 186,518 additions and 78,817 deletions.
89 changes: 79 additions & 10 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2786,7 +2786,9 @@ cluster BooleanState = 69 {
}

/** This cluster supports remotely monitoring and, where supported, changing the operational state of an Oven. */
server cluster OvenOperationalState = 72 {
provisional cluster OvenCavityOperationalState = 72 {
revision 1;

enum ErrorStateEnum : enum8 {
kNoError = 0;
kUnableToStartOrResume = 1;
Expand All @@ -2795,10 +2797,10 @@ server cluster OvenOperationalState = 72 {
}

enum OperationalStateEnum : enum8 {
kPreheating = 64;
kPreheated = 65;
kCoolingDown = 66;
kSelfCleaning = 67;
kStopped = 0;
kRunning = 1;
kPaused = 2;
kError = 3;
}

struct ErrorStateStruct {
Expand All @@ -2824,15 +2826,85 @@ server cluster OvenOperationalState = 72 {

readonly attribute nullable char_string phaseList[] = 0;
readonly attribute nullable int8u currentPhase = 1;
readonly attribute optional nullable elapsed_s countdownTime = 2;
readonly attribute OperationalStateStruct operationalStateList[] = 3;
readonly attribute enum8 operationalState = 4;
readonly attribute OperationalStateEnum operationalState = 4;
readonly attribute ErrorStateStruct operationalError = 5;
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;

response struct OperationalCommandResponse = 4 {
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. */
provisional cluster OvenMode = 73 {
revision 1;

enum ModeTag : enum16 {
kBake = 16384;
kConvection = 16385;
kGrill = 16386;
kRoast = 16387;
kClean = 16388;
kConvectionBake = 16389;
kConvectionRoast = 16390;
kWarming = 16391;
kProofing = 16392;
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
}

struct ModeOptionStruct {
char_string<64> label = 0;
int8u mode = 1;
ModeTagStruct modeTags[] = 2;
}

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;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct ChangeToModeRequest {
int8u newMode = 0;
}

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

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

/** Attributes and commands for selecting a mode from a list of supported options. */
Expand Down Expand Up @@ -7088,7 +7160,7 @@ endpoint 1 {
ram attribute clusterRevision default = 1;
}

server cluster OvenOperationalState {
server cluster OvenCavityOperationalState {
callback attribute phaseList;
callback attribute currentPhase;
callback attribute operationalStateList;
Expand All @@ -7102,8 +7174,6 @@ endpoint 1 {
ram attribute clusterRevision default = 1;
}

<<<<<<< HEAD
=======
server cluster OvenMode {
callback attribute supportedModes;
callback attribute currentMode;
Expand All @@ -7115,7 +7185,6 @@ endpoint 1 {
ram attribute clusterRevision default = 1;
}

>>>>>>> ba1a248920 (oven mode is responding appropriately)
server cluster ModeSelect {
ram attribute description default = "Coffee";
ram attribute standardNamespace default = 0;
Expand Down
64 changes: 0 additions & 64 deletions src/controller/data_model/controller-clusters.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3036,70 +3036,6 @@ provisional cluster OvenCavityOperationalState = 72 {
command Resume(): OperationalCommandResponse = 3;
}

/** This cluster supports remotely monitoring and, where supported, changing the operational state of an Oven. */
client cluster OvenOperationalState = 72 {
enum ErrorStateEnum : enum8 {
kNoError = 0;
kUnableToStartOrResume = 1;
kUnableToCompleteOperation = 2;
kCommandInvalidInState = 3;
}

enum OperationalStateEnum : enum8 {
kPreheating = 64;
kPreheated = 65;
kCoolingDown = 66;
kSelfCleaning = 67;
}

struct ErrorStateStruct {
enum8 errorStateID = 0;
optional char_string<64> errorStateLabel = 1;
optional char_string<64> errorStateDetails = 2;
}

struct OperationalStateStruct {
enum8 operationalStateID = 0;
optional char_string<64> operationalStateLabel = 1;
}

critical event OperationalError = 0 {
ErrorStateStruct errorState = 0;
}

info event OperationCompletion = 1 {
enum8 completionErrorCode = 0;
optional nullable elapsed_s totalOperationalTime = 1;
optional nullable elapsed_s pausedTime = 2;
}

readonly attribute nullable char_string phaseList[] = 0;
readonly attribute nullable int8u currentPhase = 1;
readonly attribute optional nullable elapsed_s countdownTime = 2;
readonly attribute OperationalStateStruct operationalStateList[] = 3;
readonly attribute enum8 operationalState = 4;
readonly attribute ErrorStateStruct operationalError = 5;
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;

response struct OperationalCommandResponse = 4 {
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. */
provisional cluster OvenMode = 73 {
revision 1;
Expand Down
3 changes: 2 additions & 1 deletion src/controller/data_model/controller-clusters.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1992,6 +1992,7 @@
"define": "OPERATIONAL_STATE_OVEN_CLUSTER",
"side": "client",
"enabled": 1,
"apiMaturity": "provisional",
"attributes": [
{
"name": "FeatureMap",
Expand Down Expand Up @@ -2061,7 +2062,7 @@
"side": "client",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down
Loading

0 comments on commit 4f98175

Please sign in to comment.