Skip to content

Commit 9cc612c

Browse files
sabollim-silabsrestyled-commitsAliTalebVeluxarun-silabs
authored
[Closures] Closure Dimension cluster XMl,ZAP and server code changes as per new specifications (project-chip#39516)
* CLosure dimension spec updates xml and zap generated code changes * closure app zap changes * Closure dimension server code changes as per latest spec updates * Restyled by whitespace * Restyled by clang-format * Removing old zap generated files * Fixes after rebase to latest * Restyled by clang-format * Updating xml file to latest * Update src/controller/java/generated/java/matter/controller/cluster/clusters/ClosureDimensionCluster.kt Co-authored-by: Ali Taleb <[email protected]> * Update src/controller/java/generated/java/matter/controller/cluster/clusters/ClosureDimensionCluster.kt Co-authored-by: Ali Taleb <[email protected]> * Fix zap errors * add closure dimension server changes * Restyled by clang-format * Removing unnessary comment * Regenerating zap to fix zap issues seen after rebase --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Ali Taleb <[email protected]> Co-authored-by: arun-silabs <[email protected]>
1 parent e3d8447 commit 9cc612c

File tree

55 files changed

+1287
-1182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1287
-1182
lines changed

‎examples/closure-app/closure-common/closure-app.matter‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2288,7 +2288,7 @@ provisional cluster ClosureControl = 260 {
22882288
command access(invoke: manage) Calibrate(): DefaultSuccess = 2;
22892289
}
22902290

2291-
/** Ceiling values are dedicated for closures that close a ceiling, such as horizontal awnings, pergolas, etc. */
2291+
/** This cluster provides an interface to reflect and control a closure's range of movement, usually involving a panel, by using 6-axis framework. */
22922292
provisional cluster ClosureDimension = 261 {
22932293
revision 1;
22942294

@@ -2351,10 +2351,6 @@ provisional cluster ClosureDimension = 261 {
23512351
kBackward = 9;
23522352
kDepthMask = 10;
23532353
kDepthSymmetry = 11;
2354-
kCeilingSimple = 12;
2355-
kCeilingMask = 13;
2356-
kCeilingSidedSymmetry = 14;
2357-
kCeilingCenteredSymmetry = 15;
23582354
}
23592355

23602356
bitmap Feature : bitmap32 {
@@ -2368,9 +2364,14 @@ provisional cluster ClosureDimension = 261 {
23682364
kModulation = 0x80;
23692365
}
23702366

2371-
struct CurrentStateStruct {
2372-
optional percent100ths position = 0;
2373-
optional boolean latch = 1;
2367+
bitmap LatchControlModesBitmap : bitmap8 {
2368+
kRemoteLatching = 0x1;
2369+
kRemoteUnlatching = 0x2;
2370+
}
2371+
2372+
struct DimensionStateStruct {
2373+
optional nullable percent100ths position = 0;
2374+
optional nullable boolean latch = 1;
23742375
optional ThreeLevelAutoEnum speed = 2;
23752376
}
23762377

@@ -2379,19 +2380,13 @@ provisional cluster ClosureDimension = 261 {
23792380
percent100ths max = 1;
23802381
}
23812382

2382-
struct TargetStruct {
2383-
optional percent100ths position = 0;
2384-
optional boolean latch = 1;
2385-
optional ThreeLevelAutoEnum speed = 2;
2386-
}
2387-
23882383
struct UnitRangeStruct {
23892384
int16s min = 0;
23902385
int16s max = 1;
23912386
}
23922387

2393-
readonly attribute nullable CurrentStateStruct currentState = 0;
2394-
readonly attribute nullable TargetStruct target = 1;
2388+
readonly attribute nullable DimensionStateStruct currentState = 0;
2389+
readonly attribute nullable DimensionStateStruct targetState = 1;
23952390
readonly attribute optional percent100ths resolution = 2;
23962391
readonly attribute optional percent100ths stepValue = 3;
23972392
readonly attribute optional ClosureUnitEnum unit = 4;
@@ -2401,6 +2396,7 @@ provisional cluster ClosureDimension = 261 {
24012396
readonly attribute optional RotationAxisEnum rotationAxis = 8;
24022397
readonly attribute optional OverflowEnum overflow = 9;
24032398
readonly attribute optional ModulationTypeEnum modulationType = 10;
2399+
readonly attribute optional LatchControlModesBitmap latchControlModes = 11;
24042400
readonly attribute command_id generatedCommandList[] = 65528;
24052401
readonly attribute command_id acceptedCommandList[] = 65529;
24062402
readonly attribute attrib_id attributeList[] = 65531;
@@ -2419,9 +2415,9 @@ provisional cluster ClosureDimension = 261 {
24192415
optional ThreeLevelAutoEnum speed = 2;
24202416
}
24212417

2422-
/** This command is used to move a dimension of the device to a target position. */
2418+
/** This command is used to move a dimension of the closure to a target position. */
24232419
command SetTarget(SetTargetRequest): DefaultSuccess = 0;
2424-
/** This command is used to move a dimension of the device to a target position by a number of steps. */
2420+
/** Upon receipt, this SHALL move a dimension of the closure to a target position by a number of steps. */
24252421
command Step(StepRequest): DefaultSuccess = 1;
24262422
}
24272423

@@ -2854,7 +2850,7 @@ endpoint 2 {
28542850

28552851
server cluster ClosureDimension {
28562852
callback attribute currentState;
2857-
callback attribute target;
2853+
callback attribute targetState;
28582854
ram attribute resolution;
28592855
ram attribute stepValue;
28602856
ram attribute unit;
@@ -2864,6 +2860,7 @@ endpoint 2 {
28642860
ram attribute rotationAxis;
28652861
ram attribute overflow;
28662862
ram attribute modulationType;
2863+
ram attribute latchControlModes;
28672864
callback attribute generatedCommandList;
28682865
callback attribute acceptedCommandList;
28692866
callback attribute attributeList;
@@ -2893,7 +2890,7 @@ endpoint 3 {
28932890

28942891
server cluster ClosureDimension {
28952892
callback attribute currentState;
2896-
callback attribute target;
2893+
callback attribute targetState;
28972894
ram attribute resolution;
28982895
ram attribute stepValue;
28992896
ram attribute unit;
@@ -2903,6 +2900,7 @@ endpoint 3 {
29032900
ram attribute rotationAxis;
29042901
ram attribute overflow;
29052902
ram attribute modulationType;
2903+
ram attribute latchControlModes;
29062904
callback attribute generatedCommandList;
29072905
callback attribute acceptedCommandList;
29082906
callback attribute attributeList;

‎examples/closure-app/closure-common/closure-app.zap‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5390,7 +5390,7 @@
53905390
"code": 0,
53915391
"mfgCode": null,
53925392
"side": "server",
5393-
"type": "CurrentStateStruct",
5393+
"type": "DimensionStateStruct",
53945394
"included": 1,
53955395
"storageOption": "External",
53965396
"singleton": 0,
@@ -5402,11 +5402,11 @@
54025402
"reportableChange": 0
54035403
},
54045404
{
5405-
"name": "Target",
5405+
"name": "TargetState",
54065406
"code": 1,
54075407
"mfgCode": null,
54085408
"side": "server",
5409-
"type": "TargetStruct",
5409+
"type": "DimensionStateStruct",
54105410
"included": 1,
54115411
"storageOption": "External",
54125412
"singleton": 0,
@@ -5561,6 +5561,22 @@
55615561
"maxInterval": 65534,
55625562
"reportableChange": 0
55635563
},
5564+
{
5565+
"name": "LatchControlModes",
5566+
"code": 11,
5567+
"mfgCode": null,
5568+
"side": "server",
5569+
"type": "LatchControlModesBitmap",
5570+
"included": 1,
5571+
"storageOption": "RAM",
5572+
"singleton": 0,
5573+
"bounded": 0,
5574+
"defaultValue": "",
5575+
"reportable": 1,
5576+
"minInterval": 1,
5577+
"maxInterval": 65534,
5578+
"reportableChange": 0
5579+
},
55645580
{
55655581
"name": "GeneratedCommandList",
55665582
"code": 65528,
@@ -5876,7 +5892,7 @@
58765892
"code": 0,
58775893
"mfgCode": null,
58785894
"side": "server",
5879-
"type": "CurrentStateStruct",
5895+
"type": "DimensionStateStruct",
58805896
"included": 1,
58815897
"storageOption": "External",
58825898
"singleton": 0,
@@ -5888,11 +5904,11 @@
58885904
"reportableChange": 0
58895905
},
58905906
{
5891-
"name": "Target",
5907+
"name": "TargetState",
58925908
"code": 1,
58935909
"mfgCode": null,
58945910
"side": "server",
5895-
"type": "TargetStruct",
5911+
"type": "DimensionStateStruct",
58965912
"included": 1,
58975913
"storageOption": "External",
58985914
"singleton": 0,
@@ -6047,6 +6063,22 @@
60476063
"maxInterval": 65534,
60486064
"reportableChange": 0
60496065
},
6066+
{
6067+
"name": "LatchControlModes",
6068+
"code": 11,
6069+
"mfgCode": null,
6070+
"side": "server",
6071+
"type": "LatchControlModesBitmap",
6072+
"included": 1,
6073+
"storageOption": "RAM",
6074+
"singleton": 0,
6075+
"bounded": 0,
6076+
"defaultValue": "",
6077+
"reportable": 1,
6078+
"minInterval": 1,
6079+
"maxInterval": 65534,
6080+
"reportableChange": 0
6081+
},
60506082
{
60516083
"name": "GeneratedCommandList",
60526084
"code": 65528,

0 commit comments

Comments
 (0)