From 12229db564216b90b352906faef7eb7199208752 Mon Sep 17 00:00:00 2001 From: Arya Hassanli Date: Wed, 25 Mar 2026 17:01:39 +0000 Subject: [PATCH 1/5] Update zapxml handler to support fieldId for commands --- scripts/py_matter_idl/matter/idl/zapxml/handlers/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/py_matter_idl/matter/idl/zapxml/handlers/handlers.py b/scripts/py_matter_idl/matter/idl/zapxml/handlers/handlers.py index 7e270ab81f219d..cd81f7296661ba 100644 --- a/scripts/py_matter_idl/matter/idl/zapxml/handlers/handlers.py +++ b/scripts/py_matter_idl/matter/idl/zapxml/handlers/handlers.py @@ -96,7 +96,7 @@ def GetNextProcessor(self, name: str, attrs): field = Field( data_type=data_type, - code=ParseInt(attrs['id']), + code=ParseInt(attrs['fieldId'] if 'fieldId' in attrs else attrs['id']), name=attrs['name'], is_list=(attrs.get('array', 'false').lower() == 'true'), ) From db515f90d469b26e7020ad5f9a723b3a39eca61b Mon Sep 17 00:00:00 2001 From: Arya Hassanli Date: Wed, 25 Mar 2026 17:57:32 +0000 Subject: [PATCH 2/5] Update ZAP xml --- .../data-model/chip/thermostat-cluster.xml | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml index ef405f9bc7ce44..a188aa545138f2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -1,6 +1,6 @@ @@ -292,7 +292,7 @@ Alchemy: v1.5.47 THERMOSTAT_CLUSTER true true - + @@ -310,13 +310,21 @@ Alchemy: v1.5.47 + + + + + + + + - + @@ -337,21 +345,13 @@ Alchemy: v1.5.47 - - - - - - - - - + @@ -376,17 +376,17 @@ Alchemy: v1.5.47 - + - + - + @@ -500,7 +500,7 @@ Alchemy: v1.5.47 - + @@ -513,10 +513,10 @@ Alchemy: v1.5.47 - + - + @@ -532,7 +532,7 @@ Alchemy: v1.5.47 - + @@ -592,32 +592,32 @@ Alchemy: v1.5.47 - + - + - + - + - + - + @@ -638,7 +638,7 @@ Alchemy: v1.5.47 - + @@ -681,18 +681,18 @@ Alchemy: v1.5.47 - Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. - - + This command will raise or lower the setpoint based on the provided values. + + This command is used to update the thermostat weekly setpoint schedule from a management system. - - - - + + + + @@ -700,16 +700,16 @@ Alchemy: v1.5.47 The Current Weekly Schedule Command is sent from the server in response to the Get Weekly Schedule Command. - - + + - - + This command is sent in response to the AddThermostatSuggestion command. + @@ -727,39 +727,39 @@ Alchemy: v1.5.47 - Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. - + This command will set the active schedule to the provided schedule handle. + - ID - + This command will set the active preset to the provided preset handle. + - + This command has the same payload format as the Set Weekly Schedule. - - - - + + + + - + This command will add a new suggestion based on the specified values. - - - + + + @@ -769,9 +769,9 @@ Alchemy: v1.5.47 - + This command will remove the specified suggestion. - + @@ -796,8 +796,8 @@ Alchemy: v1.5.47 - - + + This event SHALL be generated when the SystemMode attribute changes. @@ -808,7 +808,7 @@ Alchemy: v1.5.47 - + This event SHALL be generated when the LocalTemperature attribute changes significantly. @@ -824,8 +824,8 @@ Alchemy: v1.5.47 - - + + This event SHALL be generated when the Occupancy attribute changes. @@ -839,10 +839,10 @@ Alchemy: v1.5.47 - - - - + + + + This event SHALL be generated when the value of any of the OccupiedHeatingSetpoint, UnoccupiedHeatingSetpoint, OccupiedCoolingSetpoint, or UnoccupiedCoolingSetpoint attributes is changed. @@ -853,8 +853,8 @@ Alchemy: v1.5.47 - - + + This event SHALL be generated when the ThermostatRunningState attribute changes. @@ -865,8 +865,8 @@ Alchemy: v1.5.47 - - + + This event SHALL be generated when the ThermostatRunningMode attribute changes. @@ -880,8 +880,8 @@ Alchemy: v1.5.47 - - + + This event SHALL be generated when the ActiveScheduleHandle attribute changes. @@ -895,8 +895,8 @@ Alchemy: v1.5.47 - - + + This event SHALL be generated when the ActivePresetHandle attribute changes. From 28a2cd2e96d03036fb6ac8df15cfebac40c088c3 Mon Sep 17 00:00:00 2001 From: Arya Hassanli Date: Wed, 25 Mar 2026 17:58:23 +0000 Subject: [PATCH 3/5] ZAP regen --- .../air-purifier-app.matter | 10 ++++--- .../air-quality-sensor-app.matter | 6 ++--- .../icd-lit-air-quality-sensor-app.matter | 6 ++--- .../all-clusters-app.matter | 10 ++++--- .../data_model/all-clusters-app.matter | 10 ++++--- .../all-clusters-minimal-app.matter | 16 +++++++----- ...umiditysensor_thermostat_56de3d5f45.matter | 10 ++++--- .../rootnode_heatpump_87ivjRAECh.matter | 10 ++++--- ...tnode_roomairconditioner_9cf3607804.matter | 10 ++++--- .../rootnode_thermostat_bm3fb8dhYi.matter | 10 ++++--- .../closure-common/closure-app.matter | 6 ++--- .../data_model/closure-thread-app.matter | 6 ++--- .../silabs/data_model/closure-wifi-app.matter | 6 ++--- .../dishwasher-common/dishwasher-app.matter | 6 ++--- .../data_model/dishwasher-thread-app.matter | 6 ++--- .../data_model/dishwasher-wifi-app.matter | 6 ++--- .../energy-gateway-app.matter | 6 ++--- .../icd-lit-light-switch-app.matter | 6 ++--- .../light-switch-app.matter | 6 ++--- .../light-switch-app/qpg/zap/switch.matter | 6 ++--- .../icd-lit-light-switch-app.matter | 6 ++--- .../light-switch-app-1_to_11.matter | 6 ++--- .../data_model/light-switch-app-1_to_2.matter | 6 ++--- .../data_model/light-switch-app-1_to_8.matter | 6 ++--- .../data_model/light-switch-app.matter | 6 ++--- .../lighting-common/lighting-app.matter | 6 ++--- .../data_model/lighting-app-ethernet.matter | 6 ++--- .../data_model/lighting-app-wifi.matter | 6 ++--- .../lighting-common/lighting-app.matter | 6 ++--- examples/lighting-app/qpg/zap/light.matter | 6 ++--- .../data_model/lighting-thread-app.matter | 6 ++--- .../data_model/lighting-wifi-app.matter | 6 ++--- .../lit-icd-common/lit-icd-server-app.matter | 6 ++--- examples/lock-app/lock-common/lock-app.matter | 6 ++--- examples/lock-app/nxp/zap/lock-app.matter | 6 ++--- examples/lock-app/qpg/zap/lock.matter | 6 ++--- .../realtek/data_model/lock-app.matter | 6 ++--- .../silabs/data_model/lock-app.matter | 6 ++--- .../microwave-oven-app.matter | 6 ++--- .../network-manager-app.matter | 6 ++--- .../ota-provider-app.matter | 6 ++--- .../placeholder/linux/apps/app1/config.matter | 26 +++++++++++-------- .../placeholder/linux/apps/app2/config.matter | 26 +++++++++++-------- .../pump-controller-app.matter | 6 ++--- .../refrigerator-app.matter | 6 ++--- .../data_model/refrigerator-thread-app.matter | 6 ++--- .../data_model/refrigerator-wifi-app.matter | 6 ++--- examples/rvc-app/rvc-common/rvc-app.matter | 6 ++--- .../smoke-co-alarm-app.matter | 6 ++--- .../nxp/zap/thermostat_matter_br.matter | 16 +++++++----- .../nxp/zap/thermostat_matter_eth.matter | 16 +++++++----- .../nxp/zap/thermostat_matter_thread.matter | 16 +++++++----- .../nxp/zap/thermostat_matter_wifi.matter | 16 +++++++----- .../qpg/zap/thermostaticRadiatorValve.matter | 16 +++++++----- .../thermostat-common/thermostat.matter | 16 +++++++----- .../water-heater-app.matter | 10 ++++--- examples/window-app/common/window-app.matter | 6 ++--- .../data_model/controller-clusters.matter | 10 ++++--- .../CHIP/zap-generated/MTRBaseClusters.h | 10 +++---- .../app-common/clusters/Thermostat/Metadata.h | 2 +- 60 files changed, 273 insertions(+), 233 deletions(-) diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter index c0a8626a373904..5b8273b8dca782 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter @@ -1784,7 +1784,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2199,7 +2199,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2207,11 +2207,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 778c1f340a0d72..3db6332d278358 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter index ffab3a6ab39e06..3406fbb0afa1b1 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; 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 index f6f913ba7690e6..cb1270e97ead47 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -4670,7 +4670,7 @@ cluster PumpConfigurationAndControl = 512 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -5085,7 +5085,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -5093,11 +5093,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter b/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter index 29b659ec0f781f..f02497baba6414 100644 --- a/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter +++ b/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter @@ -5624,7 +5624,7 @@ cluster PumpConfigurationAndControl = 512 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -6039,7 +6039,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -6047,11 +6047,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index c155e0fbf15441..35a6feae3bd19d 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -3973,7 +3973,7 @@ cluster PumpConfigurationAndControl = 512 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -4388,7 +4388,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -4396,11 +4396,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index 5f3630ab0a7f09..00982e3ebc93ff 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -1637,7 +1637,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2052,7 +2052,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2060,11 +2060,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter index e61cd30868bca4..c7f2d38c57055c 100644 --- a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter +++ b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter @@ -2194,7 +2194,7 @@ provisional cluster DeviceEnergyManagementMode = 159 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2609,7 +2609,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2617,11 +2617,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index 489cb005421e24..19c2ca5d88ea44 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -1579,7 +1579,7 @@ cluster GroupKeyManagement = 63 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -1994,7 +1994,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2002,11 +2002,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index d4874318de136d..34737d047f0420 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1732,7 +1732,7 @@ cluster GroupKeyManagement = 63 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2147,7 +2147,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2155,11 +2155,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/closure-app/closure-common/closure-app.matter b/examples/closure-app/closure-common/closure-app.matter index 91ae9f7aed349e..9308a16b6409cf 100644 --- a/examples/closure-app/closure-common/closure-app.matter +++ b/examples/closure-app/closure-common/closure-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/closure-app/silabs/data_model/closure-thread-app.matter b/examples/closure-app/silabs/data_model/closure-thread-app.matter index 174eb19ecb4304..d427974beaadec 100644 --- a/examples/closure-app/silabs/data_model/closure-thread-app.matter +++ b/examples/closure-app/silabs/data_model/closure-thread-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/closure-app/silabs/data_model/closure-wifi-app.matter b/examples/closure-app/silabs/data_model/closure-wifi-app.matter index cb350e6d1f2ed5..79263aa173a242 100644 --- a/examples/closure-app/silabs/data_model/closure-wifi-app.matter +++ b/examples/closure-app/silabs/data_model/closure-wifi-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 70ee990a98bb57..7c1963c659eb1d 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter index 8b85deb7d847c0..9289405a59ffbf 100644 --- a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter +++ b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter index 028f4cad0cefe0..3ae6a2d46e2df3 100644 --- a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter +++ b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter b/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter index 1926a30c957ffc..4b0ffb81ebc895 100644 --- a/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter +++ b/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter index cdce2fbf9b5f57..b8ed5deb83ea3b 100644 --- a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 1ac1ec1af9329c..5cb57321cf9fc2 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter index 1c9cdfe3f46612..c0c0b5eed77911 100644 --- a/examples/light-switch-app/qpg/zap/switch.matter +++ b/examples/light-switch-app/qpg/zap/switch.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter b/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter index 05a32b1fca399d..2da37ff686ed42 100644 --- a/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter +++ b/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter index 2e727ddb96c362..5a61f9839de977 100644 --- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter +++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter index 1db0fc377d525f..8d0a7e3538007c 100644 --- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter +++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter index d9110cc0c720e9..6c49f0df6a36c1 100644 --- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter +++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app.matter b/examples/light-switch-app/realtek/data_model/light-switch-app.matter index 442d6795bb3ece..1de66d156d37f7 100644 --- a/examples/light-switch-app/realtek/data_model/light-switch-app.matter +++ b/examples/light-switch-app/realtek/data_model/light-switch-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter index a0157b407c968c..b02f81841c6dbc 100644 --- a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter +++ b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index e41640f06ac251..3b1e27ba136a6a 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index c2a482b4fadcf7..a2c5b6ae0b4ef1 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index ee920e567db62d..ddd38fc7a8b9a8 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index e795f3702b6f14..1c82567bc16d35 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index 27dca079b2a61c..97255cb58f9640 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index 7d6258546a7ec6..87164f2d7519a2 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter index 7c99d80c12bb78..e78459a3ed8420 100644 --- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter +++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 0e8789306d6857..db32018dee9302 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 13a4bee1739677..1c37c47dfd88ea 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 511d5bdaee87ee..49bc301a738423 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/realtek/data_model/lock-app.matter b/examples/lock-app/realtek/data_model/lock-app.matter index 3a8c5bcc6ca94e..eb164d7bd928b0 100644 --- a/examples/lock-app/realtek/data_model/lock-app.matter +++ b/examples/lock-app/realtek/data_model/lock-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/silabs/data_model/lock-app.matter b/examples/lock-app/silabs/data_model/lock-app.matter index 5b8123a5f6ffb3..1f66ff40921f28 100644 --- a/examples/lock-app/silabs/data_model/lock-app.matter +++ b/examples/lock-app/silabs/data_model/lock-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter index 8f98ea61fa3308..0c0d1f04291c83 100644 --- a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter +++ b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.matter b/examples/network-manager-app/network-manager-common/network-manager-app.matter index d3d575edd23236..8e988ab8adf00c 100644 --- a/examples/network-manager-app/network-manager-common/network-manager-app.matter +++ b/examples/network-manager-app/network-manager-common/network-manager-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index bbbe1ea00c61da..c743ba9f15ba1f 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 523278acd08a77..df0a51901ef7d2 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -5126,7 +5126,7 @@ cluster PumpConfigurationAndControl = 512 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -5541,7 +5541,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -5549,11 +5549,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; @@ -5561,7 +5563,7 @@ cluster Thermostat = 513 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -5976,7 +5978,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -5984,11 +5986,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 48e0636885d19d..b22416637e23de 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -5126,7 +5126,7 @@ cluster PumpConfigurationAndControl = 512 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -5541,7 +5541,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -5549,11 +5549,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; @@ -5561,7 +5563,7 @@ cluster Thermostat = 513 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -5976,7 +5978,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -5984,11 +5986,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 89227369088041..dbe0c307ad2545 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter index 25175b4b97741f..79bcc2e445f052 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter index 1842d9aabdafbd..1635345f20e95a 100644 --- a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter +++ b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter index 9511cf2e1cfa29..ad212b6b5bbe38 100644 --- a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter +++ b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter index c9d79bc1f180ca..4adff8c7659cac 100644 --- a/examples/rvc-app/rvc-common/rvc-app.matter +++ b/examples/rvc-app/rvc-common/rvc-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index fad798a2b3c388..f0ca65b9bb9fa2 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.matter b/examples/thermostat/nxp/zap/thermostat_matter_br.matter index e631d410a30adb..43dd876588f8ab 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_br.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_br.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -1956,7 +1956,7 @@ cluster UserLabel = 65 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2371,7 +2371,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2379,11 +2379,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_eth.matter b/examples/thermostat/nxp/zap/thermostat_matter_eth.matter index 7247a17080dfa2..308eb4efd23094 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_eth.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_eth.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -1731,7 +1731,7 @@ cluster UserLabel = 65 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2146,7 +2146,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2154,11 +2154,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter index da3659be9b0e36..70238ec379b072 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -1880,7 +1880,7 @@ cluster UserLabel = 65 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2295,7 +2295,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2303,11 +2303,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter index bd4b41160a9bce..47117e1e0e0093 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -1789,7 +1789,7 @@ cluster UserLabel = 65 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2204,7 +2204,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2212,11 +2212,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter index a9fb1ec287cd96..f2ba6fefe0abae 100644 --- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter +++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -2235,7 +2235,7 @@ cluster IcdManagement = 70 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2650,7 +2650,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2658,11 +2658,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index b2b112ad88818d..c034018cbb49e8 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; @@ -2255,7 +2255,7 @@ cluster UserLabel = 65 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2670,7 +2670,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2678,11 +2678,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/water-heater-app/water-heater-common/water-heater-app.matter b/examples/water-heater-app/water-heater-common/water-heater-app.matter index 9e665d121b31ac..e8c795aa0ce723 100644 --- a/examples/water-heater-app/water-heater-common/water-heater-app.matter +++ b/examples/water-heater-app/water-heater-common/water-heater-app.matter @@ -2271,7 +2271,7 @@ provisional cluster DeviceEnergyManagementMode = 159 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -2686,7 +2686,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -2694,11 +2694,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index c0e9d64386fcfc..0485c9dd6d03b6 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - optional nullable TestGlobalEnum myEnum = 2; + nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - nullable int16u videoStreamID = 4; - nullable int16u audioStreamID = 5; + optional nullable int16u videoStreamID = 4; + optional nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 9def8f5249c25d..69a80a91f605b3 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -7128,7 +7128,7 @@ cluster PumpConfigurationAndControl = 512 { /** An interface for configuring and controlling the functionality of a thermostat. */ cluster Thermostat = 513 { - revision 9; + revision 11; enum ACCapacityFormatEnum : enum8 { kBTUh = 0; @@ -7543,7 +7543,7 @@ cluster Thermostat = 513 { optional int16u timeout = 2; } - /** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */ + /** This command will raise or lower the setpoint based on the provided values. */ command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0; /** This command is used to update the thermostat weekly setpoint schedule from a management system. */ command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1; @@ -7551,11 +7551,13 @@ cluster Thermostat = 513 { command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2; /** This command is used to clear the weekly schedule. */ command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3; - /** Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. */ + /** This command will set the active schedule to the provided schedule handle. */ command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5; - /** ID */ + /** This command will set the active preset to the provided preset handle. */ command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6; + /** This command will add a new suggestion based on the specified values. */ command access(invoke: manage) AddThermostatSuggestion(AddThermostatSuggestionRequest): AddThermostatSuggestionResponse = 7; + /** This command will remove the specified suggestion. */ command access(invoke: manage) RemoveThermostatSuggestion(RemoveThermostatSuggestionRequest): DefaultSuccess = 8; /** Begins, Commits or Cancels an atomic write */ command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index ddf8d5ce28a747..448662d93a1ba0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -9692,7 +9692,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) /** * Command SetpointRaiseLower * - * Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. + * This command will raise or lower the setpoint based on the provided values. */ - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); /** @@ -9718,25 +9718,25 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) /** * Command SetActiveScheduleRequest * - * Upon receipt, if the Schedules attribute contains a ScheduleStruct whose ScheduleHandle field matches the value of the ScheduleHandle field, the server SHALL set the thermostat's ActiveScheduleHandle attribute to the value of the ScheduleHandle field. + * This command will set the active schedule to the provided schedule handle. */ - (void)setActiveScheduleRequestWithParams:(MTRThermostatClusterSetActiveScheduleRequestParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4)); /** * Command SetActivePresetRequest * - * ID + * This command will set the active preset to the provided preset handle. */ - (void)setActivePresetRequestWithParams:(MTRThermostatClusterSetActivePresetRequestParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4)); /** * Command AddThermostatSuggestion * - * + * This command will add a new suggestion based on the specified values. */ - (void)addThermostatSuggestionWithParams:(MTRThermostatClusterAddThermostatSuggestionParams *)params completion:(void (^)(MTRThermostatClusterAddThermostatSuggestionResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; /** * Command RemoveThermostatSuggestion * - * + * This command will remove the specified suggestion. */ - (void)removeThermostatSuggestionWithParams:(MTRThermostatClusterRemoveThermostatSuggestionParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** diff --git a/zzz_generated/app-common/clusters/Thermostat/Metadata.h b/zzz_generated/app-common/clusters/Thermostat/Metadata.h index 62fde6c2e6975d..1726265147a9cb 100644 --- a/zzz_generated/app-common/clusters/Thermostat/Metadata.h +++ b/zzz_generated/app-common/clusters/Thermostat/Metadata.h @@ -17,7 +17,7 @@ namespace app { namespace Clusters { namespace Thermostat { -inline constexpr uint32_t kRevision = 9; +inline constexpr uint32_t kRevision = 11; namespace Attributes { From c284dcd24733ca9e4a9c44ec39011488faef890c Mon Sep 17 00:00:00 2001 From: Arya Hassanli Date: Wed, 25 Mar 2026 18:42:43 +0000 Subject: [PATCH 4/5] ZAP Regen --- .../air-quality-sensor-common/air-quality-sensor-app.matter | 6 +++--- .../icd-lit-air-quality-sensor-app.matter | 6 +++--- .../all-clusters-common/all-clusters-minimal-app.matter | 6 +++--- examples/closure-app/closure-common/closure-app.matter | 6 +++--- .../closure-app/silabs/data_model/closure-thread-app.matter | 6 +++--- .../closure-app/silabs/data_model/closure-wifi-app.matter | 6 +++--- .../dishwasher-app/dishwasher-common/dishwasher-app.matter | 6 +++--- .../silabs/data_model/dishwasher-thread-app.matter | 6 +++--- .../silabs/data_model/dishwasher-wifi-app.matter | 6 +++--- .../energy-gateway-common/energy-gateway-app.matter | 6 +++--- .../light-switch-common/icd-lit-light-switch-app.matter | 6 +++--- .../light-switch-common/light-switch-app.matter | 6 +++--- examples/light-switch-app/qpg/zap/switch.matter | 6 +++--- .../realtek/data_model/icd-lit-light-switch-app.matter | 6 +++--- .../realtek/data_model/light-switch-app-1_to_11.matter | 6 +++--- .../realtek/data_model/light-switch-app-1_to_2.matter | 6 +++--- .../realtek/data_model/light-switch-app-1_to_8.matter | 6 +++--- .../realtek/data_model/light-switch-app.matter | 6 +++--- .../lighting-common/lighting-app.matter | 6 +++--- .../bouffalolab/data_model/lighting-app-ethernet.matter | 6 +++--- .../bouffalolab/data_model/lighting-app-wifi.matter | 6 +++--- examples/lighting-app/lighting-common/lighting-app.matter | 6 +++--- examples/lighting-app/qpg/zap/light.matter | 6 +++--- .../silabs/data_model/lighting-thread-app.matter | 6 +++--- .../lighting-app/silabs/data_model/lighting-wifi-app.matter | 6 +++--- .../lit-icd-app/lit-icd-common/lit-icd-server-app.matter | 6 +++--- examples/lock-app/lock-common/lock-app.matter | 6 +++--- examples/lock-app/nxp/zap/lock-app.matter | 6 +++--- examples/lock-app/qpg/zap/lock.matter | 6 +++--- examples/lock-app/realtek/data_model/lock-app.matter | 6 +++--- examples/lock-app/silabs/data_model/lock-app.matter | 6 +++--- .../microwave-oven-common/microwave-oven-app.matter | 6 +++--- .../network-manager-common/network-manager-app.matter | 6 +++--- .../ota-provider-common/ota-provider-app.matter | 6 +++--- examples/placeholder/linux/apps/app1/config.matter | 6 +++--- examples/placeholder/linux/apps/app2/config.matter | 6 +++--- .../pump-controller-common/pump-controller-app.matter | 6 +++--- .../refrigerator-common/refrigerator-app.matter | 6 +++--- .../silabs/data_model/refrigerator-thread-app.matter | 6 +++--- .../silabs/data_model/refrigerator-wifi-app.matter | 6 +++--- examples/rvc-app/rvc-common/rvc-app.matter | 6 +++--- .../smoke-co-alarm-common/smoke-co-alarm-app.matter | 6 +++--- examples/thermostat/nxp/zap/thermostat_matter_br.matter | 6 +++--- examples/thermostat/nxp/zap/thermostat_matter_eth.matter | 6 +++--- examples/thermostat/nxp/zap/thermostat_matter_thread.matter | 6 +++--- examples/thermostat/nxp/zap/thermostat_matter_wifi.matter | 6 +++--- .../thermostat/qpg/zap/thermostaticRadiatorValve.matter | 6 +++--- examples/thermostat/thermostat-common/thermostat.matter | 6 +++--- examples/window-app/common/window-app.matter | 6 +++--- 49 files changed, 147 insertions(+), 147 deletions(-) diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 3db6332d278358..778c1f340a0d72 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter index 3406fbb0afa1b1..ffab3a6ab39e06 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 35a6feae3bd19d..7b4a6e64b3c20b 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/closure-app/closure-common/closure-app.matter b/examples/closure-app/closure-common/closure-app.matter index 9308a16b6409cf..91ae9f7aed349e 100644 --- a/examples/closure-app/closure-common/closure-app.matter +++ b/examples/closure-app/closure-common/closure-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/closure-app/silabs/data_model/closure-thread-app.matter b/examples/closure-app/silabs/data_model/closure-thread-app.matter index d427974beaadec..174eb19ecb4304 100644 --- a/examples/closure-app/silabs/data_model/closure-thread-app.matter +++ b/examples/closure-app/silabs/data_model/closure-thread-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/closure-app/silabs/data_model/closure-wifi-app.matter b/examples/closure-app/silabs/data_model/closure-wifi-app.matter index 79263aa173a242..cb350e6d1f2ed5 100644 --- a/examples/closure-app/silabs/data_model/closure-wifi-app.matter +++ b/examples/closure-app/silabs/data_model/closure-wifi-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 7c1963c659eb1d..70ee990a98bb57 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter index 9289405a59ffbf..8b85deb7d847c0 100644 --- a/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter +++ b/examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter index 3ae6a2d46e2df3..028f4cad0cefe0 100644 --- a/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter +++ b/examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter b/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter index 4b0ffb81ebc895..1926a30c957ffc 100644 --- a/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter +++ b/examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter index b8ed5deb83ea3b..cdce2fbf9b5f57 100644 --- a/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/icd-lit-light-switch-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 5cb57321cf9fc2..1ac1ec1af9329c 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter index c0c0b5eed77911..1c9cdfe3f46612 100644 --- a/examples/light-switch-app/qpg/zap/switch.matter +++ b/examples/light-switch-app/qpg/zap/switch.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter b/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter index 2da37ff686ed42..05a32b1fca399d 100644 --- a/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter +++ b/examples/light-switch-app/realtek/data_model/icd-lit-light-switch-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter index 5a61f9839de977..2e727ddb96c362 100644 --- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter +++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_11.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter index 8d0a7e3538007c..1db0fc377d525f 100644 --- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter +++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_2.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter index 6c49f0df6a36c1..d9110cc0c720e9 100644 --- a/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter +++ b/examples/light-switch-app/realtek/data_model/light-switch-app-1_to_8.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/light-switch-app/realtek/data_model/light-switch-app.matter b/examples/light-switch-app/realtek/data_model/light-switch-app.matter index 1de66d156d37f7..442d6795bb3ece 100644 --- a/examples/light-switch-app/realtek/data_model/light-switch-app.matter +++ b/examples/light-switch-app/realtek/data_model/light-switch-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter index b02f81841c6dbc..a0157b407c968c 100644 --- a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter +++ b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index 3b1e27ba136a6a..e41640f06ac251 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index a2c5b6ae0b4ef1..c2a482b4fadcf7 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index ddd38fc7a8b9a8..ee920e567db62d 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 1c82567bc16d35..e795f3702b6f14 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index 97255cb58f9640..27dca079b2a61c 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index 87164f2d7519a2..7d6258546a7ec6 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter index e78459a3ed8420..7c99d80c12bb78 100644 --- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter +++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index db32018dee9302..0e8789306d6857 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 1c37c47dfd88ea..13a4bee1739677 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 49bc301a738423..511d5bdaee87ee 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/realtek/data_model/lock-app.matter b/examples/lock-app/realtek/data_model/lock-app.matter index eb164d7bd928b0..3a8c5bcc6ca94e 100644 --- a/examples/lock-app/realtek/data_model/lock-app.matter +++ b/examples/lock-app/realtek/data_model/lock-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/lock-app/silabs/data_model/lock-app.matter b/examples/lock-app/silabs/data_model/lock-app.matter index 1f66ff40921f28..5b8123a5f6ffb3 100644 --- a/examples/lock-app/silabs/data_model/lock-app.matter +++ b/examples/lock-app/silabs/data_model/lock-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter index 0c0d1f04291c83..8f98ea61fa3308 100644 --- a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter +++ b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.matter b/examples/network-manager-app/network-manager-common/network-manager-app.matter index 8e988ab8adf00c..d3d575edd23236 100644 --- a/examples/network-manager-app/network-manager-common/network-manager-app.matter +++ b/examples/network-manager-app/network-manager-common/network-manager-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index c743ba9f15ba1f..bbbe1ea00c61da 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index df0a51901ef7d2..cd820b85582e39 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index b22416637e23de..8840e0bb40a5e0 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index dbe0c307ad2545..89227369088041 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter index 79bcc2e445f052..25175b4b97741f 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter index 1635345f20e95a..1842d9aabdafbd 100644 --- a/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter +++ b/examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter index ad212b6b5bbe38..9511cf2e1cfa29 100644 --- a/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter +++ b/examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter index 4adff8c7659cac..c9d79bc1f180ca 100644 --- a/examples/rvc-app/rvc-common/rvc-app.matter +++ b/examples/rvc-app/rvc-common/rvc-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index f0ca65b9bb9fa2..fad798a2b3c388 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.matter b/examples/thermostat/nxp/zap/thermostat_matter_br.matter index 43dd876588f8ab..4e2b07086f0b15 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_br.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_br.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_eth.matter b/examples/thermostat/nxp/zap/thermostat_matter_eth.matter index 308eb4efd23094..bf65c27bf67102 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_eth.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_eth.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter index 70238ec379b072..2f0af05df358e3 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter index 47117e1e0e0093..91198617ae7c2e 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter index f2ba6fefe0abae..be3ec43904e99f 100644 --- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter +++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index c034018cbb49e8..8eccd53992f5c1 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 0485c9dd6d03b6..c0e9d64386fcfc 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -341,7 +341,7 @@ struct SemanticTagStruct { struct TestGlobalStruct { char_string<128> name = 0; nullable TestGlobalBitmap myBitmap = 1; - nullable TestGlobalEnum myEnum = 2; + optional nullable TestGlobalEnum myEnum = 2; } struct ViewportStruct { @@ -356,8 +356,8 @@ fabric_scoped struct WebRTCSessionStruct { node_id peerNodeID = 1; endpoint_no peerEndpointID = 2; StreamUsageEnum streamUsage = 3; - optional nullable int16u videoStreamID = 4; - optional nullable int16u audioStreamID = 5; + nullable int16u videoStreamID = 4; + nullable int16u audioStreamID = 5; boolean metadataEnabled = 6; optional int16u videoStreams[] = 7; optional int16u audioStreams[] = 8; From bbce9997a3923d341d35a0f98b57a604612887b2 Mon Sep 17 00:00:00 2001 From: Arya Hassanli Date: Wed, 25 Mar 2026 19:49:50 +0000 Subject: [PATCH 5/5] Update missing constraints --- .../zcl/data-model/chip/thermostat-cluster.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml index a188aa545138f2..f8e19e66f6b3b9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -18,8 +18,8 @@ limitations under the License. XML generated by Alchemy; DO NOT EDIT. Source: src/app_clusters/Thermostat.adoc Parameters: zap attribute=ambient-context-sensor,ambientsensing,cameras,cameras-image-rotation,groupcast,hrap-pdc,hrap-tbrd,hvac-thermostat-events,hvac-thermostat-suggestions,improved-capabilities-tcr,partitioned-crl,security-sensor-events-tcr,tcr-smokeco-unmounted-state,temperature-alarm,thread-commissioning provisional-policy=loose force specRoot . sdkRoot ../connectedhomeip src/app_clusters/Thermostat.adoc -Git: 0.9-summer2026-169-gfa9f2b28e-dirty -Alchemy: v1.6.11-0.20260318195527-b0e1e99f8bcb+dirty +Git: 0.9-summer2026-170-ga5136a32a-dirty +Alchemy: v1.6.11-0.20260325181354-d72b10c394d5+dirty --> @@ -376,17 +376,17 @@ Alchemy: v1.6.11-0.20260318195527-b0e1e99f8bcb+dirty - + - + - + @@ -500,7 +500,7 @@ Alchemy: v1.6.11-0.20260318195527-b0e1e99f8bcb+dirty - +