diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index de039d9d9a8c82..260eb750385755 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -7989,7 +7989,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8005,7 +8005,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8021,7 +8021,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -17431,7 +17431,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -17447,7 +17447,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -17463,7 +17463,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -24489,7 +24489,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -24505,7 +24505,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -24521,7 +24521,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 01fd43c5185c66..aba2e9b00a89ac 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -7989,7 +7989,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8005,7 +8005,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8021,7 +8021,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -16923,7 +16923,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -16939,7 +16939,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -16955,7 +16955,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -24051,7 +24051,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -24067,7 +24067,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -24083,7 +24083,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 642aed58da4ab1..ae48c3f3208850 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -6997,7 +6997,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -7013,7 +7013,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -7029,7 +7029,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -7045,7 +7045,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -7061,7 +7061,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -7077,7 +7077,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -7093,7 +7093,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -7109,7 +7109,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -7125,7 +7125,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -7141,7 +7141,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -7157,7 +7157,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -7173,7 +7173,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index d05f0f2d5709a7..95bffc4c6a8f6e 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -6997,7 +6997,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -7013,7 +7013,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -7029,7 +7029,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -7045,7 +7045,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -7061,7 +7061,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -7077,7 +7077,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -7093,7 +7093,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -7109,7 +7109,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -7125,7 +7125,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -7141,7 +7141,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -7157,7 +7157,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -7173,7 +7173,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 9fa00e9ee01fab..4d611c986f6d19 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -8697,7 +8697,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8713,7 +8713,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8729,7 +8729,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -8745,7 +8745,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -8761,7 +8761,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -8777,7 +8777,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -8793,7 +8793,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -8809,7 +8809,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -8825,7 +8825,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -8841,7 +8841,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -8857,7 +8857,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -8873,7 +8873,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 072d59d064bcd3..6caf3ec8138b6b 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -8115,7 +8115,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8131,7 +8131,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8147,7 +8147,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -8163,7 +8163,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -8179,7 +8179,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -8195,7 +8195,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -8211,7 +8211,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -8227,7 +8227,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -8243,7 +8243,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -8259,7 +8259,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -8275,7 +8275,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -8291,7 +8291,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index d35cf96b967b8e..bc858df7aea404 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -6001,7 +6001,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -6017,7 +6017,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -6033,7 +6033,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -6049,7 +6049,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -6065,7 +6065,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -6081,7 +6081,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -6097,7 +6097,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -6113,7 +6113,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -6129,7 +6129,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -6145,7 +6145,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -6161,7 +6161,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -6177,7 +6177,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index fdf7bd415d6c65..a9873893183c6e 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -6997,7 +6997,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -7013,7 +7013,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -7029,7 +7029,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -7045,7 +7045,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -7061,7 +7061,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -7077,7 +7077,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -7093,7 +7093,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -7109,7 +7109,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -7125,7 +7125,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -7141,7 +7141,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -7157,7 +7157,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -7173,7 +7173,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index e9bc2f416caf63..1d3dba4a4e6f43 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -6997,7 +6997,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -7013,7 +7013,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -7029,7 +7029,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -7045,7 +7045,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -7061,7 +7061,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -7077,7 +7077,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -7093,7 +7093,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -7109,7 +7109,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -7125,7 +7125,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -7141,7 +7141,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -7157,7 +7157,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -7173,7 +7173,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 712ff2eb9379d2..5ccf0e70ef7eb3 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -8579,7 +8579,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8595,7 +8595,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8611,7 +8611,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index deb9aab1940f3e..27d8862196715b 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -8075,7 +8075,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8091,7 +8091,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8107,7 +8107,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 5ac03a82c1ec7b..4b5e6e47a31804 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -8091,7 +8091,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8107,7 +8107,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8123,7 +8123,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index a4e9f8af670a4f..a119c01d8b0f11 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -8818,7 +8818,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8834,7 +8834,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8850,7 +8850,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -8866,7 +8866,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -8882,7 +8882,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -8898,7 +8898,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -8914,7 +8914,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -8930,7 +8930,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -8946,7 +8946,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -8962,7 +8962,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -8978,7 +8978,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -8994,7 +8994,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 58cd06f776bd3f..549de105754d23 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -5217,7 +5217,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -5233,7 +5233,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -5249,7 +5249,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -7671,7 +7671,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -7687,7 +7687,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -7703,7 +7703,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 257de66ec153f0..640ed163ffd3cb 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2139,9 +2139,9 @@ server cluster OccupancySensing = 1030 { readonly attribute bitmap8 occupancy = 0; readonly attribute enum8 occupancySensorType = 1; readonly attribute bitmap8 occupancySensorTypeBitmap = 2; - attribute access(write: manage) int16u pirOccupiedToUnoccupiedDelay = 16; - attribute access(write: manage) int16u pirUnoccupiedToOccupiedDelay = 17; - attribute access(write: manage) int8u pirUnoccupiedToOccupiedThreshold = 18; + attribute access(write: manage) int16u PIROccupiedToUnoccupiedDelay = 16; + attribute access(write: manage) int16u PIRUnoccupiedToOccupiedDelay = 17; + attribute access(write: manage) int8u PIRUnoccupiedToOccupiedThreshold = 18; attribute access(write: manage) int16u ultrasonicOccupiedToUnoccupiedDelay = 32; attribute access(write: manage) int16u ultrasonicUnoccupiedToOccupiedDelay = 33; attribute access(write: manage) int8u ultrasonicUnoccupiedToOccupiedThreshold = 34; @@ -3242,9 +3242,9 @@ endpoint 1 { ram attribute occupancy; ram attribute occupancySensorType; ram attribute occupancySensorTypeBitmap; - ram attribute pirOccupiedToUnoccupiedDelay; - ram attribute pirUnoccupiedToOccupiedDelay; - ram attribute pirUnoccupiedToOccupiedThreshold default = 1; + ram attribute PIROccupiedToUnoccupiedDelay; + ram attribute PIRUnoccupiedToOccupiedDelay; + ram attribute PIRUnoccupiedToOccupiedThreshold default = 1; ram attribute ultrasonicOccupiedToUnoccupiedDelay; ram attribute ultrasonicUnoccupiedToOccupiedDelay; ram attribute ultrasonicUnoccupiedToOccupiedThreshold default = 1; diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 5bbaec9033113c..e8a4d5706d34e5 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -8623,7 +8623,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8639,7 +8639,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8655,7 +8655,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -8671,7 +8671,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -8687,7 +8687,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -8703,7 +8703,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -8719,7 +8719,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -8735,7 +8735,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -8751,7 +8751,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -8767,7 +8767,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -8783,7 +8783,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -8799,7 +8799,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 74539476259918..161509563a38cd 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2116,9 +2116,9 @@ server cluster OccupancySensing = 1030 { readonly attribute bitmap8 occupancy = 0; readonly attribute enum8 occupancySensorType = 1; readonly attribute bitmap8 occupancySensorTypeBitmap = 2; - attribute access(write: manage) int16u pirOccupiedToUnoccupiedDelay = 16; - attribute access(write: manage) int16u pirUnoccupiedToOccupiedDelay = 17; - attribute access(write: manage) int8u pirUnoccupiedToOccupiedThreshold = 18; + attribute access(write: manage) int16u PIROccupiedToUnoccupiedDelay = 16; + attribute access(write: manage) int16u PIRUnoccupiedToOccupiedDelay = 17; + attribute access(write: manage) int8u PIRUnoccupiedToOccupiedThreshold = 18; attribute access(write: manage) int16u ultrasonicOccupiedToUnoccupiedDelay = 32; attribute access(write: manage) int16u ultrasonicUnoccupiedToOccupiedDelay = 33; attribute access(write: manage) int8u ultrasonicUnoccupiedToOccupiedThreshold = 34; @@ -3217,9 +3217,9 @@ endpoint 1 { ram attribute occupancy; ram attribute occupancySensorType; ram attribute occupancySensorTypeBitmap; - ram attribute pirOccupiedToUnoccupiedDelay; - ram attribute pirUnoccupiedToOccupiedDelay; - ram attribute pirUnoccupiedToOccupiedThreshold default = 1; + ram attribute PIROccupiedToUnoccupiedDelay; + ram attribute PIRUnoccupiedToOccupiedDelay; + ram attribute PIRUnoccupiedToOccupiedThreshold default = 1; ram attribute ultrasonicOccupiedToUnoccupiedDelay; ram attribute ultrasonicUnoccupiedToOccupiedDelay; ram attribute ultrasonicUnoccupiedToOccupiedThreshold default = 1; diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index dcde9ac616608b..101cddf5f3ed59 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -8623,7 +8623,7 @@ "enabled": 1, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8639,7 +8639,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -8655,7 +8655,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -8671,7 +8671,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -8687,7 +8687,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -8703,7 +8703,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -8719,7 +8719,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -8735,7 +8735,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -8751,7 +8751,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -8767,7 +8767,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -8783,7 +8783,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -8799,7 +8799,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 3d713a393d286e..3ab34dcfdfcd3b 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -16325,7 +16325,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -16341,7 +16341,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -16357,7 +16357,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index c7b4d3954fa04b..471b9cad3665c2 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -1193,9 +1193,9 @@ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ @@ -1461,9 +1461,9 @@ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h index 70cc6a4d50bc61..c65f1edfd2ee7b 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h @@ -536,9 +536,9 @@ { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* occupancy sensor type */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy sensor type bitmap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ } diff --git a/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml index e5015ce57f52dc..d7bf24020b6711 100644 --- a/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml @@ -770,7 +770,7 @@ tests: If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values [1657882403.876372][2715:2720] CHIP:DMG: } [1657882403.876514][2715:2720] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0406 Attribute 0x0000_0001 DataVersion: 737072536 - [1657882403.876595][2715:2720] CHIP:TOO: occupancy sensor type: 0 + [1657882403.876595][2715:2720] CHIP:TOO: OccupancySensorType: 0 [1657882403.876679][2715:2720] CHIP:EM: Sending Standalone Ack for MessageCounter:153370776 on exchange 37640i disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml index a24a4b6ad89568..a4b2efcdab8674 100644 --- a/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml @@ -454,7 +454,7 @@ tests: Verify on TH(chip-tool) , DUT is responds right attribute value for above command [1653630542.619226][9034:9039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0406 Attribute 0x0000_0001 DataVersion: 3604656322 - [1653630542.619277][9034:9039] CHIP:TOO: occupancy sensor type: 0 + [1653630542.619277][9034:9039] CHIP:TOO: OccupancySensorType: 0 [1653630542.619361][9034:9039] CHIP:EM: Sending Standalone Ack for MessageCounter:4568856 on exchange 18045i disabled: true @@ -498,7 +498,7 @@ tests: Verify on TH(chip-tool) , DUT is responds right attribute value for above command [1653630949.025002][9198:9203] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0406 Attribute 0x0000_0001 DataVersion: 3604656322 - [1653630949.025066][9198:9203] CHIP:TOO: occupancy sensor type: 0 + [1653630949.025066][9198:9203] CHIP:TOO: OccupancySensorType: 0 [1653630949.025181][9198:9203] CHIP:EM: Sending Standalone Ack for MessageCounter:1638675 on exchange 63250i disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml index ed41fc63926f0d..6354ba3dbe9534 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml @@ -34,7 +34,7 @@ tests: - label: "Reads mandatory attribute constrains: Occupancy" PICS: OCC.S.A0000 command: "readAttribute" - attribute: "occupancy" + attribute: "Occupancy" response: constraints: type: bitmap8 @@ -44,7 +44,7 @@ tests: - label: "Reads mandatory attribute constrains: OccupancySensorType" PICS: OCC.S.A0001 command: "readAttribute" - attribute: "occupancy sensor type" + attribute: "OccupancySensorType" response: constraints: type: enum8 @@ -54,7 +54,7 @@ tests: - label: "Reads mandatory attribute constrains: OccupancySensorTypeBitmap" PICS: OCC.S.A0002 command: "readAttribute" - attribute: "occupancy sensor type bitmap" + attribute: "OccupancySensorTypeBitmap" response: constraints: type: bitmap8 @@ -64,7 +64,7 @@ tests: - label: "Reads optional attribute: PIROccupiedToUnoccupiedDelay" PICS: OCC.S.A0010 command: "readAttribute" - attribute: "PIR occupied to unoccupied delay" + attribute: "PIROccupiedToUnoccupiedDelay" response: constraints: type: int16u @@ -74,7 +74,7 @@ tests: - label: "Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay" PICS: OCC.S.A0011 command: "readAttribute" - attribute: "PIR unoccupied to occupied delay" + attribute: "PIRUnoccupiedToOccupiedDelay" response: constraints: type: int16u @@ -85,7 +85,7 @@ tests: "Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold" PICS: OCC.S.A0012 command: "readAttribute" - attribute: "PIR unoccupied to occupied threshold" + attribute: "PIRUnoccupiedToOccupiedThreshold" response: constraints: type: int8u @@ -95,7 +95,7 @@ tests: - label: "Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay" PICS: OCC.S.A0020 command: "readAttribute" - attribute: "ultrasonic occupied to unoccupied delay" + attribute: "UltrasonicOccupiedToUnoccupiedDelay" response: constraints: type: int16u @@ -105,7 +105,7 @@ tests: - label: "Read attribute: UltrasonicUnoccupiedToOccupiedDelay" PICS: OCC.S.A0021 command: "readAttribute" - attribute: "ultrasonic unoccupied to occupied delay" + attribute: "UltrasonicUnoccupiedToOccupiedDelay" response: constraints: type: int16u @@ -115,7 +115,7 @@ tests: - label: "Read attribute: UltrasonicUnoccupiedToOccupiedThreshold" PICS: OCC.S.A0022 command: "readAttribute" - attribute: "ultrasonic unoccupied to occupied threshold" + attribute: "UltrasonicUnoccupiedToOccupiedThreshold" response: constraints: type: int8u @@ -127,7 +127,7 @@ tests: PhysicalContactOccupiedToUnoccupiedDelay" PICS: OCC.S.A0030 command: "readAttribute" - attribute: "physical contact occupied to unoccupied delay" + attribute: "PhysicalContactOccupiedToUnoccupiedDelay" response: constraints: type: int16u @@ -139,7 +139,7 @@ tests: PhysicalContactUnoccupiedToOccupiedDelay" PICS: OCC.S.A0031 command: "readAttribute" - attribute: "physical contact unoccupied to occupied delay" + attribute: "PhysicalContactUnoccupiedToOccupiedDelay" response: constraints: type: int16u @@ -151,7 +151,7 @@ tests: PhysicalContactUnoccupiedToOccupiedThreshold" PICS: OCC.S.A0032 command: "readAttribute" - attribute: "physical contact unoccupied to occupied threshold" + attribute: "PhysicalContactUnoccupiedToOccupiedThreshold" response: constraints: type: int8u diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_2_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_2_Simulated.yaml index 7a6a2e3c01e9fa..3d73df916ab46e 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_2_2_Simulated.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_2_2_Simulated.yaml @@ -30,77 +30,77 @@ tests: - label: "DUT reads from the TH the (0x0000) Occupancy attribute" PICS: OCC.C.A0000 wait: "readAttribute" - attribute: "occupancy" + attribute: "Occupancy" - label: "DUT reads from the TH the (0x0001) OccupancySensorType attribute" PICS: OCC.C.A0001 wait: "readAttribute" - attribute: "occupancy sensor type" + attribute: "OccupancySensorType" - label: "DUT reads from the TH the (0x0002) OccupancySensorType attribute" PICS: OCC.C.A0002 wait: "readAttribute" - attribute: "occupancy sensor type bitmap" + attribute: "OccupancySensorTypeBitmap" - label: "DUT reads from the TH the (0x0010) PIROccupiedToUnoccupiedDelay optional attribute" PICS: OCC.C.A0010 wait: "readAttribute" - attribute: "PIR occupied to unoccupied delay" + attribute: "PIROccupiedToUnoccupiedDelay" - label: "DUT reads from the TH the (0x0011) PIRUnoccupiedToOccupiedDelay optional attribute" PICS: OCC.C.A0011 wait: "readAttribute" - attribute: "PIR unoccupied to occupied delay" + attribute: "PIRUnoccupiedToOccupiedDelay" - label: "DUT reads from the TH the (0x0012) PIRUnoccupiedToOccupiedThreshold optional attribute" PICS: OCC.C.A0012 wait: "readAttribute" - attribute: "PIR unoccupied to occupied threshold" + attribute: "PIRUnoccupiedToOccupiedThreshold" - label: "DUT reads from the TH the (0x0020) UltrasonicOccupiedToUnoccupiedDelay optional attribute" PICS: OCC.C.A0020 wait: "readAttribute" - attribute: "ultrasonic occupied to unoccupied delay" + attribute: "UltrasonicOccupiedToUnoccupiedDelay" - label: "DUT reads from the TH the (0x0021) UltrasonicUnoccupiedToOccupiedDelay optional attribute" PICS: OCC.C.A0021 wait: "readAttribute" - attribute: "ultrasonic unoccupied to occupied delay" + attribute: "UltrasonicUnoccupiedToOccupiedDelay" - label: "DUT reads from the TH the (0x0022) UltrasonicUnoccupiedToOccupiedThreshold optional attribute" PICS: OCC.C.A0022 wait: "readAttribute" - attribute: "ultrasonic unoccupied to occupied threshold" + attribute: "UltrasonicUnoccupiedToOccupiedThreshold" - label: "DUT reads from the TH the (0x0030) PhysicalContactOccupiedToUnoccupiedDelay optional attribute" PICS: OCC.C.A0030 wait: "readAttribute" - attribute: "physical contact occupied to unoccupied delay" + attribute: "PhysicalContactOccupiedToUnoccupiedDelay" - label: "DUT reads from the TH the (0x0031) PhysicalContactUnoccupiedToOccupiedDelay optional attribute" PICS: OCC.C.A0031 wait: "readAttribute" - attribute: "physical contact unoccupied to occupied delay" + attribute: "PhysicalContactUnoccupiedToOccupiedDelay" - label: "DUT reads from the TH the (0x0032) PhysicalContactUnoccupiedToOccupiedThreshold optional attribute" PICS: OCC.C.A0032 wait: "readAttribute" - attribute: "physical contact unoccupied to occupied threshold" + attribute: "PhysicalContactUnoccupiedToOccupiedThreshold" diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml index 1f806e9d3757a2..8d3bcdacedfe11 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml @@ -37,7 +37,7 @@ tests: - label: "Reads mandatory attribute constrains: OccupancySensorType" PICS: OCC.S.A0001 command: "readAttribute" - attribute: "occupancy sensor type" + attribute: "OccupancySensorType" response: constraints: type: enum8 @@ -47,7 +47,7 @@ tests: - label: "Reads mandatory attribute constrains: OccupancySensorTypeBitmap" PICS: OCC.S.A0002 command: "readAttribute" - attribute: "occupancy sensor type bitmap" + attribute: "OccupancySensorTypeBitmap" response: constraints: type: bitmap8 diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_4_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_4_Simulated.yaml index e9d45210f6930c..8580dcdeff6f22 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_2_4_Simulated.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_2_4_Simulated.yaml @@ -30,9 +30,9 @@ tests: - label: "TH reads OccupancySensorType attribute from DUT" PICS: OCC.S.A0001 wait: "readAttribute" - attribute: "occupancy sensor type" + attribute: "OccupancySensorType" - label: "TH reads OccupancySensorTypeBitmap attribute from DUT" PICS: OCC.S.A0002 wait: "readAttribute" - attribute: "occupancy sensor type bitmap" + attribute: "OccupancySensorTypeBitmap" diff --git a/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml index 502676397656e6..6d30ce49185562 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml @@ -34,7 +34,7 @@ tests: - label: "Reads Occupancy attribute from DUT" PICS: OCC.S.A0000 command: "readAttribute" - attribute: "occupancy" + attribute: "Occupancy" response: saveAs: OccupancyValue @@ -52,7 +52,7 @@ tests: - label: "Reads back Occupancy attribute from DUT after few seconds" PICS: OCC.S.A0000 && OCC.M.OccupancyChange command: "readAttribute" - attribute: "occupancy" + attribute: "Occupancy" response: constraints: notValue: OccupancyValue diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml index 08c5e254c6b7aa..e5e830a847337d 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml @@ -395,52 +395,52 @@ limitations under the License. OCCUPANCY_SENSING_CLUSTER true true - - occupancy - occupancy sensor type - occupancy sensor type bitmap + + Occupancy + OccupancySensorType + OccupancySensorTypeBitmap - PIR occupied to unoccupied delay + PIROccupiedToUnoccupiedDelay - PIR unoccupied to occupied delay + PIRUnoccupiedToOccupiedDelay - PIR unoccupied to occupied threshold + PIRUnoccupiedToOccupiedThreshold - ultrasonic occupied to unoccupied delay + UltrasonicOccupiedToUnoccupiedDelay - ultrasonic unoccupied to occupied delay + UltrasonicUnoccupiedToOccupiedDelay - ultrasonic unoccupied to occupied threshold + UltrasonicUnoccupiedToOccupiedThreshold - physical contact occupied to unoccupied delay + PhysicalContactOccupiedToUnoccupiedDelay - physical contact unoccupied to occupied delay + PhysicalContactUnoccupiedToOccupiedDelay - physical contact unoccupied to occupied threshold + PhysicalContactUnoccupiedToOccupiedThreshold diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index b80e6e3f7fed1b..0a53bb511f3699 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -14827,7 +14827,7 @@ "enabled": 0, "attributes": [ { - "name": "occupancy", + "name": "Occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -14843,7 +14843,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type", + "name": "OccupancySensorType", "code": 1, "mfgCode": null, "side": "server", @@ -14859,7 +14859,7 @@ "reportableChange": 0 }, { - "name": "occupancy sensor type bitmap", + "name": "OccupancySensorTypeBitmap", "code": 2, "mfgCode": null, "side": "server", @@ -14875,7 +14875,7 @@ "reportableChange": 0 }, { - "name": "PIR occupied to unoccupied delay", + "name": "PIROccupiedToUnoccupiedDelay", "code": 16, "mfgCode": null, "side": "server", @@ -14891,7 +14891,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied delay", + "name": "PIRUnoccupiedToOccupiedDelay", "code": 17, "mfgCode": null, "side": "server", @@ -14907,7 +14907,7 @@ "reportableChange": 0 }, { - "name": "PIR unoccupied to occupied threshold", + "name": "PIRUnoccupiedToOccupiedThreshold", "code": 18, "mfgCode": null, "side": "server", @@ -14923,7 +14923,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic occupied to unoccupied delay", + "name": "UltrasonicOccupiedToUnoccupiedDelay", "code": 32, "mfgCode": null, "side": "server", @@ -14939,7 +14939,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied delay", + "name": "UltrasonicUnoccupiedToOccupiedDelay", "code": 33, "mfgCode": null, "side": "server", @@ -14955,7 +14955,7 @@ "reportableChange": 0 }, { - "name": "ultrasonic unoccupied to occupied threshold", + "name": "UltrasonicUnoccupiedToOccupiedThreshold", "code": 34, "mfgCode": null, "side": "server", @@ -14971,7 +14971,7 @@ "reportableChange": 0 }, { - "name": "physical contact occupied to unoccupied delay", + "name": "PhysicalContactOccupiedToUnoccupiedDelay", "code": 48, "mfgCode": null, "side": "server", @@ -14987,7 +14987,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied delay", + "name": "PhysicalContactUnoccupiedToOccupiedDelay", "code": 49, "mfgCode": null, "side": "server", @@ -15003,7 +15003,7 @@ "reportableChange": 0 }, { - "name": "physical contact unoccupied to occupied threshold", + "name": "PhysicalContactUnoccupiedToOccupiedThreshold", "code": 50, "mfgCode": null, "side": "server", diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index ca399bc791101d..e5ef76386dab26 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -21200,9 +21200,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="occupancy", Tag=0x00000000, Type=uint), ClusterObjectFieldDescriptor(Label="occupancySensorType", Tag=0x00000001, Type=uint), ClusterObjectFieldDescriptor(Label="occupancySensorTypeBitmap", Tag=0x00000002, Type=uint), - ClusterObjectFieldDescriptor(Label="pirOccupiedToUnoccupiedDelay", Tag=0x00000010, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="pirUnoccupiedToOccupiedDelay", Tag=0x00000011, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="pirUnoccupiedToOccupiedThreshold", Tag=0x00000012, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="PIROccupiedToUnoccupiedDelay", Tag=0x00000010, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="PIRUnoccupiedToOccupiedDelay", Tag=0x00000011, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="PIRUnoccupiedToOccupiedThreshold", Tag=0x00000012, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="ultrasonicOccupiedToUnoccupiedDelay", Tag=0x00000020, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="ultrasonicUnoccupiedToOccupiedDelay", Tag=0x00000021, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="ultrasonicUnoccupiedToOccupiedThreshold", Tag=0x00000022, Type=typing.Optional[uint]), @@ -21219,9 +21219,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: occupancy: 'uint' = None occupancySensorType: 'uint' = None occupancySensorTypeBitmap: 'uint' = None - pirOccupiedToUnoccupiedDelay: 'typing.Optional[uint]' = None - pirUnoccupiedToOccupiedDelay: 'typing.Optional[uint]' = None - pirUnoccupiedToOccupiedThreshold: 'typing.Optional[uint]' = None + PIROccupiedToUnoccupiedDelay: 'typing.Optional[uint]' = None + PIRUnoccupiedToOccupiedDelay: 'typing.Optional[uint]' = None + PIRUnoccupiedToOccupiedThreshold: 'typing.Optional[uint]' = None ultrasonicOccupiedToUnoccupiedDelay: 'typing.Optional[uint]' = None ultrasonicUnoccupiedToOccupiedDelay: 'typing.Optional[uint]' = None ultrasonicUnoccupiedToOccupiedThreshold: 'typing.Optional[uint]' = None @@ -21287,7 +21287,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'uint' = 0 @dataclass - class PirOccupiedToUnoccupiedDelay(ClusterAttributeDescriptor): + class PIROccupiedToUnoccupiedDelay(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0406 @@ -21303,7 +21303,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class PirUnoccupiedToOccupiedDelay(ClusterAttributeDescriptor): + class PIRUnoccupiedToOccupiedDelay(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0406 @@ -21319,7 +21319,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class PirUnoccupiedToOccupiedThreshold(ClusterAttributeDescriptor): + class PIRUnoccupiedToOccupiedThreshold(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0406 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 26cd31b54bb356..ce028d16b81d82 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -12493,8 +12493,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::PirOccupiedToUnoccupiedDelay::Id: { - using TypeInfo = Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + case Attributes::PIROccupiedToUnoccupiedDelay::Id: { + using TypeInfo = Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -12504,8 +12504,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [NSNumber numberWithUnsignedShort:cppValue]; return value; } - case Attributes::PirUnoccupiedToOccupiedDelay::Id: { - using TypeInfo = Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + case Attributes::PIRUnoccupiedToOccupiedDelay::Id: { + using TypeInfo = Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -12515,8 +12515,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [NSNumber numberWithUnsignedShort:cppValue]; return value; } - case Attributes::PirUnoccupiedToOccupiedThreshold::Id: { - using TypeInfo = Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + case Attributes::PIRUnoccupiedToOccupiedThreshold::Id: { + using TypeInfo = Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index dad95577ebaf7a..9edf6fdc0f4e9c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -80155,7 +80155,7 @@ - (void)readAttributePIROccupiedToUnoccupiedDelayWithCompletion:(void (^)(NSNumb NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -80187,7 +80187,7 @@ - (void)writeAttributePIROccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull } ListFreer listFreer; - using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedShortValue; @@ -80203,7 +80203,7 @@ - (void)subscribeAttributePIROccupiedToUnoccupiedDelayWithParams:(MTRSubscribePa reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -80220,7 +80220,7 @@ + (void)readAttributePIROccupiedToUnoccupiedDelayWithClusterStateCache:(MTRClust clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -80239,7 +80239,7 @@ - (void)readAttributePIRUnoccupiedToOccupiedDelayWithCompletion:(void (^)(NSNumb NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -80271,7 +80271,7 @@ - (void)writeAttributePIRUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull } ListFreer listFreer; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedShortValue; @@ -80287,7 +80287,7 @@ - (void)subscribeAttributePIRUnoccupiedToOccupiedDelayWithParams:(MTRSubscribePa reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -80304,7 +80304,7 @@ + (void)readAttributePIRUnoccupiedToOccupiedDelayWithClusterStateCache:(MTRClust clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -80323,7 +80323,7 @@ - (void)readAttributePIRUnoccupiedToOccupiedThresholdWithCompletion:(void (^)(NS NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -80356,7 +80356,7 @@ - (void)writeAttributePIRUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Non } ListFreer listFreer; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; @@ -80372,7 +80372,7 @@ - (void)subscribeAttributePIRUnoccupiedToOccupiedThresholdWithParams:(MTRSubscri reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -80390,7 +80390,7 @@ + (void)readAttributePIRUnoccupiedToOccupiedThresholdWithClusterStateCache: clusterStateCacheContainer.baseDevice, ^(Int8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo; + using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index d4dcf029dee7be..83948299abd3b1 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -21953,7 +21953,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) } // namespace OccupancySensorTypeBitmap -namespace PirOccupiedToUnoccupiedDelay { +namespace PIROccupiedToUnoccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -21982,9 +21982,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace PirOccupiedToUnoccupiedDelay +} // namespace PIROccupiedToUnoccupiedDelay -namespace PirUnoccupiedToOccupiedDelay { +namespace PIRUnoccupiedToOccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -22013,9 +22013,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace PirUnoccupiedToOccupiedDelay +} // namespace PIRUnoccupiedToOccupiedDelay -namespace PirUnoccupiedToOccupiedThreshold { +namespace PIRUnoccupiedToOccupiedThreshold { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -22044,7 +22044,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::OccupancySensing::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace PirUnoccupiedToOccupiedThreshold +} // namespace PIRUnoccupiedToOccupiedThreshold namespace UltrasonicOccupiedToUnoccupiedDelay { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 761012b7c4d437..68d57f9b60d78e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -3652,20 +3652,20 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace OccupancySensorTypeBitmap -namespace PirOccupiedToUnoccupiedDelay { +namespace PIROccupiedToUnoccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace PirOccupiedToUnoccupiedDelay +} // namespace PIROccupiedToUnoccupiedDelay -namespace PirUnoccupiedToOccupiedDelay { +namespace PIRUnoccupiedToOccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace PirUnoccupiedToOccupiedDelay +} // namespace PIRUnoccupiedToOccupiedDelay -namespace PirUnoccupiedToOccupiedThreshold { +namespace PIRUnoccupiedToOccupiedThreshold { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace PirUnoccupiedToOccupiedThreshold +} // namespace PIRUnoccupiedToOccupiedThreshold namespace UltrasonicOccupiedToUnoccupiedDelay { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 4bc4f7d511c09b..62b56c1c09c656 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -15257,14 +15257,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::OccupancySensorTypeBitmap::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, occupancySensorTypeBitmap)); break; - case Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, pirOccupiedToUnoccupiedDelay)); + case Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIROccupiedToUnoccupiedDelay)); break; - case Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, pirUnoccupiedToOccupiedDelay)); + case Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedDelay)); break; - case Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, pirUnoccupiedToOccupiedThreshold)); + case Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIRUnoccupiedToOccupiedThreshold)); break; case Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, ultrasonicOccupiedToUnoccupiedDelay)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 021e2c7892ae78..7373f29f659a26 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -20302,7 +20302,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace OccupancySensorTypeBitmap -namespace PirOccupiedToUnoccupiedDelay { +namespace PIROccupiedToUnoccupiedDelay { struct TypeInfo { using Type = uint16_t; @@ -20310,11 +20310,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::PirOccupiedToUnoccupiedDelay::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PIROccupiedToUnoccupiedDelay::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace PirOccupiedToUnoccupiedDelay -namespace PirUnoccupiedToOccupiedDelay { +} // namespace PIROccupiedToUnoccupiedDelay +namespace PIRUnoccupiedToOccupiedDelay { struct TypeInfo { using Type = uint16_t; @@ -20322,11 +20322,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::PirUnoccupiedToOccupiedDelay::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PIRUnoccupiedToOccupiedDelay::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace PirUnoccupiedToOccupiedDelay -namespace PirUnoccupiedToOccupiedThreshold { +} // namespace PIRUnoccupiedToOccupiedDelay +namespace PIRUnoccupiedToOccupiedThreshold { struct TypeInfo { using Type = uint8_t; @@ -20334,10 +20334,10 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::OccupancySensing::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::PirUnoccupiedToOccupiedThreshold::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PIRUnoccupiedToOccupiedThreshold::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace PirUnoccupiedToOccupiedThreshold +} // namespace PIRUnoccupiedToOccupiedThreshold namespace UltrasonicOccupiedToUnoccupiedDelay { struct TypeInfo { @@ -20452,9 +20452,9 @@ struct TypeInfo Attributes::Occupancy::TypeInfo::DecodableType occupancy = static_cast(0); Attributes::OccupancySensorType::TypeInfo::DecodableType occupancySensorType = static_cast(0); Attributes::OccupancySensorTypeBitmap::TypeInfo::DecodableType occupancySensorTypeBitmap = static_cast(0); - Attributes::PirOccupiedToUnoccupiedDelay::TypeInfo::DecodableType pirOccupiedToUnoccupiedDelay = static_cast(0); - Attributes::PirUnoccupiedToOccupiedDelay::TypeInfo::DecodableType pirUnoccupiedToOccupiedDelay = static_cast(0); - Attributes::PirUnoccupiedToOccupiedThreshold::TypeInfo::DecodableType pirUnoccupiedToOccupiedThreshold = + Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo::DecodableType PIROccupiedToUnoccupiedDelay = static_cast(0); + Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo::DecodableType PIRUnoccupiedToOccupiedDelay = static_cast(0); + Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo::DecodableType PIRUnoccupiedToOccupiedThreshold = static_cast(0); Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo::DecodableType ultrasonicOccupiedToUnoccupiedDelay = static_cast(0); diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 1617c26d2fc489..d9a820d4c9e786 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -3580,17 +3580,17 @@ namespace OccupancySensorTypeBitmap { static constexpr AttributeId Id = 0x00000002; } // namespace OccupancySensorTypeBitmap -namespace PirOccupiedToUnoccupiedDelay { +namespace PIROccupiedToUnoccupiedDelay { static constexpr AttributeId Id = 0x00000010; -} // namespace PirOccupiedToUnoccupiedDelay +} // namespace PIROccupiedToUnoccupiedDelay -namespace PirUnoccupiedToOccupiedDelay { +namespace PIRUnoccupiedToOccupiedDelay { static constexpr AttributeId Id = 0x00000011; -} // namespace PirUnoccupiedToOccupiedDelay +} // namespace PIRUnoccupiedToOccupiedDelay -namespace PirUnoccupiedToOccupiedThreshold { +namespace PIRUnoccupiedToOccupiedThreshold { static constexpr AttributeId Id = 0x00000012; -} // namespace PirUnoccupiedToOccupiedThreshold +} // namespace PIRUnoccupiedToOccupiedThreshold namespace UltrasonicOccupiedToUnoccupiedDelay { static constexpr AttributeId Id = 0x00000020; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 3b127ff1559d80..0d56a390b3993f 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -5894,9 +5894,9 @@ class ColorControlStepColorTemperature : public ClusterCommand | * Occupancy | 0x0000 | | * OccupancySensorType | 0x0001 | | * OccupancySensorTypeBitmap | 0x0002 | -| * PirOccupiedToUnoccupiedDelay | 0x0010 | -| * PirUnoccupiedToOccupiedDelay | 0x0011 | -| * PirUnoccupiedToOccupiedThreshold | 0x0012 | +| * PIROccupiedToUnoccupiedDelay | 0x0010 | +| * PIRUnoccupiedToOccupiedDelay | 0x0011 | +| * PIRUnoccupiedToOccupiedThreshold | 0x0012 | | * UltrasonicOccupiedToUnoccupiedDelay | 0x0020 | | * UltrasonicUnoccupiedToOccupiedDelay | 0x0021 | | * UltrasonicUnoccupiedToOccupiedThreshold | 0x0022 | @@ -12040,11 +12040,11 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman make_unique(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), // make_unique(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id, credsIssuerConfig), // - make_unique(Id, "pir-occupied-to-unoccupied-delay", Attributes::PirOccupiedToUnoccupiedDelay::Id, + make_unique(Id, "piroccupied-to-unoccupied-delay", Attributes::PIROccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // - make_unique(Id, "pir-unoccupied-to-occupied-delay", Attributes::PirUnoccupiedToOccupiedDelay::Id, + make_unique(Id, "pirunoccupied-to-occupied-delay", Attributes::PIRUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // - make_unique(Id, "pir-unoccupied-to-occupied-threshold", Attributes::PirUnoccupiedToOccupiedThreshold::Id, + make_unique(Id, "pirunoccupied-to-occupied-threshold", Attributes::PIRUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // make_unique(Id, "ultrasonic-occupied-to-unoccupied-delay", Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // @@ -12064,12 +12064,12 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "pir-occupied-to-unoccupied-delay", 0, UINT16_MAX, - Attributes::PirOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // - make_unique>(Id, "pir-unoccupied-to-occupied-delay", 0, UINT16_MAX, - Attributes::PirUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // - make_unique>(Id, "pir-unoccupied-to-occupied-threshold", 0, UINT8_MAX, - Attributes::PirUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // + make_unique>(Id, "piroccupied-to-unoccupied-delay", 0, UINT16_MAX, + Attributes::PIROccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // + make_unique>(Id, "pirunoccupied-to-occupied-delay", 0, UINT16_MAX, + Attributes::PIRUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // + make_unique>(Id, "pirunoccupied-to-occupied-threshold", 0, UINT8_MAX, + Attributes::PIRUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // make_unique>(Id, "ultrasonic-occupied-to-unoccupied-delay", 0, UINT16_MAX, Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // make_unique>(Id, "ultrasonic-unoccupied-to-occupied-delay", 0, UINT16_MAX, @@ -12087,12 +12087,12 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman make_unique(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), // make_unique(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id, credsIssuerConfig), // - make_unique(Id, "pir-occupied-to-unoccupied-delay", Attributes::PirOccupiedToUnoccupiedDelay::Id, + make_unique(Id, "piroccupied-to-unoccupied-delay", Attributes::PIROccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // - make_unique(Id, "pir-unoccupied-to-occupied-delay", Attributes::PirUnoccupiedToOccupiedDelay::Id, + make_unique(Id, "pirunoccupied-to-occupied-delay", Attributes::PIRUnoccupiedToOccupiedDelay::Id, + credsIssuerConfig), // + make_unique(Id, "pirunoccupied-to-occupied-threshold", Attributes::PIRUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // - make_unique(Id, "pir-unoccupied-to-occupied-threshold", - Attributes::PirUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // make_unique(Id, "ultrasonic-occupied-to-unoccupied-delay", Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // make_unique(Id, "ultrasonic-unoccupied-to-occupied-delay", diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 1436ecff634745..1e4caab5ae7438 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -8405,62 +8405,62 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP case OccupancySensing::Attributes::Occupancy::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupancy", 1, value); + return DataModelLogger::LogValue("Occupancy", 1, value); } case OccupancySensing::Attributes::OccupancySensorType::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupancy sensor type", 1, value); + return DataModelLogger::LogValue("OccupancySensorType", 1, value); } case OccupancySensing::Attributes::OccupancySensorTypeBitmap::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupancy sensor type bitmap", 1, value); + return DataModelLogger::LogValue("OccupancySensorTypeBitmap", 1, value); } - case OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id: { + case OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("PIR occupied to unoccupied delay", 1, value); + return DataModelLogger::LogValue("PIROccupiedToUnoccupiedDelay", 1, value); } - case OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id: { + case OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("PIR unoccupied to occupied delay", 1, value); + return DataModelLogger::LogValue("PIRUnoccupiedToOccupiedDelay", 1, value); } - case OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id: { + case OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("PIR unoccupied to occupied threshold", 1, value); + return DataModelLogger::LogValue("PIRUnoccupiedToOccupiedThreshold", 1, value); } case OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ultrasonic occupied to unoccupied delay", 1, value); + return DataModelLogger::LogValue("UltrasonicOccupiedToUnoccupiedDelay", 1, value); } case OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ultrasonic unoccupied to occupied delay", 1, value); + return DataModelLogger::LogValue("UltrasonicUnoccupiedToOccupiedDelay", 1, value); } case OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ultrasonic unoccupied to occupied threshold", 1, value); + return DataModelLogger::LogValue("UltrasonicUnoccupiedToOccupiedThreshold", 1, value); } case OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("physical contact occupied to unoccupied delay", 1, value); + return DataModelLogger::LogValue("PhysicalContactOccupiedToUnoccupiedDelay", 1, value); } case OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("physical contact unoccupied to occupied delay", 1, value); + return DataModelLogger::LogValue("PhysicalContactUnoccupiedToOccupiedDelay", 1, value); } case OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("physical contact unoccupied to occupied threshold", 1, value); + return DataModelLogger::LogValue("PhysicalContactUnoccupiedToOccupiedThreshold", 1, value); } case OccupancySensing::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 108e2d6a411968..0a5d1f165c5097 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -35163,19 +35163,19 @@ class Test_TC_OCC_2_1Suite : public TestCommand LogStep(4, "Reads optional attribute: PIROccupiedToUnoccupiedDelay"); VerifyOrDo(!ShouldSkip("OCC.S.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id, - OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id, true, chip::NullOptional); + OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::Id, true, chip::NullOptional); } case 5: { LogStep(5, "Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay"); VerifyOrDo(!ShouldSkip("OCC.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::Id, true, chip::NullOptional); } case 6: { LogStep(6, "Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold"); VerifyOrDo(!ShouldSkip("OCC.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id, true, chip::NullOptional); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::Id, true, chip::NullOptional); } case 7: { LogStep(7, "Read optional attribute: UltrasonicOccupiedToUnoccupiedDelay"); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index e6b57d6f98afe1..4c3bf43d6fd7bc 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -66332,9 +66332,9 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Subs | * Occupancy | 0x0000 | | * OccupancySensorType | 0x0001 | | * OccupancySensorTypeBitmap | 0x0002 | -| * PirOccupiedToUnoccupiedDelay | 0x0010 | -| * PirUnoccupiedToOccupiedDelay | 0x0011 | -| * PirUnoccupiedToOccupiedThreshold | 0x0012 | +| * PIROccupiedToUnoccupiedDelay | 0x0010 | +| * PIRUnoccupiedToOccupiedDelay | 0x0011 | +| * PIRUnoccupiedToOccupiedThreshold | 0x0012 | | * UltrasonicOccupiedToUnoccupiedDelay | 0x0020 | | * UltrasonicUnoccupiedToOccupiedDelay | 0x0021 | | * UltrasonicUnoccupiedToOccupiedThreshold | 0x0022 | @@ -66561,16 +66561,16 @@ class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public Subsc }; /* - * Attribute PirOccupiedToUnoccupiedDelay + * Attribute PIROccupiedToUnoccupiedDelay */ -class ReadOccupancySensingPirOccupiedToUnoccupiedDelay : public ReadAttribute { +class ReadOccupancySensingPIROccupiedToUnoccupiedDelay : public ReadAttribute { public: - ReadOccupancySensingPirOccupiedToUnoccupiedDelay() - : ReadAttribute("pir-occupied-to-unoccupied-delay") + ReadOccupancySensingPIROccupiedToUnoccupiedDelay() + : ReadAttribute("piroccupied-to-unoccupied-delay") { } - ~ReadOccupancySensingPirOccupiedToUnoccupiedDelay() {} + ~ReadOccupancySensingPIROccupiedToUnoccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66591,17 +66591,17 @@ class ReadOccupancySensingPirOccupiedToUnoccupiedDelay : public ReadAttribute { } }; -class WriteOccupancySensingPirOccupiedToUnoccupiedDelay : public WriteAttribute { +class WriteOccupancySensingPIROccupiedToUnoccupiedDelay : public WriteAttribute { public: - WriteOccupancySensingPirOccupiedToUnoccupiedDelay() - : WriteAttribute("pir-occupied-to-unoccupied-delay") + WriteOccupancySensingPIROccupiedToUnoccupiedDelay() + : WriteAttribute("piroccupied-to-unoccupied-delay") { - AddArgument("attr-name", "pir-occupied-to-unoccupied-delay"); + AddArgument("attr-name", "piroccupied-to-unoccupied-delay"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteOccupancySensingPirOccupiedToUnoccupiedDelay() {} + ~WriteOccupancySensingPIROccupiedToUnoccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66633,14 +66633,14 @@ class WriteOccupancySensingPirOccupiedToUnoccupiedDelay : public WriteAttribute uint16_t mValue; }; -class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public SubscribeAttribute { +class SubscribeAttributeOccupancySensingPIROccupiedToUnoccupiedDelay : public SubscribeAttribute { public: - SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay() - : SubscribeAttribute("pir-occupied-to-unoccupied-delay") + SubscribeAttributeOccupancySensingPIROccupiedToUnoccupiedDelay() + : SubscribeAttribute("piroccupied-to-unoccupied-delay") { } - ~SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay() {} + ~SubscribeAttributeOccupancySensingPIROccupiedToUnoccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66673,16 +66673,16 @@ class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public Su }; /* - * Attribute PirUnoccupiedToOccupiedDelay + * Attribute PIRUnoccupiedToOccupiedDelay */ -class ReadOccupancySensingPirUnoccupiedToOccupiedDelay : public ReadAttribute { +class ReadOccupancySensingPIRUnoccupiedToOccupiedDelay : public ReadAttribute { public: - ReadOccupancySensingPirUnoccupiedToOccupiedDelay() - : ReadAttribute("pir-unoccupied-to-occupied-delay") + ReadOccupancySensingPIRUnoccupiedToOccupiedDelay() + : ReadAttribute("pirunoccupied-to-occupied-delay") { } - ~ReadOccupancySensingPirUnoccupiedToOccupiedDelay() {} + ~ReadOccupancySensingPIRUnoccupiedToOccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66703,17 +66703,17 @@ class ReadOccupancySensingPirUnoccupiedToOccupiedDelay : public ReadAttribute { } }; -class WriteOccupancySensingPirUnoccupiedToOccupiedDelay : public WriteAttribute { +class WriteOccupancySensingPIRUnoccupiedToOccupiedDelay : public WriteAttribute { public: - WriteOccupancySensingPirUnoccupiedToOccupiedDelay() - : WriteAttribute("pir-unoccupied-to-occupied-delay") + WriteOccupancySensingPIRUnoccupiedToOccupiedDelay() + : WriteAttribute("pirunoccupied-to-occupied-delay") { - AddArgument("attr-name", "pir-unoccupied-to-occupied-delay"); + AddArgument("attr-name", "pirunoccupied-to-occupied-delay"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteOccupancySensingPirUnoccupiedToOccupiedDelay() {} + ~WriteOccupancySensingPIRUnoccupiedToOccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66745,14 +66745,14 @@ class WriteOccupancySensingPirUnoccupiedToOccupiedDelay : public WriteAttribute uint16_t mValue; }; -class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public SubscribeAttribute { +class SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedDelay : public SubscribeAttribute { public: - SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay() - : SubscribeAttribute("pir-unoccupied-to-occupied-delay") + SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedDelay() + : SubscribeAttribute("pirunoccupied-to-occupied-delay") { } - ~SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay() {} + ~SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedDelay() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66785,16 +66785,16 @@ class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public Su }; /* - * Attribute PirUnoccupiedToOccupiedThreshold + * Attribute PIRUnoccupiedToOccupiedThreshold */ -class ReadOccupancySensingPirUnoccupiedToOccupiedThreshold : public ReadAttribute { +class ReadOccupancySensingPIRUnoccupiedToOccupiedThreshold : public ReadAttribute { public: - ReadOccupancySensingPirUnoccupiedToOccupiedThreshold() - : ReadAttribute("pir-unoccupied-to-occupied-threshold") + ReadOccupancySensingPIRUnoccupiedToOccupiedThreshold() + : ReadAttribute("pirunoccupied-to-occupied-threshold") { } - ~ReadOccupancySensingPirUnoccupiedToOccupiedThreshold() {} + ~ReadOccupancySensingPIRUnoccupiedToOccupiedThreshold() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66816,17 +66816,17 @@ class ReadOccupancySensingPirUnoccupiedToOccupiedThreshold : public ReadAttribut } }; -class WriteOccupancySensingPirUnoccupiedToOccupiedThreshold : public WriteAttribute { +class WriteOccupancySensingPIRUnoccupiedToOccupiedThreshold : public WriteAttribute { public: - WriteOccupancySensingPirUnoccupiedToOccupiedThreshold() - : WriteAttribute("pir-unoccupied-to-occupied-threshold") + WriteOccupancySensingPIRUnoccupiedToOccupiedThreshold() + : WriteAttribute("pirunoccupied-to-occupied-threshold") { - AddArgument("attr-name", "pir-unoccupied-to-occupied-threshold"); + AddArgument("attr-name", "pirunoccupied-to-occupied-threshold"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteOccupancySensingPirUnoccupiedToOccupiedThreshold() {} + ~WriteOccupancySensingPIRUnoccupiedToOccupiedThreshold() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -66858,14 +66858,14 @@ class WriteOccupancySensingPirUnoccupiedToOccupiedThreshold : public WriteAttrib uint8_t mValue; }; -class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold : public SubscribeAttribute { +class SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedThreshold : public SubscribeAttribute { public: - SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold() - : SubscribeAttribute("pir-unoccupied-to-occupied-threshold") + SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedThreshold() + : SubscribeAttribute("pirunoccupied-to-occupied-threshold") { } - ~SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold() {} + ~SubscribeAttributeOccupancySensingPIRUnoccupiedToOccupiedThreshold() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -99982,15 +99982,15 @@ void registerClusterOccupancySensing(Commands & commands) make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 2c520211d897e2..9d779b20eaaa44 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -47836,9 +47836,9 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("pirOccupiedToUnoccupiedDelay", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("pirOccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("pirOccupiedToUnoccupiedDelay", [value unsignedShortValue], 65535U)); + VerifyOrReturn(CheckConstraintType("PIROccupiedToUnoccupiedDelay", "int16u", "int16u")); + VerifyOrReturn(CheckConstraintMinValue("PIROccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U)); + VerifyOrReturn(CheckConstraintMaxValue("PIROccupiedToUnoccupiedDelay", [value unsignedShortValue], 65535U)); NextTest(); }]; @@ -47859,9 +47859,9 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedDelay", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("pirUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("pirUnoccupiedToOccupiedDelay", [value unsignedShortValue], 65535U)); + VerifyOrReturn(CheckConstraintType("PIRUnoccupiedToOccupiedDelay", "int16u", "int16u")); + VerifyOrReturn(CheckConstraintMinValue("PIRUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U)); + VerifyOrReturn(CheckConstraintMaxValue("PIRUnoccupiedToOccupiedDelay", [value unsignedShortValue], 65535U)); NextTest(); }]; @@ -47883,9 +47883,9 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedThreshold", "int8u", "int8u")); - VerifyOrReturn(CheckConstraintMinValue("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U)); - VerifyOrReturn(CheckConstraintMaxValue("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254U)); + VerifyOrReturn(CheckConstraintType("PIRUnoccupiedToOccupiedThreshold", "int8u", "int8u")); + VerifyOrReturn(CheckConstraintMinValue("PIRUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U)); + VerifyOrReturn(CheckConstraintMaxValue("PIRUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254U)); NextTest(); }]; diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h index f32af6abad08ce..2ca956f79c8819 100644 --- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h @@ -2357,19 +2357,19 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand LogStep(4, "DUT reads from the TH the (0x0010) PIROccupiedToUnoccupiedDelay optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id); + OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::Id); } case 5: { LogStep(5, "DUT reads from the TH the (0x0011) PIRUnoccupiedToOccupiedDelay optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::Id); } case 6: { LogStep(6, "DUT reads from the TH the (0x0012) PIRUnoccupiedToOccupiedThreshold optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::Id); } case 7: { LogStep(7, "DUT reads from the TH the (0x0020) UltrasonicOccupiedToUnoccupiedDelay optional attribute"); diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h index f32af6abad08ce..2ca956f79c8819 100644 --- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h @@ -2357,19 +2357,19 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand LogStep(4, "DUT reads from the TH the (0x0010) PIROccupiedToUnoccupiedDelay optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirOccupiedToUnoccupiedDelay::Id); + OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::Id); } case 5: { LogStep(5, "DUT reads from the TH the (0x0011) PIRUnoccupiedToOccupiedDelay optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedDelay::Id); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::Id); } case 6: { LogStep(6, "DUT reads from the TH the (0x0012) PIRUnoccupiedToOccupiedThreshold optional attribute"); VerifyOrDo(!ShouldSkip("OCC.C.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return WaitAttribute(GetEndpoint(0), OccupancySensing::Id, - OccupancySensing::Attributes::PirUnoccupiedToOccupiedThreshold::Id); + OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::Id); } case 7: { LogStep(7, "DUT reads from the TH the (0x0020) UltrasonicOccupiedToUnoccupiedDelay optional attribute");