Match Unit Localization Cluster to spec (#29960)

* Match unit localization cluster to spec * Zap regen * Undo isnullable change * Zap regen * ran zap_convert_all --------- Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Jan 24, 2024 · 2786573 · 2786573
1 parent 90a21f3
commit 2786573
Show file tree

Hide file tree

Showing 26 changed files with 42 additions and 36 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -1079,7 +1079,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

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
@@ -7064,7 +7064,7 @@
  "code": 0,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "TemperatureDisplayModeEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -7080,7 +7080,7 @@
  "code": 1,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "KeypadLockoutEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,

diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -649,7 +649,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -310,7 +310,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
@@ -310,7 +310,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/..._refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/..._refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
@@ -310,7 +310,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
@@ -3037,7 +3037,7 @@
  "code": 0,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "TemperatureDisplayModeEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -3053,7 +3053,7 @@
  "code": 1,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "KeypadLockoutEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,

diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -3596,7 +3596,7 @@
  "code": 0,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "TemperatureDisplayModeEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -3612,7 +3612,7 @@
  "code": 1,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "KeypadLockoutEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,

diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
@@ -398,7 +398,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -1023,7 +1023,7 @@ client cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute optional TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) optional TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;
@@ -1047,7 +1047,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
@@ -8760,7 +8760,7 @@
  "code": 0,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "TemperatureDisplayModeEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -8776,7 +8776,7 @@
  "code": 1,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "KeypadLockoutEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -8792,7 +8792,7 @@
  "code": 2,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "ScheduleProgrammingVisibilityEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -1006,7 +1006,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
@@ -8834,7 +8834,7 @@
  "code": 0,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "TemperatureDisplayModeEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -8850,7 +8850,7 @@
  "code": 1,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "KeypadLockoutEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -8866,7 +8866,7 @@
  "code": 2,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "ScheduleProgrammingVisibilityEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,

diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
@@ -265,7 +265,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/...temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/...temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -414,7 +414,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -722,7 +722,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -722,7 +722,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
@@ -596,7 +596,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
@@ -4964,7 +4964,7 @@
  "code": 0,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "TemperatureDisplayModeEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -4980,7 +4980,7 @@
  "code": 1,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "KeypadLockoutEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,

diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
@@ -528,7 +528,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -630,7 +630,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -666,7 +666,7 @@ server cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;

diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
@@ -10346,7 +10346,7 @@
  "code": 0,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "TemperatureDisplayModeEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -10362,7 +10362,7 @@
  "code": 1,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "KeypadLockoutEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -10378,7 +10378,7 @@
  "code": 2,
  "mfgCode": null,
  "side": "server",
- "type": "enum8",
+ "type": "ScheduleProgrammingVisibilityEnum",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,

diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
@@ -234,6 +234,7 @@
  0x0000002B, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
  0x0000002C, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
  0x0000002C, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
+ 0x0000002D, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
  0x00000030, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
  0x00000031, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
  0x0000003F, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -292,6 +293,7 @@
  0x00000000, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
  0x00000000, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
  0x00000001, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
+ 0x00000000, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
  0x00000000, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
  0x00000004, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
  0x00000000, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -350,6 +352,7 @@
  kMatterAccessPrivilegeManage, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
  kMatterAccessPrivilegeManage, /* Cluster: Time Format Localization, Attribute: HourFormat, Privilege: manage */ \
  kMatterAccessPrivilegeManage, /* Cluster: Time Format Localization, Attribute: ActiveCalendarType, Privilege: manage */ \
+ kMatterAccessPrivilegeManage, /* Cluster: Unit Localization, Attribute: TemperatureUnit, Privilege: manage */ \
  kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
  kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
  kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \

diff --git a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
@@ -35,7 +35,10 @@ limitations under the License.
  mechanism by which they can be configured to use a user’s preferred unit.</description>
  <globalAttribute side="either" code="0xFFFD" value="1"/>
  <!-- Base data types -->
- <attribute side="server" code="0x00" define="TEMPERATURE_UNIT" type="TempUnitEnum" min="0" max="2" writable="true" optional="true">TemperatureUnit</attribute>
+ <attribute side="server" code="0x00" define="TEMPERATURE_UNIT" type="TempUnitEnum" min="0" max="2" writable="true" optional="true">
+ <description>TemperatureUnit</description>
+ <access op="write" role="manage"/>
+ </attribute>
  </cluster>
  <bitmap name="Feature" type="bitmap32">
  <cluster code="0x002d"/>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -1162,7 +1162,7 @@ client cluster UnitLocalization = 45 {
  kTemperatureUnit = 0x1;
  }
 
- attribute optional TempUnitEnum temperatureUnit = 0;
+ attribute access(write: manage) optional TempUnitEnum temperatureUnit = 0;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;