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.

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

rename the Robotic Vacuum Operational State cluster #27273

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,3 @@ examples/thermostat/ameba/build
# https://github.com/espressif/idf-component-manager#using-with-a-project
examples/*/esp32/managed_components
examples/*/esp32/dependencies.lock
examples/all-clusters-app/all-clusters-common/all-clusters-app.zap.old
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ limitations under the License.

<cluster>
<domain>Robots</domain>
<name>Robotic Vacuum Operational State</name>
<name>RVC Operational State</name>
<code>0x0061</code>
<define>OPERATIONAL_STATE_RVC_CLUSTER</define>
<client init="false" tick="false">true</client>
Expand Down
7 changes: 5 additions & 2 deletions src/app/zap-templates/zcl/zcl-with-test-extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,11 @@
"LocalTime"
],
"Temperature Control": ["SupportedTemperatureLevels"],
"Operational State": ["OperationalState", "OperationalError"],
"Robotic Vacuum Operational State": [
"Operational State": [
"OperationalState",
"OperationalError"
],
"RVC Operational State": [
plauric marked this conversation as resolved.
Show resolved Hide resolved
"OperationalState",
"OperationalError"
]
Expand Down
7 changes: 5 additions & 2 deletions src/app/zap-templates/zcl/zcl.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,11 @@
"LocalTime"
],
"Temperature Control": ["SupportedTemperatureLevels"],
"Operational State": ["OperationalState", "OperationalError"],
"Robotic Vacuum Operational State": [
"Operational State": [
"OperationalState",
"OperationalError"
],
"RVC Operational State": [
"OperationalState",
"OperationalError"
]
Expand Down
2 changes: 1 addition & 1 deletion src/controller/data_model/controller-clusters.matter
Original file line number Diff line number Diff line change
Expand Up @@ -3416,7 +3416,7 @@ client cluster OperationalState = 96 {
}

/** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
client cluster RoboticVacuumOperationalState = 97 {
client cluster RvcOperationalState = 97 {
enum ErrorStateEnum : ENUM8 {
kFailedToFindChargingDock = 64;
kStuck = 65;
Expand Down
16 changes: 8 additions & 8 deletions src/controller/data_model/controller-clusters.zap
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
}
],
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -13154,7 +13154,7 @@
]
},
{
"name": "Robotic Vacuum Operational State",
"name": "RVC Operational State",
"code": 97,
"mfgCode": null,
"define": "OPERATIONAL_STATE_RVC_CLUSTER",
Expand Down Expand Up @@ -13230,7 +13230,7 @@
]
},
{
"name": "Robotic Vacuum Operational State",
"name": "RVC Operational State",
"code": 97,
"mfgCode": null,
"define": "OPERATIONAL_STATE_RVC_CLUSTER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ public static BaseCluster getCluster(long clusterId) {
if (clusterId == OperationalState.ID) {
return new OperationalState();
}
if (clusterId == RoboticVacuumOperationalState.ID) {
return new RoboticVacuumOperationalState();
if (clusterId == RvcOperationalState.ID) {
return new RvcOperationalState();
}
if (clusterId == HepaFilterMonitoring.ID) {
return new HepaFilterMonitoring();
Expand Down Expand Up @@ -7709,7 +7709,7 @@ public long getCommandID(String name) throws IllegalArgumentException {
return Command.valueOf(name).getID();
}
}
public static class RoboticVacuumOperationalState implements BaseCluster {
public static class RvcOperationalState implements BaseCluster {
public static final long ID = 97L;
public long getID() {
return ID;
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -1078,8 +1078,8 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
writeAttributeMap.put("smokeCoAlarm", writeSmokeCoAlarmInteractionInfo);
Map<String, InteractionInfo> writeOperationalStateInteractionInfo = new LinkedHashMap<>();
writeAttributeMap.put("operationalState", writeOperationalStateInteractionInfo);
Map<String, InteractionInfo> writeRoboticVacuumOperationalStateInteractionInfo = new LinkedHashMap<>();
writeAttributeMap.put("roboticVacuumOperationalState", writeRoboticVacuumOperationalStateInteractionInfo);
Map<String, InteractionInfo> writeRvcOperationalStateInteractionInfo = new LinkedHashMap<>();
writeAttributeMap.put("rvcOperationalState", writeRvcOperationalStateInteractionInfo);
Map<String, InteractionInfo> writeHepaFilterMonitoringInteractionInfo = new LinkedHashMap<>();
writeAttributeMap.put("hepaFilterMonitoring", writeHepaFilterMonitoringInteractionInfo);
Map<String, InteractionInfo> writeActivatedCarbonFilterMonitoringInteractionInfo = new LinkedHashMap<>();
Expand Down
26 changes: 11 additions & 15 deletions src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions src/controller/java/zap-generated/CHIPClientCallbacks.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 12 additions & 18 deletions src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading