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

Update occupancy sensing revision number to match latest spec #31834

Merged
merged 6 commits into from
Mar 5, 2024
Merged

Update occupancy sensing revision number to match latest spec #31834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00d58da
Update occupancy sensing cluster revision
ReneJosefsen Jan 31, 2024
26a7048
Bumped cluster revision in OCC_1_1
ReneJosefsen Feb 1, 2024
36396ae
run zap_convert_all.py
ReneJosefsen Mar 5, 2024
ecaa46a
Manual zap/convert.py for sample_zap_file.zap
ReneJosefsen Mar 5, 2024
05862c1
Update cluster rev in zap files
ReneJosefsen Mar 5, 2024
3e9ce70
Ran zap regen all
ReneJosefsen Mar 5, 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
20 changes: 13 additions & 7 deletions examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 99,
"featureLevel": 100,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -8135,42 +8135,48 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 2,
"profileId": 259,
"endpointId": 2,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 3,
"profileId": 259,
"endpointId": 3,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 4,
"profileId": 259,
"endpointId": 4,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 5,
"profileId": 259,
"endpointId": 5,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
}
]
}
8 changes: 5 additions & 3 deletions examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 99,
"featureLevel": 100,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -6054,14 +6054,16 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
}
]
}
6 changes: 3 additions & 3 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 @@ -5869,7 +5869,7 @@ cluster RelativeHumidityMeasurement = 1029 {

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
cluster OccupancySensing = 1030 {
revision 3;
revision 4;

enum OccupancySensorTypeEnum : enum8 {
kPIR = 0;
Expand Down Expand Up @@ -8740,7 +8740,7 @@ endpoint 1 {
ram attribute occupancySensorType;
ram attribute occupancySensorTypeBitmap;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
ram attribute clusterRevision default = 4;
}

server cluster CarbonMonoxideConcentrationMeasurement {
Expand Down Expand Up @@ -9207,7 +9207,7 @@ endpoint 2 {
ram attribute occupancySensorType;
ram attribute occupancySensorTypeBitmap;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
ram attribute clusterRevision default = 4;
}
}
endpoint 65534 {
Expand Down
18 changes: 11 additions & 7 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
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 99,
"featureLevel": 100,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -18752,7 +18752,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -24765,7 +24765,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -25289,28 +25289,32 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "MA-onofflight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "MA-onofflight",
"endpointTypeIndex": 2,
"profileId": 259,
"endpointId": 2,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 3,
"profileId": 259,
"endpointId": 65534,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
}
]
}
6 changes: 3 additions & 3 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4428,7 +4428,7 @@ cluster RelativeHumidityMeasurement = 1029 {

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
cluster OccupancySensing = 1030 {
revision 3;
revision 4;

enum OccupancySensorTypeEnum : enum8 {
kPIR = 0;
Expand Down Expand Up @@ -6571,7 +6571,7 @@ endpoint 1 {
ram attribute occupancySensorType;
ram attribute occupancySensorTypeBitmap;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
ram attribute clusterRevision default = 4;
}

server cluster WakeOnLan {
Expand Down Expand Up @@ -6916,7 +6916,7 @@ endpoint 2 {
ram attribute occupancySensorType;
ram attribute occupancySensorTypeBitmap;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 3;
ram attribute clusterRevision default = 4;
}
}
endpoint 65534 {
Expand Down
18 changes: 11 additions & 7 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 99,
"featureLevel": 100,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -7997,7 +7997,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -11823,7 +11823,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -12347,28 +12347,32 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "MA-onofflight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "MA-onofflight",
"endpointTypeIndex": 2,
"profileId": 259,
"endpointId": 2,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 3,
"profileId": 259,
"endpointId": 65534,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
}
]
}
11 changes: 7 additions & 4 deletions examples/bridge-app/bridge-common/bridge-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 99,
"featureLevel": 100,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -5737,21 +5737,24 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 2,
"profileId": 259,
"endpointId": 2,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
}
]
}
2 changes: 1 addition & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@ cluster FixedLabel = 64 {

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
cluster OccupancySensing = 1030 {
revision 3;
revision 4;

enum OccupancySensorTypeEnum : enum8 {
kPIR = 0;
Expand Down
8 changes: 5 additions & 3 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 99,
"featureLevel": 100,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -4818,14 +4818,16 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 260,
"endpointId": 1,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
}
]
}
8 changes: 5 additions & 3 deletions examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 99,
"featureLevel": 100,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -3359,14 +3359,16 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
},
{
"endpointTypeName": "Anonymous Endpoint Type",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0
"networkId": 0,
"parentEndpointIdentifier": null
}
]
}
Loading
Loading