From 4948098c5706bde6c19c232cdf1a37b08cf91dc5 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 13 Jan 2023 12:31:16 -0500 Subject: [PATCH] Align naming in Thermostat User Interface Configuration cluster XML with the spec. (#24375) * Align naming in Thermostat User Interface Configuration cluster XML with the spec. * Auto-update ZAP files. * Regenerate generated code. --- .../all-clusters-common/all-clusters-app.zap | 6 +-- .../all-clusters-minimal-app.zap | 6 +-- .../rootnode_thermostat_bm3fb8dhYi.zap | 6 +-- .../placeholder/linux/apps/app1/config.zap | 6 +-- .../placeholder/linux/apps/app2/config.zap | 6 +-- .../thermostat-common/thermostat.zap | 6 +-- .../suites/certification/Test_TC_IDM_3_1.yaml | 6 +-- .../suites/certification/Test_TC_IDM_3_2.yaml | 2 +- .../certification/Test_TC_TSUIC_2_1.yaml | 6 +-- .../certification/Test_TC_TSUIC_2_2.yaml | 52 +++++++++---------- .../zcl/data-model/silabs/ha.xml | 7 +-- .../data_model/controller-clusters.zap | 6 +-- .../all-clusters-app/zap-generated/access.h | 24 ++++----- .../zap-generated/endpoint_config.h | 12 ++--- .../zap-generated/access.h | 12 ++--- .../zap-generated/endpoint_config.h | 8 +-- .../zap-generated/access.h | 12 ++--- .../zap-generated/endpoint_config.h | 8 +-- .../cluster/logging/DataModelLogger.cpp | 6 +-- .../zap-generated/test/Commands.h | 24 ++++----- .../placeholder/app1/zap-generated/access.h | 24 ++++----- .../app1/zap-generated/endpoint_config.h | 12 ++--- .../placeholder/app2/zap-generated/access.h | 24 ++++----- .../app2/zap-generated/endpoint_config.h | 12 ++--- .../thermostat/zap-generated/access.h | 12 ++--- .../zap-generated/endpoint_config.h | 8 +-- 26 files changed, 157 insertions(+), 156 deletions(-) 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 fc994636c7df8b..de039d9d9a8c82 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 @@ -15553,7 +15553,7 @@ "enabled": 1, "attributes": [ { - "name": "temperature display mode", + "name": "TemperatureDisplayMode", "code": 0, "mfgCode": null, "side": "server", @@ -15569,7 +15569,7 @@ "reportableChange": 0 }, { - "name": "keypad lockout", + "name": "KeypadLockout", "code": 1, "mfgCode": null, "side": "server", @@ -15585,7 +15585,7 @@ "reportableChange": 0 }, { - "name": "schedule programming visibility", + "name": "ScheduleProgrammingVisibility", "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 cb7ec752eefa37..01fd43c5185c66 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 @@ -15045,7 +15045,7 @@ "enabled": 1, "attributes": [ { - "name": "temperature display mode", + "name": "TemperatureDisplayMode", "code": 0, "mfgCode": null, "side": "server", @@ -15061,7 +15061,7 @@ "reportableChange": 0 }, { - "name": "keypad lockout", + "name": "KeypadLockout", "code": 1, "mfgCode": null, "side": "server", @@ -15077,7 +15077,7 @@ "reportableChange": 0 }, { - "name": "schedule programming visibility", + "name": "ScheduleProgrammingVisibility", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index a31a6c7c8d2c83..68ba1f5e73a9db 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -7347,7 +7347,7 @@ "enabled": 1, "attributes": [ { - "name": "temperature display mode", + "name": "TemperatureDisplayMode", "code": 0, "mfgCode": null, "side": "server", @@ -7363,7 +7363,7 @@ "reportableChange": 0 }, { - "name": "keypad lockout", + "name": "KeypadLockout", "code": 1, "mfgCode": null, "side": "server", @@ -7379,7 +7379,7 @@ "reportableChange": 0 }, { - "name": "schedule programming visibility", + "name": "ScheduleProgrammingVisibility", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 4963be2d1d874e..5bbaec9033113c 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -5151,7 +5151,7 @@ "enabled": 1, "attributes": [ { - "name": "temperature display mode", + "name": "TemperatureDisplayMode", "code": 0, "mfgCode": null, "side": "server", @@ -5167,7 +5167,7 @@ "reportableChange": 0 }, { - "name": "keypad lockout", + "name": "KeypadLockout", "code": 1, "mfgCode": null, "side": "server", @@ -5183,7 +5183,7 @@ "reportableChange": 0 }, { - "name": "schedule programming visibility", + "name": "ScheduleProgrammingVisibility", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index d83644d046b7d8..dcde9ac616608b 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -5435,7 +5435,7 @@ "enabled": 1, "attributes": [ { - "name": "temperature display mode", + "name": "TemperatureDisplayMode", "code": 0, "mfgCode": null, "side": "server", @@ -5451,7 +5451,7 @@ "reportableChange": 0 }, { - "name": "keypad lockout", + "name": "KeypadLockout", "code": 1, "mfgCode": null, "side": "server", @@ -5467,7 +5467,7 @@ "reportableChange": 0 }, { - "name": "schedule programming visibility", + "name": "ScheduleProgrammingVisibility", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 0011f82eda2e82..bd0646ff98e5b0 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -11537,7 +11537,7 @@ "enabled": 1, "attributes": [ { - "name": "temperature display mode", + "name": "TemperatureDisplayMode", "code": 0, "mfgCode": null, "side": "server", @@ -11553,7 +11553,7 @@ "reportableChange": 0 }, { - "name": "keypad lockout", + "name": "KeypadLockout", "code": 1, "mfgCode": null, "side": "server", @@ -11569,7 +11569,7 @@ "reportableChange": 0 }, { - "name": "schedule programming visibility", + "name": "ScheduleProgrammingVisibility", "code": 2, "mfgCode": null, "side": "server", diff --git a/src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml index b313ce74298b98..b31417ad239df5 100644 --- a/src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml @@ -545,12 +545,12 @@ tests: verify on TH (reference app) receives the right write Request Message for the data sent in the above command [1657884282.303557][2898:2903] CHIP:DMG: } [1657884282.303695][2898:2903] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0000 DataVersion: 2387607084 - [1657884282.303778][2898:2903] CHIP:TOO: temperature display mode: 1 + [1657884282.303778][2898:2903] CHIP:TOO: TemperatureDisplayMode: 1 [1657884282.303862][2898:2903] CHIP:EM: Sending Standalone Ack for MessageCounter:147756485 on exchange 42871i If the DUT has to provision to verify the logs,, verify that TH all-clusters-app sent success response [1655796341.132655][6946:6951] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0000 DataVersion: 3165945391 - [1655796341.132864][6946:6951] CHIP:TOO: temperature display mode: 1 + [1655796341.132864][6946:6951] CHIP:TOO: TemperatureDisplayMode: 1 [1655796341.132973][6946:6951] CHIP:EM: Sending Standalone Ack for MessageCounter:245498041 on exchange 51992i disabled: true @@ -758,7 +758,7 @@ tests: If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response [1655796786.513406][6976:6981] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0000 DataVersion: 3165945392 - [1655796786.513496][6976:6981] CHIP:TOO: temperature display mode: 1 + [1655796786.513496][6976:6981] CHIP:TOO: TemperatureDisplayMode: 1 [1655796786.513593][6976:6981] CHIP:EM: Sending Standalone Ack for MessageCounter:190446058 on exchange 28240i diff --git a/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml index 5bddeb08ddd00d..1e93b6c5d1844d 100644 --- a/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml @@ -301,7 +301,7 @@ tests: ./chip-tool any read-by-id 0x0204 0 1 1 [1655201353.941835][3634:3639] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0000 DataVersion: 263686993 - [1655201353.941926][3634:3639] CHIP:TOO: temperature display mode: 1 + [1655201353.941926][3634:3639] CHIP:TOO: TemperatureDisplayMode: 1 [1655201353.942030][3634:3639] CHIP:EM: Sending Standalone Ack for MessageCounter:58103180 on exchange 16578i disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml index 9cb009f609291d..fded86ed18b8c6 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml @@ -34,7 +34,7 @@ tests: - label: "Read the mandatory attribute: TemperatureDisplayMode" PICS: TSUIC.S.A0000 command: "readAttribute" - attribute: "temperature display mode" + attribute: "TemperatureDisplayMode" response: constraints: type: enum8 @@ -44,7 +44,7 @@ tests: - label: "Read the mandatory attribute: KeypadLockout" PICS: TSUIC.S.A0001 command: "readAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" response: constraints: type: enum8 @@ -54,7 +54,7 @@ tests: - label: "Read the optional attribute: ScheduleProgrammingVisibility" PICS: TSUIC.S.A0002 command: "readAttribute" - attribute: "schedule programming visibility" + attribute: "ScheduleProgrammingVisibility" response: constraints: type: enum8 diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml index 11180e99d155a3..239d37a942c742 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml @@ -34,7 +34,7 @@ tests: - label: "Writes a value of 0 to TemperatureDisplayMode attribute of DUT" PICS: TSUIC.S.A0000 command: "writeAttribute" - attribute: "temperature display mode" + attribute: "TemperatureDisplayMode" arguments: value: 0 @@ -52,14 +52,14 @@ tests: - label: "TH reads the TemperatureDisplayMode attribute of DUT" PICS: TSUIC.S.A0000 command: "readAttribute" - attribute: "temperature display mode" + attribute: "TemperatureDisplayMode" arguments: value: 0 - label: "Writes a value of 1 to TemperatureDisplayMode attribute of DUT" PICS: TSUIC.S.A0000 command: "writeAttribute" - attribute: "temperature display mode" + attribute: "TemperatureDisplayMode" arguments: value: 1 @@ -77,7 +77,7 @@ tests: - label: "TH reads the TemperatureDisplayMode attribute of DUT" PICS: TSUIC.S.A0000 command: "readAttribute" - attribute: "temperature display mode" + attribute: "TemperatureDisplayMode" response: value: 1 @@ -86,7 +86,7 @@ tests: of DUT" PICS: TSUIC.S.A0000 command: "writeAttribute" - attribute: "temperature display mode" + attribute: "TemperatureDisplayMode" arguments: value: 2 response: @@ -95,14 +95,14 @@ tests: - label: "TH reads the TemperatureDisplayMode attribute of DUT" PICS: TSUIC.S.A0000 command: "readAttribute" - attribute: "temperature display mode" + attribute: "TemperatureDisplayMode" response: value: 1 - label: "Writes a value of 0 to KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "writeAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" arguments: value: 0 @@ -120,14 +120,14 @@ tests: - label: "TH reads the KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "readAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" response: value: 0 - label: "Writes a value of 1 to KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "writeAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" arguments: value: 1 @@ -145,14 +145,14 @@ tests: - label: "TH reads the KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "readAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" response: value: 1 - label: "Writes a value of 2 to KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "writeAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" arguments: value: 2 @@ -170,14 +170,14 @@ tests: - label: "TH reads the KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "readAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" response: value: 2 - label: "Writes a value of 3 to KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "writeAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" arguments: value: 3 @@ -195,14 +195,14 @@ tests: - label: "TH reads the KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "readAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" response: value: 3 - label: "Writes a value of 4 to KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "writeAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" arguments: value: 4 @@ -220,14 +220,14 @@ tests: - label: "TH reads the KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "readAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" response: value: 4 - label: "Writes a value of 5 to KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "writeAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" arguments: value: 5 @@ -245,7 +245,7 @@ tests: - label: "TH reads the KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "readAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" response: value: 5 @@ -253,7 +253,7 @@ tests: "Writes a value of greater than 5 to KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "writeAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" arguments: value: 6 response: @@ -262,7 +262,7 @@ tests: - label: "TH reads the KeypadLockout attribute of DUT" PICS: TSUIC.S.A0001 command: "readAttribute" - attribute: "keypad lockout" + attribute: "KeypadLockout" response: value: 5 @@ -270,7 +270,7 @@ tests: "Writes a value of 0 to ScheduleProgrammingVisibility attribute of DUT" PICS: TSUIC.S.A0002 command: "writeAttribute" - attribute: "schedule programming visibility" + attribute: "ScheduleProgrammingVisibility" arguments: value: 0 @@ -290,7 +290,7 @@ tests: - label: "TH reads the ScheduleProgrammingVisibility attribute of DUT" PICS: TSUIC.S.A0002 command: "readAttribute" - attribute: "schedule programming visibility" + attribute: "ScheduleProgrammingVisibility" response: value: 0 @@ -298,7 +298,7 @@ tests: "Writes a value of 1 to ScheduleProgrammingVisibility attribute of DUT" PICS: TSUIC.S.A0002 command: "writeAttribute" - attribute: "schedule programming visibility" + attribute: "ScheduleProgrammingVisibility" arguments: value: 1 @@ -318,7 +318,7 @@ tests: - label: "TH reads the ScheduleProgrammingVisibility attribute of DUT" PICS: TSUIC.S.A0002 command: "readAttribute" - attribute: "schedule programming visibility" + attribute: "ScheduleProgrammingVisibility" response: value: 1 @@ -327,7 +327,7 @@ tests: attribute of DUT" PICS: TSUIC.S.A0002 command: "writeAttribute" - attribute: "schedule programming visibility" + attribute: "ScheduleProgrammingVisibility" arguments: value: 2 response: @@ -336,6 +336,6 @@ tests: - label: "TH reads the ScheduleProgrammingVisibility attribute of DUT" PICS: TSUIC.S.A0002 command: "readAttribute" - attribute: "schedule programming visibility" + attribute: "ScheduleProgrammingVisibility" response: value: 1 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 58446ef5e155ac..08c5e254c6b7aa 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml @@ -97,14 +97,15 @@ limitations under the License. THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER true true - temperature display mode + + TemperatureDisplayMode - keypad lockout + KeypadLockout - schedule programming visibility + ScheduleProgrammingVisibility diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index f9deb798ef3a98..9004d79d58bd1d 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -12273,7 +12273,7 @@ "enabled": 0, "attributes": [ { - "name": "temperature display mode", + "name": "TemperatureDisplayMode", "code": 0, "mfgCode": null, "side": "server", @@ -12289,7 +12289,7 @@ "reportableChange": 0 }, { - "name": "keypad lockout", + "name": "KeypadLockout", "code": 1, "mfgCode": null, "side": "server", @@ -12305,7 +12305,7 @@ "reportableChange": 0 }, { - "name": "schedule programming visibility", + "name": "ScheduleProgrammingVisibility", "code": 2, "mfgCode": null, "side": "server", diff --git a/zzz_generated/all-clusters-app/zap-generated/access.h b/zzz_generated/all-clusters-app/zap-generated/access.h index 14f74068882924..5bd2477bd02e1f 100644 --- a/zzz_generated/all-clusters-app/zap-generated/access.h +++ b/zzz_generated/all-clusters-app/zap-generated/access.h @@ -74,8 +74,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \ /* Cluster: Color Control, Attribute: WhitePointY, Privilege: view */ \ /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: view */ \ @@ -137,8 +137,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \ /* Cluster: Color Control, Attribute: WhitePointY, Privilege: view */ \ /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: view */ \ @@ -200,8 +200,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: WhitePointX, Privilege: view */ \ /* Cluster: Color Control, Attribute: WhitePointY, Privilege: view */ \ /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: view */ \ @@ -256,8 +256,8 @@ 513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ 768, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \ 768, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \ 768, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \ @@ -310,8 +310,8 @@ 25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - 2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + 1, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + 2, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ 48, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \ 49, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \ 50, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \ @@ -364,8 +364,8 @@ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: WhitePointX, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: WhitePointY, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: ColorPointRX, Privilege: manage */ \ diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 2e13bb7a0423bb..ba12b1aeadd456 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -339,9 +339,9 @@ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* SpeedSetting */ \ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* keypad lockout */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* schedule programming visibility */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* TemperatureDisplayMode */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* KeypadLockout */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* ScheduleProgrammingVisibility */ \ \ /* Endpoint: 1, Cluster: Color Control (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFEFF }, /* WhitePointX */ \ @@ -1080,11 +1080,11 @@ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(26), 0x00000000, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* temperature display mode */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(27), 0x00000001, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* keypad lockout */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(28), 0x00000002, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* schedule programming visibility */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ScheduleProgrammingVisibility */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/access.h b/zzz_generated/all-clusters-minimal-app/zap-generated/access.h index 8f8228aeced1bd..3da73af2c0b392 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/access.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/access.h @@ -51,7 +51,7 @@ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute @@ -78,7 +78,7 @@ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute @@ -105,7 +105,7 @@ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -125,7 +125,7 @@ 512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } // Parallel array data (cluster, *attribute*, privilege) for write attribute @@ -143,7 +143,7 @@ 32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + 1, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } // Parallel array data (cluster, attribute, *privilege*) for write attribute @@ -161,7 +161,7 @@ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h index 0043f5f8be795e..66af010c2ff80a 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h @@ -278,8 +278,8 @@ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* PercentSetting */ \ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* keypad lockout */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* TemperatureDisplayMode */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* KeypadLockout */ \ \ /* Endpoint: 1, Cluster: Unit Testing (server) */ \ { (uint16_t) 0x46, (uint16_t) 0x14, (uint16_t) 0x64 }, /* range_restricted_int8u */ \ @@ -709,9 +709,9 @@ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(11), 0x00000000, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* temperature display mode */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(12), 0x00000001, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* keypad lockout */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/access.h b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/access.h index ad07debfe3c46a..1b84e710e124d5 100644 --- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/access.h +++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/access.h @@ -53,7 +53,7 @@ /* Cluster: Thermostat, Attribute: RemoteSensing, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute @@ -82,7 +82,7 @@ /* Cluster: Thermostat, Attribute: RemoteSensing, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute @@ -111,7 +111,7 @@ /* Cluster: Thermostat, Attribute: RemoteSensing, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -136,7 +136,7 @@ 513, /* Cluster: Thermostat, Attribute: RemoteSensing, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } // Parallel array data (cluster, *attribute*, privilege) for write attribute @@ -159,7 +159,7 @@ 26, /* Cluster: Thermostat, Attribute: RemoteSensing, Privilege: manage */ \ 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + 1, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } // Parallel array data (cluster, attribute, *privilege*) for write attribute @@ -182,7 +182,7 @@ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: RemoteSensing, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h index 99f36e32be36ee..12a3a2ff75a3f8 100644 --- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h @@ -92,10 +92,10 @@ { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* TemperatureDisplayMode */ \ { \ (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 \ - } /* keypad lockout */ \ + } /* KeypadLockout */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -352,9 +352,9 @@ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(15), 0x00000000, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* temperature display mode */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(16), 0x00000001, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* keypad lockout */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ } 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 db386d40d811a4..1545849d5e6b5b 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -7682,17 +7682,17 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP case ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("temperature display mode", 1, value); + return DataModelLogger::LogValue("TemperatureDisplayMode", 1, value); } case ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("keypad lockout", 1, value); + return DataModelLogger::LogValue("KeypadLockout", 1, value); } case ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("schedule programming visibility", 1, value); + return DataModelLogger::LogValue("ScheduleProgrammingVisibility", 1, value); } case ThermostatUserInterfaceConfiguration::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; 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 b02ee22c71cc44..26e2f7857d773a 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -58264,7 +58264,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("temperature display mode", actualValue, 1U)); + VerifyOrReturn(CheckValue("TemperatureDisplayMode", actualValue, 1U)); } NextTest(); @@ -58318,7 +58318,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("temperature display mode", actualValue, 1U)); + VerifyOrReturn(CheckValue("TemperatureDisplayMode", actualValue, 1U)); } NextTest(); @@ -58376,7 +58376,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("keypad lockout", actualValue, 0U)); + VerifyOrReturn(CheckValue("KeypadLockout", actualValue, 0U)); } NextTest(); @@ -58434,7 +58434,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("keypad lockout", actualValue, 1U)); + VerifyOrReturn(CheckValue("KeypadLockout", actualValue, 1U)); } NextTest(); @@ -58492,7 +58492,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("keypad lockout", actualValue, 2U)); + VerifyOrReturn(CheckValue("KeypadLockout", actualValue, 2U)); } NextTest(); @@ -58550,7 +58550,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("keypad lockout", actualValue, 3U)); + VerifyOrReturn(CheckValue("KeypadLockout", actualValue, 3U)); } NextTest(); @@ -58608,7 +58608,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("keypad lockout", actualValue, 4U)); + VerifyOrReturn(CheckValue("KeypadLockout", actualValue, 4U)); } NextTest(); @@ -58666,7 +58666,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("keypad lockout", actualValue, 5U)); + VerifyOrReturn(CheckValue("KeypadLockout", actualValue, 5U)); } NextTest(); @@ -58720,7 +58720,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("keypad lockout", actualValue, 5U)); + VerifyOrReturn(CheckValue("KeypadLockout", actualValue, 5U)); } NextTest(); @@ -58780,7 +58780,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("schedule programming visibility", actualValue, 0U)); + VerifyOrReturn(CheckValue("ScheduleProgrammingVisibility", actualValue, 0U)); } NextTest(); @@ -58840,7 +58840,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("schedule programming visibility", actualValue, 1U)); + VerifyOrReturn(CheckValue("ScheduleProgrammingVisibility", actualValue, 1U)); } NextTest(); @@ -58894,7 +58894,7 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("schedule programming visibility", actualValue, 1U)); + VerifyOrReturn(CheckValue("ScheduleProgrammingVisibility", actualValue, 1U)); } NextTest(); diff --git a/zzz_generated/placeholder/app1/zap-generated/access.h b/zzz_generated/placeholder/app1/zap-generated/access.h index 18f8654709c020..ca437c20f1a55e 100644 --- a/zzz_generated/placeholder/app1/zap-generated/access.h +++ b/zzz_generated/placeholder/app1/zap-generated/access.h @@ -53,8 +53,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ @@ -93,8 +93,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ @@ -133,8 +133,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ @@ -170,8 +170,8 @@ 513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ 768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ 1030, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ 1030, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ @@ -205,8 +205,8 @@ 25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - 2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + 1, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + 2, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ 16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ 16, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ 17, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ @@ -240,8 +240,8 @@ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index 575c58561a6e0f..8b7584135bd83a 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -94,9 +94,9 @@ { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \ \ /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* keypad lockout */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* schedule programming visibility */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* TemperatureDisplayMode */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* KeypadLockout */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* ScheduleProgrammingVisibility */ \ \ /* Endpoint: 1, Cluster: Unit Localization (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x2 }, /* TemperatureUnit */ \ @@ -474,11 +474,11 @@ \ /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(13), 0x00000000, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* temperature display mode */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(14), 0x00000001, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* keypad lockout */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(15), 0x00000002, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* schedule programming visibility */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ScheduleProgrammingVisibility */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/placeholder/app2/zap-generated/access.h b/zzz_generated/placeholder/app2/zap-generated/access.h index 18f8654709c020..ca437c20f1a55e 100644 --- a/zzz_generated/placeholder/app2/zap-generated/access.h +++ b/zzz_generated/placeholder/app2/zap-generated/access.h @@ -53,8 +53,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ @@ -93,8 +93,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ @@ -133,8 +133,8 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: view */ \ /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: view */ \ /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: view */ \ @@ -170,8 +170,8 @@ 513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ 768, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ 1030, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ 1030, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ @@ -205,8 +205,8 @@ 25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - 2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + 1, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + 2, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ 16400, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ 16, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ 17, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ @@ -240,8 +240,8 @@ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: ScheduleProgrammingVisibility, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR occupied to unoccupied delay, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Occupancy Sensing, Attribute: PIR unoccupied to occupied delay, Privilege: manage */ \ diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index da8ed9530388f8..b4545a28d7382c 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -97,9 +97,9 @@ { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \ \ /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* keypad lockout */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* schedule programming visibility */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* TemperatureDisplayMode */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 }, /* KeypadLockout */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* ScheduleProgrammingVisibility */ \ \ /* Endpoint: 1, Cluster: Color Control (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFEFF }, /* StartUpColorTemperatureMireds */ \ @@ -492,11 +492,11 @@ \ /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(14), 0x00000000, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* temperature display mode */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(15), 0x00000001, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* keypad lockout */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(16), 0x00000002, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* schedule programming visibility */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ScheduleProgrammingVisibility */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/thermostat/zap-generated/access.h b/zzz_generated/thermostat/zap-generated/access.h index fdc1862694dc29..5a3b54988010f4 100644 --- a/zzz_generated/thermostat/zap-generated/access.h +++ b/zzz_generated/thermostat/zap-generated/access.h @@ -54,7 +54,7 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute @@ -84,7 +84,7 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute @@ -114,7 +114,7 @@ /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ - /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ + /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: view */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -137,7 +137,7 @@ 513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + 516, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } // Parallel array data (cluster, *attribute*, privilege) for write attribute @@ -158,7 +158,7 @@ 25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + 1, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } // Parallel array data (cluster, attribute, *privilege*) for write attribute @@ -179,7 +179,7 @@ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: KeypadLockout, Privilege: manage */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 97802a2746be6c..c7abf630b34da3 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -100,10 +100,10 @@ { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ - { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \ + { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* TemperatureDisplayMode */ \ { \ (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x5 \ - } /* keypad lockout */ \ + } /* KeypadLockout */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -527,9 +527,9 @@ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(11), 0x00000000, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* temperature display mode */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */ \ { ZAP_MIN_MAX_DEFAULTS_INDEX(12), 0x00000001, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* keypad lockout */ \ + ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ }