Skip to content

Commit

Permalink
[Chef] Update AirPurifier composite device (project-chip#34126)
Browse files Browse the repository at this point in the history 
* [Chef] Update AirPurifier composite device

1. Fix conformance
2. Add necessary Attributes

* Update Humidity Value
  • Loading branch information
@erwinpan1
erwinpan1 authored Jun 28, 2024
1 parent c99be08 commit 99e20a9
Show file tree
Hide file tree
Showing 4 changed files with 423 additions and 52 deletions.
6 changes: 4 additions & 2 deletions examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1681,17 +1681,19 @@ endpoint 1 {
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 1;

handle command ResetCondition;
}

server cluster FanControl {
ram attribute fanMode default = 0;
ram attribute fanModeSequence default = 2;
ram attribute percentSetting default = 0;
ram attribute percentCurrent default = 0;
ram attribute speedMax default = 100;
ram attribute speedMax default = 10;
ram attribute speedSetting default = 0;
ram attribute speedCurrent default = 0;
ram attribute rockSupport default = 0x03;
ram attribute rockSupport default = 0x07;
ram attribute rockSetting default = 0x00;
ram attribute windSupport default = 0x03;
ram attribute windSetting default = 0x00;
Expand Down
36 changes: 23 additions & 13 deletions examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": "chip-v1"
"version": 1,
"description": "Matter SDK ZCL data"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -2529,7 +2529,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2545,7 +2545,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2561,7 +2561,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2577,7 +2577,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -3006,6 +3006,16 @@
"define": "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER",
"side": "server",
"enabled": 1,
"commands": [
{
"name": "ResetCondition",
"code": 0,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
}
],
"attributes": [
{
"name": "Condition",
Expand Down Expand Up @@ -3293,7 +3303,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "100",
"defaultValue": "10",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -3341,7 +3351,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x03",
"defaultValue": "0x07",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
59 changes: 42 additions & 17 deletions ...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2326,7 +2326,7 @@ endpoint 0 {
callback attribute windowStatus;
callback attribute adminFabricIndex;
callback attribute adminVendorId;
ram attribute featureMap default = 0;
ram attribute featureMap default = 0x0001;
ram attribute clusterRevision default = 0x0001;

handle command OpenCommissioningWindow;
Expand Down Expand Up @@ -2386,7 +2386,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 2;
ram attribute clusterRevision default = 4;

handle command Identify;
handle command TriggerEffect;
Expand All @@ -2399,7 +2399,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
ram attribute clusterRevision default = 4;

handle command AddGroup;
handle command AddGroupResponse;
Expand Down Expand Up @@ -2431,25 +2431,33 @@ endpoint 1 {
callback attribute degradationDirection;
callback attribute changeIndication;
callback attribute inPlaceIndicator;
callback attribute lastChangedTime;
callback attribute replacementProductList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 1;

handle command ResetCondition;
}

server cluster ActivatedCarbonFilterMonitoring {
callback attribute condition;
callback attribute degradationDirection;
callback attribute changeIndication;
callback attribute inPlaceIndicator;
callback attribute lastChangedTime;
callback attribute replacementProductList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 1;

handle command ResetCondition;
}

server cluster FanControl {
Expand All @@ -2460,7 +2468,7 @@ endpoint 1 {
ram attribute speedMax default = 10;
ram attribute speedSetting default = 0;
ram attribute speedCurrent default = 0;
ram attribute rockSupport default = 0x01;
ram attribute rockSupport default = 0x07;
ram attribute rockSetting default = 0x00;
ram attribute windSupport default = 0x03;
ram attribute windSetting default = 0x00;
Expand All @@ -2469,8 +2477,10 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute featureMap default = 0x3F;
ram attribute clusterRevision default = 4;

handle command Step;
}
}
endpoint 2 {
Expand Down Expand Up @@ -2521,6 +2531,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2540,6 +2551,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2548,7 +2560,7 @@ endpoint 2 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 3;
}

server cluster NitrogenDioxideConcentrationMeasurement {
Expand All @@ -2559,6 +2571,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2578,6 +2591,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2597,6 +2611,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2616,6 +2631,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2635,6 +2651,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2654,6 +2671,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2673,6 +2691,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand All @@ -2692,6 +2711,7 @@ endpoint 2 {
callback attribute peakMeasuredValueWindow;
callback attribute averageMeasuredValue;
callback attribute averageMeasuredValueWindow;
callback attribute uncertainty;
callback attribute measurementUnit;
callback attribute measurementMedium;
callback attribute levelValue;
Expand Down Expand Up @@ -2735,15 +2755,16 @@ endpoint 3 {
}

server cluster TemperatureMeasurement {
ram attribute measuredValue;
ram attribute minMeasuredValue default = 0x8000;
ram attribute maxMeasuredValue default = 0x8000;
persist attribute measuredValue default = 0;
persist attribute minMeasuredValue default = -5000;
persist attribute maxMeasuredValue default = 7500;
persist attribute tolerance default = 10;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 4;
}
}
endpoint 4 {
Expand Down Expand Up @@ -2778,9 +2799,10 @@ endpoint 4 {
}

server cluster RelativeHumidityMeasurement {
ram attribute measuredValue;
ram attribute minMeasuredValue;
ram attribute maxMeasuredValue;
ram attribute measuredValue default = 4600;
ram attribute minMeasuredValue default = 0;
ram attribute maxMeasuredValue default = 10000;
ram attribute tolerance default = 1;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down Expand Up @@ -2821,12 +2843,15 @@ endpoint 5 {
}

server cluster Thermostat {
ram attribute localTemperature;
ram attribute localTemperature default = 2000;
ram attribute absMinHeatSetpointLimit default = 700;
ram attribute absMaxHeatSetpointLimit default = 3000;
persist attribute PIHeatingDemand default = 0;
ram attribute occupiedHeatingSetpoint default = 2000;
ram attribute minHeatSetpointLimit default = 1700;
ram attribute minHeatSetpointLimit default = 700;
ram attribute maxHeatSetpointLimit default = 3000;
ram attribute controlSequenceOfOperation default = 0x02;
ram attribute systemMode default = 0x00;
ram attribute controlSequenceOfOperation default = 2;
ram attribute systemMode default = 4;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down
Loading

0 comments on commit 99e20a9

Please sign in to comment.