Skip to content

Commit 7a3174c

Browse files
hicklinrestyled-commits
hicklin
and
restyled-commits
authored
Remove deprecated RVC items (#31451)
* Depricated the OnMode attribute for the RvcRunMode and RvcCleanMode clusters. * Depricated the OnOff feature for the RvcRunMode and RvcCleanMode clusters. * Depricated the Start and Stop commands for the RvcOperationalState cluster. * Removed the depricated OnMode attributes from the attributeAccessInterfaceAttributes. * Removed the RvcOpState tests for the Start and stop command. * regenerated zap code. * Restyled by prettier-json * Added back the feature map for the RvcClean and RvcRun mode clusters without the OnOff feature. * Regenerated files. * Updated the all-clusters-app zap file. * Regenerated the matter file for the all-clusters-app. * Removed the setting of the OnOff feature in instances of RvcRunMode and RvcCleanMode in the all-clusters-app * Regenerated zap files. * Restyled by clang-format * The Objects.py template adds a kInternalDoNotUseNone entry if a bitmap has no entryies. * Replaced the previous solution that fixed the issue in the generated python files canused by the lack of bitmasks by adding a NoFeatures=0 mask. * Used the new kNoFeatures feature instead of a locally declared constant. * Readded a valve cluster attributed which was annoyingly removed by zap issues. * Restyled by clang-format * Regenerated zap files. * Fixed missing namesapace call. --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent f63b505 commit 7a3174c

Some content is hidden

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

45 files changed

+78468
-2194
lines changed

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

+5-10
Original file line numberDiff line numberDiff line change
@@ -2929,7 +2929,7 @@ cluster RvcRunMode = 84 {
29292929
}
29302930

29312931
bitmap Feature : bitmap32 {
2932-
kOnOff = 0x1;
2932+
kNoFeatures = 0x0;
29332933
}
29342934

29352935
struct ModeTagStruct {
@@ -2945,7 +2945,6 @@ cluster RvcRunMode = 84 {
29452945

29462946
readonly attribute ModeOptionStruct supportedModes[] = 0;
29472947
readonly attribute int8u currentMode = 1;
2948-
attribute optional nullable int8u onMode = 3;
29492948
readonly attribute command_id generatedCommandList[] = 65528;
29502949
readonly attribute command_id acceptedCommandList[] = 65529;
29512950
readonly attribute event_id eventList[] = 65530;
@@ -2982,7 +2981,7 @@ cluster RvcCleanMode = 85 {
29822981
}
29832982

29842983
bitmap Feature : bitmap32 {
2985-
kOnOff = 0x1;
2984+
kNoFeatures = 0x0;
29862985
}
29872986

29882987
struct ModeTagStruct {
@@ -2998,7 +2997,6 @@ cluster RvcCleanMode = 85 {
29982997

29992998
readonly attribute ModeOptionStruct supportedModes[] = 0;
30002999
readonly attribute int8u currentMode = 1;
3001-
attribute optional nullable int8u onMode = 3;
30023000
readonly attribute command_id generatedCommandList[] = 65528;
30033001
readonly attribute command_id acceptedCommandList[] = 65529;
30043002
readonly attribute event_id eventList[] = 65530;
@@ -3480,10 +3478,6 @@ cluster RvcOperationalState = 97 {
34803478

34813479
/** Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. */
34823480
command Pause(): OperationalCommandResponse = 0;
3483-
/** Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. */
3484-
command Stop(): OperationalCommandResponse = 1;
3485-
/** 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. */
3486-
command Start(): OperationalCommandResponse = 2;
34873481
/** 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). */
34883482
command Resume(): OperationalCommandResponse = 3;
34893483
/** On receipt of this command, the device SHALL start seeking the charging dock, if possible in the current state of the device. */
@@ -7807,9 +7801,9 @@ endpoint 1 {
78077801
server cluster RvcRunMode {
78087802
callback attribute supportedModes;
78097803
callback attribute currentMode;
7810-
callback attribute onMode;
78117804
callback attribute generatedCommandList;
78127805
callback attribute acceptedCommandList;
7806+
callback attribute eventList;
78137807
callback attribute attributeList;
78147808
callback attribute featureMap;
78157809
ram attribute clusterRevision default = 2;
@@ -7821,9 +7815,9 @@ endpoint 1 {
78217815
server cluster RvcCleanMode {
78227816
callback attribute supportedModes;
78237817
callback attribute currentMode;
7824-
callback attribute onMode;
78257818
callback attribute generatedCommandList;
78267819
callback attribute acceptedCommandList;
7820+
callback attribute eventList;
78277821
callback attribute attributeList;
78287822
callback attribute featureMap;
78297823
ram attribute clusterRevision default = 2;
@@ -7971,6 +7965,7 @@ endpoint 1 {
79717965
callback attribute operationalError;
79727966
callback attribute generatedCommandList;
79737967
callback attribute acceptedCommandList;
7968+
callback attribute eventList;
79747969
callback attribute attributeList;
79757970
ram attribute featureMap default = 0;
79767971
ram attribute clusterRevision default = 1;

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

+32-16
Original file line numberDiff line numberDiff line change
@@ -9470,11 +9470,11 @@
94709470
"reportableChange": 0
94719471
},
94729472
{
9473-
"name": "OnMode",
9474-
"code": 3,
9473+
"name": "GeneratedCommandList",
9474+
"code": 65528,
94759475
"mfgCode": null,
94769476
"side": "server",
9477-
"type": "int8u",
9477+
"type": "array",
94789478
"included": 1,
94799479
"storageOption": "External",
94809480
"singleton": 0,
@@ -9486,8 +9486,8 @@
94869486
"reportableChange": 0
94879487
},
94889488
{
9489-
"name": "GeneratedCommandList",
9490-
"code": 65528,
9489+
"name": "AcceptedCommandList",
9490+
"code": 65529,
94919491
"mfgCode": null,
94929492
"side": "server",
94939493
"type": "array",
@@ -9502,16 +9502,16 @@
95029502
"reportableChange": 0
95039503
},
95049504
{
9505-
"name": "AcceptedCommandList",
9506-
"code": 65529,
9505+
"name": "EventList",
9506+
"code": 65530,
95079507
"mfgCode": null,
95089508
"side": "server",
95099509
"type": "array",
95109510
"included": 1,
95119511
"storageOption": "External",
95129512
"singleton": 0,
95139513
"bounded": 0,
9514-
"defaultValue": null,
9514+
"defaultValue": "",
95159515
"reportable": 1,
95169516
"minInterval": 1,
95179517
"maxInterval": 65534,
@@ -9626,11 +9626,11 @@
96269626
"reportableChange": 0
96279627
},
96289628
{
9629-
"name": "OnMode",
9630-
"code": 3,
9629+
"name": "GeneratedCommandList",
9630+
"code": 65528,
96319631
"mfgCode": null,
96329632
"side": "server",
9633-
"type": "int8u",
9633+
"type": "array",
96349634
"included": 1,
96359635
"storageOption": "External",
96369636
"singleton": 0,
@@ -9642,8 +9642,8 @@
96429642
"reportableChange": 0
96439643
},
96449644
{
9645-
"name": "GeneratedCommandList",
9646-
"code": 65528,
9645+
"name": "AcceptedCommandList",
9646+
"code": 65529,
96479647
"mfgCode": null,
96489648
"side": "server",
96499649
"type": "array",
@@ -9658,16 +9658,16 @@
96589658
"reportableChange": 0
96599659
},
96609660
{
9661-
"name": "AcceptedCommandList",
9662-
"code": 65529,
9661+
"name": "EventList",
9662+
"code": 65530,
96639663
"mfgCode": null,
96649664
"side": "server",
96659665
"type": "array",
96669666
"included": 1,
96679667
"storageOption": "External",
96689668
"singleton": 0,
96699669
"bounded": 0,
9670-
"defaultValue": null,
9670+
"defaultValue": "",
96719671
"reportable": 1,
96729672
"minInterval": 1,
96739673
"maxInterval": 65534,
@@ -11353,6 +11353,22 @@
1135311353
"maxInterval": 65534,
1135411354
"reportableChange": 0
1135511355
},
11356+
{
11357+
"name": "EventList",
11358+
"code": 65530,
11359+
"mfgCode": null,
11360+
"side": "server",
11361+
"type": "array",
11362+
"included": 1,
11363+
"storageOption": "External",
11364+
"singleton": 0,
11365+
"bounded": 0,
11366+
"defaultValue": "",
11367+
"reportable": 1,
11368+
"minInterval": 1,
11369+
"maxInterval": 65534,
11370+
"reportableChange": 0
11371+
},
1135611372
{
1135711373
"name": "AttributeList",
1135811374
"code": 65531,

‎examples/all-clusters-app/all-clusters-common/src/rvc-modes.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ void emberAfRvcRunModeClusterInitCallback(chip::EndpointId endpointId)
112112
VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
113113
VerifyOrDie(gRvcRunModeDelegate == nullptr && gRvcRunModeInstance == nullptr);
114114
gRvcRunModeDelegate = new RvcRunMode::RvcRunModeDelegate;
115-
gRvcRunModeInstance = new ModeBase::Instance(gRvcRunModeDelegate, 0x1, RvcRunMode::Id, 0);
115+
gRvcRunModeInstance =
116+
new ModeBase::Instance(gRvcRunModeDelegate, 0x1, RvcRunMode::Id, chip::to_underlying(RvcRunMode::Feature::kNoFeatures));
116117
gRvcRunModeInstance->Init();
117118
}
118119

@@ -201,6 +202,7 @@ void emberAfRvcCleanModeClusterInitCallback(chip::EndpointId endpointId)
201202
VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
202203
VerifyOrDie(gRvcCleanModeDelegate == nullptr && gRvcCleanModeInstance == nullptr);
203204
gRvcCleanModeDelegate = new RvcCleanMode::RvcCleanModeDelegate;
204-
gRvcCleanModeInstance = new ModeBase::Instance(gRvcCleanModeDelegate, 0x1, RvcCleanMode::Id, 0);
205+
gRvcCleanModeInstance =
206+
new ModeBase::Instance(gRvcCleanModeDelegate, 0x1, RvcCleanMode::Id, chip::to_underlying(RvcRunMode::Feature::kNoFeatures));
205207
gRvcCleanModeInstance->Init();
206208
}

‎examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter

+2-12
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ cluster RvcRunMode = 84 {
10201020
}
10211021

10221022
bitmap Feature : bitmap32 {
1023-
kOnOff = 0x1;
1023+
kNoFeatures = 0x0;
10241024
}
10251025

10261026
struct ModeTagStruct {
@@ -1036,7 +1036,6 @@ cluster RvcRunMode = 84 {
10361036

10371037
readonly attribute ModeOptionStruct supportedModes[] = 0;
10381038
readonly attribute int8u currentMode = 1;
1039-
attribute optional nullable int8u onMode = 3;
10401039
readonly attribute command_id generatedCommandList[] = 65528;
10411040
readonly attribute command_id acceptedCommandList[] = 65529;
10421041
readonly attribute event_id eventList[] = 65530;
@@ -1073,7 +1072,7 @@ cluster RvcCleanMode = 85 {
10731072
}
10741073

10751074
bitmap Feature : bitmap32 {
1076-
kOnOff = 0x1;
1075+
kNoFeatures = 0x0;
10771076
}
10781077

10791078
struct ModeTagStruct {
@@ -1089,7 +1088,6 @@ cluster RvcCleanMode = 85 {
10891088

10901089
readonly attribute ModeOptionStruct supportedModes[] = 0;
10911090
readonly attribute int8u currentMode = 1;
1092-
attribute optional nullable int8u onMode = 3;
10931091
readonly attribute command_id generatedCommandList[] = 65528;
10941092
readonly attribute command_id acceptedCommandList[] = 65529;
10951093
readonly attribute event_id eventList[] = 65530;
@@ -1172,10 +1170,6 @@ cluster RvcOperationalState = 97 {
11721170

11731171
/** Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. */
11741172
command Pause(): OperationalCommandResponse = 0;
1175-
/** Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. */
1176-
command Stop(): OperationalCommandResponse = 1;
1177-
/** 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. */
1178-
command Start(): OperationalCommandResponse = 2;
11791173
/** 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). */
11801174
command Resume(): OperationalCommandResponse = 3;
11811175
/** On receipt of this command, the device SHALL start seeking the charging dock, if possible in the current state of the device. */
@@ -1410,7 +1404,6 @@ endpoint 1 {
14101404
server cluster RvcRunMode {
14111405
callback attribute supportedModes;
14121406
callback attribute currentMode;
1413-
callback attribute onMode;
14141407
callback attribute generatedCommandList;
14151408
callback attribute acceptedCommandList;
14161409
callback attribute eventList;
@@ -1425,7 +1418,6 @@ endpoint 1 {
14251418
server cluster RvcCleanMode {
14261419
callback attribute supportedModes;
14271420
callback attribute currentMode;
1428-
callback attribute onMode;
14291421
callback attribute generatedCommandList;
14301422
callback attribute acceptedCommandList;
14311423
callback attribute eventList;
@@ -1454,8 +1446,6 @@ endpoint 1 {
14541446
ram attribute clusterRevision default = 1;
14551447

14561448
handle command Pause;
1457-
handle command Stop;
1458-
handle command Start;
14591449
handle command Resume;
14601450
handle command OperationalCommandResponse;
14611451
}

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ cluster RvcRunMode = 84 {
943943
}
944944

945945
bitmap Feature : bitmap32 {
946-
kOnOff = 0x1;
946+
kNoFeatures = 0x0;
947947
}
948948

949949
struct ModeTagStruct {
@@ -959,7 +959,6 @@ cluster RvcRunMode = 84 {
959959

960960
readonly attribute ModeOptionStruct supportedModes[] = 0;
961961
readonly attribute int8u currentMode = 1;
962-
attribute optional nullable int8u onMode = 3;
963962
readonly attribute command_id generatedCommandList[] = 65528;
964963
readonly attribute command_id acceptedCommandList[] = 65529;
965964
readonly attribute event_id eventList[] = 65530;
@@ -996,7 +995,7 @@ cluster RvcCleanMode = 85 {
996995
}
997996

998997
bitmap Feature : bitmap32 {
999-
kOnOff = 0x1;
998+
kNoFeatures = 0x0;
1000999
}
10011000

10021001
struct ModeTagStruct {
@@ -1012,7 +1011,6 @@ cluster RvcCleanMode = 85 {
10121011

10131012
readonly attribute ModeOptionStruct supportedModes[] = 0;
10141013
readonly attribute int8u currentMode = 1;
1015-
attribute optional nullable int8u onMode = 3;
10161014
readonly attribute command_id generatedCommandList[] = 65528;
10171015
readonly attribute command_id acceptedCommandList[] = 65529;
10181016
readonly attribute event_id eventList[] = 65530;
@@ -1095,10 +1093,6 @@ cluster RvcOperationalState = 97 {
10951093

10961094
/** Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. */
10971095
command Pause(): OperationalCommandResponse = 0;
1098-
/** Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. */
1099-
command Stop(): OperationalCommandResponse = 1;
1100-
/** 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. */
1101-
command Start(): OperationalCommandResponse = 2;
11021096
/** 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). */
11031097
command Resume(): OperationalCommandResponse = 3;
11041098
/** On receipt of this command, the device SHALL start seeking the charging dock, if possible in the current state of the device. */

‎src/app/tests/suites/TestRVCOperationalState.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ tests:
7373
response:
7474
value: 0
7575

76-
- label: "Start Command"
77-
command: "Start"
78-
response:
79-
error: UNSUPPORTED_COMMAND
80-
8176
- label: "Read current Operational State"
8277
command: "readAttribute"
8378
attribute: "OperationalState"
@@ -110,11 +105,6 @@ tests:
110105
response:
111106
value: 0
112107

113-
- label: "Stop Command"
114-
command: "Stop"
115-
response:
116-
error: UNSUPPORTED_COMMAND
117-
118108
- label: "Read current Operational State"
119109
command: "readAttribute"
120110
attribute: "OperationalState"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ This is because zap does not currently support generating code for clusters that
9090
<!-- <cluster code="0x..."/>-->
9191
<cluster code="0x0051"/> <!-- Laundry Washer Mode -->
9292
<cluster code="0x0052"/> <!-- Refrigerator and temperature controlled cabinet Mode -->
93-
<cluster code="0x0054"/> <!-- RVC Run Mode -->
94-
<cluster code="0x0055"/> <!-- RVC Clean Mode -->
93+
<!-- <cluster code="0x0054"/> RVC Run Mode. This feature map is implemented in rvc-run-mode-cluster.xml -->
94+
<!-- <cluster code="0x0055"/> RVC Clean Mode. This feature map is implemented in rvc-clean-mode-cluster.xml -->
9595
<cluster code="0x0059"/> <!-- Dishwasher Mode -->
9696
<cluster code="0x005E"/> <!-- Microwave Oven Mode -->
9797
<cluster code="0x0049"/> <!-- Oven Mode -->

‎src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml

+2-6
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,9 @@ both values from this cluster and from the base cluster.
6464
<description>Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server.</description>
6565
</command>
6666

67-
<command source="client" code="0x01" name="Stop" response="OperationalCommandResponse" optional="true">
68-
<description>Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.</description>
69-
</command>
67+
<!-- Command Stop with code 0x01 is deprecated -->
7068

71-
<command source="client" code="0x02" name="Start" response="OperationalCommandResponse" optional="true">
72-
<description>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.</description>
73-
</command>
69+
<!-- Command Start with code 0x02 is deprecated -->
7470

7571
<command source="client" code="0x03" name="Resume" response="OperationalCommandResponse" optional="true">
7672
<description>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).</description>

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ limitations under the License.
4141
<!-- Base data types -->
4242
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
4343
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
44-
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">OnMode</attribute>
44+
<!-- Attribute OnMode with code 0x0003 is deprecated -->
4545

4646
<!-- Commands -->
4747
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
@@ -60,4 +60,11 @@ limitations under the License.
6060
<arg name="StatusText" type="char_string" lenght="64" optional="true"/>
6161
</command>
6262
</cluster>
63+
64+
<bitmap name="Feature" type="bitmap32">
65+
<cluster code="0x0055"/>
66+
<field name="NoFeatures" mask="0x0"/>
67+
<!-- Feature OnOff with code 0x01 is deprecated -->
68+
</bitmap>
69+
6370
</configurator>

0 commit comments

Comments
 (0)