Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align Unit Localization cluster XML to spec changes. #25291

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ server cluster TimeFormatLocalization = 44 {
}

server cluster UnitLocalization = 45 {
enum TempUnit : ENUM8 {
enum TempUnitEnum : ENUM8 {
kFahrenheit = 0;
kCelsius = 1;
kKelvin = 2;
Expand All @@ -894,7 +894,7 @@ server cluster UnitLocalization = 45 {
kTemperatureUnit = 0x1;
}

attribute TempUnit temperatureUnit = 0;
attribute TempUnitEnum temperatureUnit = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2123,7 +2123,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ server cluster TimeFormatLocalization = 44 {
}

server cluster UnitLocalization = 45 {
enum TempUnit : ENUM8 {
enum TempUnitEnum : ENUM8 {
kFahrenheit = 0;
kCelsius = 1;
kKelvin = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ server cluster TimeFormatLocalization = 44 {
}

server cluster UnitLocalization = 45 {
enum TempUnit : ENUM8 {
enum TempUnitEnum : ENUM8 {
kFahrenheit = 0;
kCelsius = 1;
kKelvin = 2;
Expand All @@ -564,7 +564,7 @@ server cluster UnitLocalization = 45 {
kTemperatureUnit = 0x1;
}

attribute TempUnit temperatureUnit = 0;
attribute TempUnitEnum temperatureUnit = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2117,7 +2117,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
4 changes: 2 additions & 2 deletions examples/dynamic-bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ server cluster TimeFormatLocalization = 44 {
}

server cluster UnitLocalization = 45 {
enum TempUnit : ENUM8 {
enum TempUnitEnum : ENUM8 {
kFahrenheit = 0;
kCelsius = 1;
kKelvin = 2;
Expand All @@ -564,7 +564,7 @@ server cluster UnitLocalization = 45 {
kTemperatureUnit = 0x1;
}

attribute TempUnit temperatureUnit = 0;
attribute TempUnitEnum temperatureUnit = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/nxp/zap/lighting-on-off.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1981,7 +1981,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/lock-common/lock-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1817,7 +1817,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/nxp/zap/lock-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1983,7 +1983,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "TempUnit",
"type": "TempUnitEnum",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
Expand Down
8 changes: 4 additions & 4 deletions examples/placeholder/linux/apps/app1/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ server cluster TimeFormatLocalization = 44 {
}

client cluster UnitLocalization = 45 {
enum TempUnit : ENUM8 {
enum TempUnitEnum : ENUM8 {
kFahrenheit = 0;
kCelsius = 1;
kKelvin = 2;
Expand All @@ -720,7 +720,7 @@ client cluster UnitLocalization = 45 {
kTemperatureUnit = 0x1;
}

attribute TempUnit temperatureUnit = 0;
attribute TempUnitEnum temperatureUnit = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -730,7 +730,7 @@ client cluster UnitLocalization = 45 {
}

server cluster UnitLocalization = 45 {
enum TempUnit : ENUM8 {
enum TempUnitEnum : ENUM8 {
kFahrenheit = 0;
kCelsius = 1;
kKelvin = 2;
Expand All @@ -740,7 +740,7 @@ server cluster UnitLocalization = 45 {
kTemperatureUnit = 0x1;
}

attribute TempUnit temperatureUnit = 0;
attribute TempUnitEnum temperatureUnit = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Loading