Align naming in Thermostat User Interface Configuration cluster XML w…

…ith the spec. (#24375) * Align naming in Thermostat User Interface Configuration cluster XML with the spec. * Auto-update ZAP files. * Regenerate generated code.
project-chip · Jun 21, 2023 · 3e679c7 · 3e679c7
1 parent 5ea4d93
commit 3e679c7
Show file tree

Hide file tree

Showing 26 changed files with 157 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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