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 693491520da45e..8ed04348a47f3c 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 @@ -1023,6 +1023,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; @@ -6225,7 +6229,7 @@ endpoint 0 { callback attribute acceptedCommandList; callback attribute eventList; callback attribute attributeList; - ram attribute featureMap default = 0; + ram attribute featureMap default = 1; ram attribute clusterRevision default = 1; } diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 50b75c2a03aad7..071729a8462b69 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -2552,7 +2552,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10502,7 +10502,7 @@ ] }, { - "id": 2, + "id": 4, "name": "MA-onofflight", "deviceTypeRef": { "id": 8, @@ -34887,7 +34887,7 @@ ] }, { - "id": 4, + "id": 2, "name": "Anonymous Endpoint Type", "deviceTypeRef": { "id": 53, 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 6133207d4ef7ba..d7c370d760f689 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 @@ -910,6 +910,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 8cf1d134b7be21..a29ae49e0dd910 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -648,6 +648,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 891f96176d527e..c8112e40f45c7a 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -692,6 +692,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index d50e27780e1de7..d8907397cc26ce 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -459,6 +459,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 38a729369ab873..dfdf48097d8871 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -542,6 +542,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 31c8ed8fadb13b..20bce9f69fbb11 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -692,6 +692,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter index 532db2feb0ecb2..5374c1f6f53af2 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter @@ -400,6 +400,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index ecb2f15691a1b2..54584bea85dfe8 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -542,6 +542,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 18b6b18ea00f3e..2b604b1359008d 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -692,6 +692,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 0d3b63c8e90a22..8b17e4eb415bf6 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -529,6 +529,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 67cd7c819ab8a4..fc2d8466dac9d4 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -548,6 +548,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index ca297f3e948261..2a19e48ae23c20 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -686,6 +686,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index f3c032b7c90efd..78a6e2871e3e20 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -548,6 +548,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter index cc1ed26f8d0e5d..691df7134838f0 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter @@ -381,6 +381,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 513b1f85bfd062..4284111ef34f11 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -548,6 +548,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 418acf12b07120..b4d210ca10357f 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -548,6 +548,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 140440c3a61cd9..6a14be6cc644ee 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -692,6 +692,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index e5acc9d6dad51d..631106d3a10183 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -656,6 +656,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 3819767f7a7042..ace5834e82bf55 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -591,6 +591,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 54961c08b6486d..afe7fc7aed327f 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -548,6 +548,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 2271e3dbc6864f..b10f2d6f123378 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -349,6 +349,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter index 094e9e9c342e08..f0584c5561216e 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter @@ -381,6 +381,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 03460d57e573e6..36ead72a1ec2ba 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -617,6 +617,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index d2f5ead381e993..f9519fee3c5b46 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -548,6 +548,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 93b04f141025b3..a68e13deb32468 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -542,6 +542,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 9f4e498ddf302b..20aedc8f59562a 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -542,6 +542,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index 8f908c719181c5..3a3d89a3d60f10 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -529,6 +529,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 532db2feb0ecb2..5374c1f6f53af2 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -400,6 +400,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; 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 9fb88932872ca7..0d39b5b65a8d18 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 @@ -843,6 +843,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index 12506acc1a2870..39d4d46e7ac9ef 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -700,6 +700,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; 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 940895935700e8..b94416839d359e 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -700,6 +700,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index d1a969ab0bd1c1..4f555829a35b64 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -847,6 +847,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; 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 998877c9fdd288..ffc7897209169d 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -868,6 +868,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; 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 7b0211cb212298..96ac3656f24f88 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -847,6 +847,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index c0b98e65560a01..9d9759848783f3 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -509,6 +509,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; 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 737506fc7254cf..8a57b436acf377 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 @@ -409,6 +409,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 50618909a052bb..b54cf5a38e8df7 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -592,6 +592,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 23eb1f659b99ad..be49149c26e9dd 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1012,6 +1012,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index c7bce14b611991..40f35329b7a5d2 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -995,6 +995,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index bfe7bb19434d2f..85a69adcb65dea 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -529,6 +529,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; 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 7425da173360f4..4ad4b30b4c9b89 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 @@ -529,6 +529,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index 72ebcefe90b4d9..e0e990bbe3e8da 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -265,6 +265,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 67be1476e76796..e48a17032a5491 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -596,6 +596,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 3d58227417d70a..2f5019a4fd0768 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -527,6 +527,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index cd0c6116e9f907..b789255710aacc 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -629,6 +629,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index b1bb51ea99e548..def5cf413ece03 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -656,6 +656,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index aa5eb9d83f4893..83a0cb11131a9f 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -529,6 +529,10 @@ server cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute CalendarTypeEnum activeCalendarType = 1; readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml index 323c486d9fbeaa..ee4468cde1d362 100644 --- a/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/time-format-localization-cluster.xml @@ -21,6 +21,12 @@ limitations under the License. + + + + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 1824759d5c876d..cea8a51bb4d640 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1148,6 +1148,10 @@ client cluster TimeFormatLocalization = 44 { k24hr = 1; } + bitmap Feature : BITMAP32 { + kCalendarFormat = 0x1; + } + attribute HourFormatEnum hourFormat = 0; attribute optional CalendarTypeEnum activeCalendarType = 1; readonly attribute optional CalendarTypeEnum supportedCalendarTypes[] = 2; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 0f7e1fb9fe7135..1ee10b3c5bdb19 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -5560,6 +5560,10 @@ class HourFormatEnum(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 2, + class Bitmaps: + class Feature(IntFlag): + kCalendarFormat = 0x1 + class Attributes: @dataclass class HourFormat(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index ca0ab33a448ede..f8b8aebc1350fd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -25519,6 +25519,10 @@ typedef NS_ENUM(uint8_t, MTRTimeFormatLocalizationHourFormat) { MTRTimeFormatLocalizationHourFormat24hr API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_OPTIONS(uint32_t, MTRTimeFormatLocalizationFeature) { + MTRTimeFormatLocalizationFeatureCalendarFormat MTR_NEWLY_AVAILABLE = 0x1, +} MTR_NEWLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTRUnitLocalizationTempUnit) { MTRUnitLocalizationTempUnitFahrenheit API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, MTRUnitLocalizationTempUnitCelsius API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 8bad422096320b..590330cb5f5bb2 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -545,6 +545,12 @@ enum class HourFormatEnum : uint8_t // enum value. This specific should never be transmitted. kUnknownEnumValue = 2, }; + +// Bitmap for Feature +enum class Feature : uint32_t +{ + kCalendarFormat = 0x1, +}; } // namespace TimeFormatLocalization namespace UnitLocalization {