Skip to content

Commit bf45da8

Browse files
plauricplauric
authored
RVCRunMode RVCCleanMode clusters: align XMLs with spec (project-chip#41760)
* RVCRunMode RVCCleanMode align XMLs with spec * XML regen
1 parent 0834f1b commit bf45da8

File tree

13 files changed

+32
-32
lines changed

13 files changed

+32
-32
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3332,7 +3332,7 @@ cluster LaundryWasherControls = 83 {
33323332

33333333
/** Attributes and commands for selecting a mode from a list of supported options. */
33343334
cluster RvcRunMode = 84 {
3335-
revision 3;
3335+
revision 4;
33363336

33373337
enum ModeTag : enum16 {
33383338
kAuto = 0;
@@ -3362,7 +3362,7 @@ cluster RvcRunMode = 84 {
33623362
}
33633363

33643364
bitmap Feature : bitmap32 {
3365-
kDirectModeChange = 0x10000;
3365+
kDirectModeChange = 0x100000;
33663366
}
33673367

33683368
shared struct ModeTagStruct {
@@ -3400,7 +3400,7 @@ cluster RvcRunMode = 84 {
34003400

34013401
/** Attributes and commands for selecting a mode from a list of supported options. */
34023402
cluster RvcCleanMode = 85 {
3403-
revision 3;
3403+
revision 5;
34043404

34053405
enum ModeTag : enum16 {
34063406
kAuto = 0;
@@ -3424,7 +3424,7 @@ cluster RvcCleanMode = 85 {
34243424
}
34253425

34263426
bitmap Feature : bitmap32 {
3427-
kDirectModeChange = 0x10000;
3427+
kDirectModeChange = 0x100000;
34283428
}
34293429

34303430
shared struct ModeTagStruct {

‎examples/all-clusters-app/realtek/data_model/all-clusters-app.matter‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3429,7 +3429,7 @@ cluster LaundryWasherControls = 83 {
34293429

34303430
/** Attributes and commands for selecting a mode from a list of supported options. */
34313431
cluster RvcRunMode = 84 {
3432-
revision 3;
3432+
revision 4;
34333433

34343434
enum ModeTag : enum16 {
34353435
kAuto = 0;
@@ -3459,7 +3459,7 @@ cluster RvcRunMode = 84 {
34593459
}
34603460

34613461
bitmap Feature : bitmap32 {
3462-
kDirectModeChange = 0x10000;
3462+
kDirectModeChange = 0x100000;
34633463
}
34643464

34653465
shared struct ModeTagStruct {
@@ -3497,7 +3497,7 @@ cluster RvcRunMode = 84 {
34973497

34983498
/** Attributes and commands for selecting a mode from a list of supported options. */
34993499
cluster RvcCleanMode = 85 {
3500-
revision 3;
3500+
revision 5;
35013501

35023502
enum ModeTag : enum16 {
35033503
kAuto = 0;
@@ -3521,7 +3521,7 @@ cluster RvcCleanMode = 85 {
35213521
}
35223522

35233523
bitmap Feature : bitmap32 {
3524-
kDirectModeChange = 0x10000;
3524+
kDirectModeChange = 0x100000;
35253525
}
35263526

35273527
shared struct ModeTagStruct {

‎examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,7 @@ cluster GroupKeyManagement = 63 {
17301730

17311731
/** Attributes and commands for selecting a mode from a list of supported options. */
17321732
cluster RvcRunMode = 84 {
1733-
revision 3;
1733+
revision 4;
17341734

17351735
enum ModeTag : enum16 {
17361736
kAuto = 0;
@@ -1760,7 +1760,7 @@ cluster RvcRunMode = 84 {
17601760
}
17611761

17621762
bitmap Feature : bitmap32 {
1763-
kDirectModeChange = 0x10000;
1763+
kDirectModeChange = 0x100000;
17641764
}
17651765

17661766
shared struct ModeTagStruct {
@@ -1798,7 +1798,7 @@ cluster RvcRunMode = 84 {
17981798

17991799
/** Attributes and commands for selecting a mode from a list of supported options. */
18001800
cluster RvcCleanMode = 85 {
1801-
revision 3;
1801+
revision 5;
18021802

18031803
enum ModeTag : enum16 {
18041804
kAuto = 0;
@@ -1822,7 +1822,7 @@ cluster RvcCleanMode = 85 {
18221822
}
18231823

18241824
bitmap Feature : bitmap32 {
1825-
kDirectModeChange = 0x10000;
1825+
kDirectModeChange = 0x100000;
18261826
}
18271827

18281828
shared struct ModeTagStruct {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ cluster GroupKeyManagement = 63 {
14121412

14131413
/** Attributes and commands for selecting a mode from a list of supported options. */
14141414
cluster RvcRunMode = 84 {
1415-
revision 3;
1415+
revision 4;
14161416

14171417
enum ModeTag : enum16 {
14181418
kAuto = 0;
@@ -1442,7 +1442,7 @@ cluster RvcRunMode = 84 {
14421442
}
14431443

14441444
bitmap Feature : bitmap32 {
1445-
kDirectModeChange = 0x10000;
1445+
kDirectModeChange = 0x100000;
14461446
}
14471447

14481448
shared struct ModeTagStruct {
@@ -1480,7 +1480,7 @@ cluster RvcRunMode = 84 {
14801480

14811481
/** Attributes and commands for selecting a mode from a list of supported options. */
14821482
cluster RvcCleanMode = 85 {
1483-
revision 3;
1483+
revision 5;
14841484

14851485
enum ModeTag : enum16 {
14861486
kAuto = 0;
@@ -1504,7 +1504,7 @@ cluster RvcCleanMode = 85 {
15041504
}
15051505

15061506
bitmap Feature : bitmap32 {
1507-
kDirectModeChange = 0x10000;
1507+
kDirectModeChange = 0x100000;
15081508
}
15091509

15101510
shared struct ModeTagStruct {

‎src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ limitations under the License.
5454
<client init="false" tick="false">true</client>
5555
<server init="false" tick="false">true</server>
5656
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
57-
<globalAttribute side="either" code="0xFFFD" value="3"/>
57+
<globalAttribute side="either" code="0xFFFD" value="5"/>
5858

5959
<features>
6060
<!-- TODO: ZAP still generates feature bits for things with disallowConform!
6161
Tracked in https://github.com/project-chip/zap/issues/1413 -->
6262
<!--<feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
6363
<disallowConform/>
6464
</feature>-->
65-
<feature bit="16" code="DIRECTMODECH" name="DirectModeChange" summary="Cluster supports changing clean modes from non-Idle states">
65+
<feature bit="20" code="DIRECTMODECH" name="DirectModeChange" summary="Cluster supports changing clean modes from non-Idle states">
6666
<optionalConform/>
6767
</feature>
6868
</features>

‎src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ limitations under the License.
5959
<client init="false" tick="false">true</client>
6060
<server init="false" tick="false">true</server>
6161
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
62-
<globalAttribute side="either" code="0xFFFD" value="3"/>
62+
<globalAttribute side="either" code="0xFFFD" value="4"/>
6363

6464
<features>
6565
<!-- TODO: ZAP still generates feature bits for things with disallowConform!
6666
Tracked in https://github.com/project-chip/zap/issues/1413 -->
6767
<!--<feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
6868
<disallowConform/>
6969
</feature>-->
70-
<feature bit="16" code="DIRECTMODECH" name="DirectModeChange" summary="Cluster supports changing run modes from non-Idle states">
70+
<feature bit="20" code="DIRECTMODECH" name="DirectModeChange" summary="Cluster supports changing run modes from non-Idle states">
7171
<optionalConform/>
7272
</feature>
7373
</features>

‎src/controller/data_model/controller-clusters.matter‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3545,7 +3545,7 @@ cluster LaundryWasherControls = 83 {
35453545

35463546
/** Attributes and commands for selecting a mode from a list of supported options. */
35473547
cluster RvcRunMode = 84 {
3548-
revision 3;
3548+
revision 4;
35493549

35503550
enum ModeTag : enum16 {
35513551
kAuto = 0;
@@ -3575,7 +3575,7 @@ cluster RvcRunMode = 84 {
35753575
}
35763576

35773577
bitmap Feature : bitmap32 {
3578-
kDirectModeChange = 0x10000;
3578+
kDirectModeChange = 0x100000;
35793579
}
35803580

35813581
shared struct ModeTagStruct {
@@ -3613,7 +3613,7 @@ cluster RvcRunMode = 84 {
36133613

36143614
/** Attributes and commands for selecting a mode from a list of supported options. */
36153615
cluster RvcCleanMode = 85 {
3616-
revision 3;
3616+
revision 5;
36173617

36183618
enum ModeTag : enum16 {
36193619
kAuto = 0;
@@ -3637,7 +3637,7 @@ cluster RvcCleanMode = 85 {
36373637
}
36383638

36393639
bitmap Feature : bitmap32 {
3640-
kDirectModeChange = 0x10000;
3640+
kDirectModeChange = 0x100000;
36413641
}
36423642

36433643
shared struct ModeTagStruct {

‎src/controller/python/matter/clusters/Objects.py‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/clusters/RvcCleanMode/Enums.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ enum class StatusCode : uint8_t
6666
// Bitmap for Feature
6767
enum class Feature : uint32_t
6868
{
69-
kDirectModeChange = 0x10000,
69+
kDirectModeChange = 0x100000,
7070
};
7171
} // namespace RvcCleanMode
7272
} // namespace Clusters

0 commit comments

Comments
 (0)