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

Remove deprecated RVC items #31451

Merged
merged 27 commits into from
Jan 29, 2024
Merged

Remove deprecated RVC items #31451

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3347533
Depricated the OnMode attribute for the RvcRunMode and RvcCleanMode c…
hicklin Jan 16, 2024
27b55bf
Depricated the OnOff feature for the RvcRunMode and RvcCleanMode clus…
hicklin Jan 16, 2024
28a3bea
Depricated the Start and Stop commands for the RvcOperationalState cl…
hicklin Jan 16, 2024
6d96609
Removed the depricated OnMode attributes from the attributeAccessInte…
hicklin Jan 16, 2024
63b3ee6
Removed the RvcOpState tests for the Start and stop command.
hicklin Jan 16, 2024
0088e84
regenerated zap code.
hicklin Jan 16, 2024
ac33a60
Restyled by prettier-json
restyled-commits Jan 16, 2024
af83ffb
Added back the feature map for the RvcClean and RvcRun mode clusters …
hicklin Jan 17, 2024
66a1d0f
Regenerated files.
hicklin Jan 17, 2024
8869972
Updated the all-clusters-app zap file.
hicklin Jan 17, 2024
3eaadf4
Regenerated the matter file for the all-clusters-app.
hicklin Jan 17, 2024
8fe32ae
Removed the setting of the OnOff feature in instances of RvcRunMode a…
hicklin Jan 17, 2024
7c5c6bc
Merge branch 'master' into remove_depricated_RVC_items
hicklin Jan 17, 2024
4ce890b
Merge branch 'master' into remove_depricated_RVC_items
hicklin Jan 22, 2024
98750a7
Regenerated zap files.
hicklin Jan 22, 2024
f768e20
Merge branch 'master' into remove_depricated_RVC_item and regenerated…
hicklin Jan 25, 2024
282567d
Merge branch 'master' into remove_depricated_RVC_items
hicklin Jan 25, 2024
7a05862
Restyled by clang-format
restyled-commits Jan 25, 2024
2f26b66
The Objects.py template adds a kInternalDoNotUseNone entry if a bitma…
hicklin Jan 25, 2024
856f906
Merge branch 'master' into remove_depricated_RVC_items
hicklin Jan 25, 2024
9175e75
Replaced the previous solution that fixed the issue in the generated …
hicklin Jan 26, 2024
1f20db4
Merge branch 'master' into remove_depricated_RVC_items
hicklin Jan 29, 2024
3603fa6
Used the new kNoFeatures feature instead of a locally declared constant.
hicklin Jan 29, 2024
d18bfcd
Readded a valve cluster attributed which was annoyingly removed by za…
hicklin Jan 29, 2024
d6e6db3
Restyled by clang-format
restyled-commits Jan 29, 2024
b226510
Regenerated zap files.
hicklin Jan 29, 2024
6a6d3df
Fixed missing namesapace call.
hicklin Jan 29, 2024
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
16 changes: 3 additions & 13 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 @@ -2863,7 +2863,6 @@ cluster RvcRunMode = 84 {
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
Expand All @@ -2879,7 +2878,6 @@ cluster RvcRunMode = 84 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
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 Down Expand Up @@ -2916,7 +2914,6 @@ cluster RvcCleanMode = 85 {
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
Expand All @@ -2932,7 +2929,6 @@ cluster RvcCleanMode = 85 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
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 Down Expand Up @@ -3414,10 +3410,6 @@ cluster RvcOperationalState = 97 {

/** 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;
}
Expand Down Expand Up @@ -7615,9 +7607,9 @@ endpoint 1 {
server cluster RvcRunMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 2;
Expand All @@ -7629,9 +7621,9 @@ endpoint 1 {
server cluster RvcCleanMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 2;
Expand Down Expand Up @@ -7779,6 +7771,7 @@ endpoint 1 {
callback attribute operationalError;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
Expand Down Expand Up @@ -7888,7 +7881,6 @@ endpoint 1 {
ram attribute targetLevel;
persist attribute defaultOpenLevel default = 100;
ram attribute valveFault default = 0;
ram attribute levelStep default = 1;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down Expand Up @@ -8621,8 +8613,6 @@ endpoint 1 {
handle command TestSimpleOptionalArgumentRequest;
handle command TestEmitTestEventRequest;
handle command TestEmitTestFabricScopedEventRequest;
handle command TestBatchHelperRequest;
handle command TestSecondBatchHelperRequest;
}
}
endpoint 2 {
Expand Down
90 changes: 41 additions & 49 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9518,11 +9518,11 @@
"reportableChange": 0
},
{
"name": "OnMode",
"code": 3,
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
"side": "server",
"type": "int8u",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand All @@ -9534,8 +9534,8 @@
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
"name": "AcceptedCommandList",
"code": 65529,
"mfgCode": null,
"side": "server",
"type": "array",
Expand All @@ -9550,16 +9550,16 @@
"reportableChange": 0
},
{
"name": "AcceptedCommandList",
"code": 65529,
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -9674,11 +9674,11 @@
"reportableChange": 0
},
{
"name": "OnMode",
"code": 3,
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
"side": "server",
"type": "int8u",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand All @@ -9690,8 +9690,8 @@
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
"name": "AcceptedCommandList",
"code": 65529,
"mfgCode": null,
"side": "server",
"type": "array",
Expand All @@ -9706,16 +9706,16 @@
"reportableChange": 0
},
{
"name": "AcceptedCommandList",
"code": 65529,
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -11262,6 +11262,14 @@
"source": "server",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "GoHome",
"code": 128,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -11393,6 +11401,22 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
Expand Down Expand Up @@ -11888,7 +11912,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -12307,22 +12331,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "LevelStep",
"code": 10,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
Expand Down Expand Up @@ -20678,22 +20686,6 @@
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TestBatchHelperRequest",
"code": 22,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "TestSecondBatchHelperRequest",
"code": 23,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
}
],
"attributes": [
Expand Down
6 changes: 4 additions & 2 deletions examples/all-clusters-app/all-clusters-common/src/rvc-modes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ template <typename T>
using List = chip::app::DataModel::List<T>;
using ModeTagStructType = chip::app::Clusters::detail::Structs::ModeTagStruct::Type;

const uint32_t NO_FEATURES = 0;

// RVC Run

static RvcRunModeDelegate * gRvcRunModeDelegate = nullptr;
Expand Down Expand Up @@ -113,7 +115,7 @@ void emberAfRvcRunModeClusterInitCallback(chip::EndpointId endpointId)
VerifyOrDie(gRvcRunModeDelegate == nullptr && gRvcRunModeInstance == nullptr);
gRvcRunModeDelegate = new RvcRunMode::RvcRunModeDelegate;
gRvcRunModeInstance =
new ModeBase::Instance(gRvcRunModeDelegate, 0x1, RvcRunMode::Id, chip::to_underlying(RvcRunMode::Feature::kOnOff));
new ModeBase::Instance(gRvcRunModeDelegate, 0x1, RvcRunMode::Id, NO_FEATURES);
gRvcRunModeInstance->Init();
}

Expand Down Expand Up @@ -202,6 +204,6 @@ void emberAfRvcCleanModeClusterInitCallback(chip::EndpointId endpointId)
VerifyOrDie(gRvcCleanModeDelegate == nullptr && gRvcCleanModeInstance == nullptr);
gRvcCleanModeDelegate = new RvcCleanMode::RvcCleanModeDelegate;
gRvcCleanModeInstance =
new ModeBase::Instance(gRvcCleanModeDelegate, 0x1, RvcCleanMode::Id, chip::to_underlying(RvcCleanMode::Feature::kOnOff));
new ModeBase::Instance(gRvcCleanModeDelegate, 0x1, RvcCleanMode::Id, NO_FEATURES);
gRvcCleanModeInstance->Init();
}
12 changes: 0 additions & 12 deletions examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,6 @@ cluster RvcRunMode = 84 {
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
Expand All @@ -1036,7 +1035,6 @@ cluster RvcRunMode = 84 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
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 Down Expand Up @@ -1073,7 +1071,6 @@ cluster RvcCleanMode = 85 {
}

bitmap Feature : bitmap32 {
kOnOff = 0x1;
}

struct ModeTagStruct {
Expand All @@ -1089,7 +1086,6 @@ cluster RvcCleanMode = 85 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
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 Down Expand Up @@ -1172,10 +1168,6 @@ cluster RvcOperationalState = 97 {

/** 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;
}
Expand Down Expand Up @@ -1408,7 +1400,6 @@ endpoint 1 {
server cluster RvcRunMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand All @@ -1423,7 +1414,6 @@ endpoint 1 {
server cluster RvcCleanMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down Expand Up @@ -1452,8 +1442,6 @@ endpoint 1 {
ram attribute clusterRevision default = 1;

handle command Pause;
handle command Stop;
handle command Start;
handle command Resume;
handle command OperationalCommandResponse;
}
Expand Down
Loading
Loading