Skip to content

Commit

Permalink
Align naming in Thermostat User Interface Configuration cluster XML w…
Browse files Browse the repository at this point in the history
…ith the spec. (#24375)

* Align naming in Thermostat User Interface Configuration cluster XML with the spec.

* Auto-update ZAP files.

* Regenerate generated code.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Mar 25, 2023
1 parent 33c9cb9 commit 4948098
Show file tree
Hide file tree
Showing 26 changed files with 157 additions and 156 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15553,7 +15553,7 @@
"enabled": 1,
"attributes": [
{
"name": "temperature display mode",
"name": "TemperatureDisplayMode",
"code": 0,
"mfgCode": null,
"side": "server",
Expand All @@ -15569,7 +15569,7 @@
"reportableChange": 0
},
{
"name": "keypad lockout",
"name": "KeypadLockout",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -15585,7 +15585,7 @@
"reportableChange": 0
},
{
"name": "schedule programming visibility",
"name": "ScheduleProgrammingVisibility",
"code": 2,
"mfgCode": null,
"side": "server",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15045,7 +15045,7 @@
"enabled": 1,
"attributes": [
{
"name": "temperature display mode",
"name": "TemperatureDisplayMode",
"code": 0,
"mfgCode": null,
"side": "server",
Expand All @@ -15061,7 +15061,7 @@
"reportableChange": 0
},
{
"name": "keypad lockout",
"name": "KeypadLockout",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -15077,7 +15077,7 @@
"reportableChange": 0
},
{
"name": "schedule programming visibility",
"name": "ScheduleProgrammingVisibility",
"code": 2,
"mfgCode": null,
"side": "server",
Expand Down
6 changes: 3 additions & 3 deletions examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
Original file line number Diff line number Diff line change
Expand Up @@ -7347,7 +7347,7 @@
"enabled": 1,
"attributes": [
{
"name": "temperature display mode",
"name": "TemperatureDisplayMode",
"code": 0,
"mfgCode": null,
"side": "server",
Expand All @@ -7363,7 +7363,7 @@
"reportableChange": 0
},
{
"name": "keypad lockout",
"name": "KeypadLockout",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -7379,7 +7379,7 @@
"reportableChange": 0
},
{
"name": "schedule programming visibility",
"name": "ScheduleProgrammingVisibility",
"code": 2,
"mfgCode": null,
"side": "server",
Expand Down
6 changes: 3 additions & 3 deletions examples/placeholder/linux/apps/app1/config.zap
Original file line number Diff line number Diff line change
Expand Up @@ -5151,7 +5151,7 @@
"enabled": 1,
"attributes": [
{
"name": "temperature display mode",
"name": "TemperatureDisplayMode",
"code": 0,
"mfgCode": null,
"side": "server",
Expand All @@ -5167,7 +5167,7 @@
"reportableChange": 0
},
{
"name": "keypad lockout",
"name": "KeypadLockout",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -5183,7 +5183,7 @@
"reportableChange": 0
},
{
"name": "schedule programming visibility",
"name": "ScheduleProgrammingVisibility",
"code": 2,
"mfgCode": null,
"side": "server",
Expand Down
6 changes: 3 additions & 3 deletions examples/placeholder/linux/apps/app2/config.zap
Original file line number Diff line number Diff line change
Expand Up @@ -5435,7 +5435,7 @@
"enabled": 1,
"attributes": [
{
"name": "temperature display mode",
"name": "TemperatureDisplayMode",
"code": 0,
"mfgCode": null,
"side": "server",
Expand All @@ -5451,7 +5451,7 @@
"reportableChange": 0
},
{
"name": "keypad lockout",
"name": "KeypadLockout",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -5467,7 +5467,7 @@
"reportableChange": 0
},
{
"name": "schedule programming visibility",
"name": "ScheduleProgrammingVisibility",
"code": 2,
"mfgCode": null,
"side": "server",
Expand Down
6 changes: 3 additions & 3 deletions examples/thermostat/thermostat-common/thermostat.zap
Original file line number Diff line number Diff line change
Expand Up @@ -11537,7 +11537,7 @@
"enabled": 1,
"attributes": [
{
"name": "temperature display mode",
"name": "TemperatureDisplayMode",
"code": 0,
"mfgCode": null,
"side": "server",
Expand All @@ -11553,7 +11553,7 @@
"reportableChange": 0
},
{
"name": "keypad lockout",
"name": "KeypadLockout",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -11569,7 +11569,7 @@
"reportableChange": 0
},
{
"name": "schedule programming visibility",
"name": "ScheduleProgrammingVisibility",
"code": 2,
"mfgCode": null,
"side": "server",
Expand Down
6 changes: 3 additions & 3 deletions src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading

0 comments on commit 4948098

Please sign in to comment.