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 f688bb36d8acc9..34921495d9ce60 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 @@ -1342,6 +1342,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1826,6 +1827,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { 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 352c979fdb45d0..d2d107a6d0251f 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 @@ -1198,6 +1198,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1622,6 +1623,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 42522020a4ac25..ed6bebe65f7cdc 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -737,6 +737,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1217,6 +1218,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 209fab4eed6f9f..3910f41ca44f08 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1098,6 +1098,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index d0c664d461632c..7c3c0d0b343ed7 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -701,6 +701,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index c8a31a267133bb..fdf5d21856f588 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -604,6 +604,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 34e861f1c403d0..3a582e6ce7b535 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -753,6 +753,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 84b311674b00da..12ba5af607a8ce 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -604,6 +604,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index bd6fb19f08d653..f9a1b107ce8e4d 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -753,6 +753,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 582bd4f96ce6e8..6fa0caf329267c 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -591,6 +591,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index d49c8e7f5e9563..460d55da2aa37e 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -675,6 +675,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index c7497fb1c97570..db039e035f22c0 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -747,6 +747,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index b88238c22b429f..0c63aca855bc6d 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -675,6 +675,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 4a7bfc0b5da180..a74117485bcad6 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -675,6 +675,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 4ed6d772f53b4f..e695f420245736 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -675,6 +675,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 6e0ec096b149cd..b3d69f8b5970be 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -753,6 +753,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index f4b22d6633e7b1..f2eb07ac053e42 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -716,6 +716,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 8f5974a3d71e54..3c714ddad253a3 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -652,6 +652,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index b38c45a2bd3477..2d2658b369bce5 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -675,6 +675,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 8903b51e06c287..7a6dcd907e19bb 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -435,6 +435,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 4f34fdd41dae6d..c6364c5620057a 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -747,6 +747,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index fbb9233d5d9a9f..a2b9c0e4a6ffcf 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -675,6 +675,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 1dc75f8abc6d55..9b8e69eff8027a 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -604,6 +604,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 3995f242f0931b..598e126e3d9bc4 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -604,6 +604,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { 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 18715acb6f5ec4..d95a6178c3ca81 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 @@ -591,6 +591,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1075,6 +1076,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 81ee27dfd43ef9..fe52398b9742b8 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -737,6 +737,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1217,6 +1218,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { 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 da4208b3f9b036..39f235fa9baec2 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 @@ -899,6 +899,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1383,6 +1384,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { 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 2dbd199b75aa36..978ee1cb75c185 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -761,6 +761,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { 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 0716b734e7f564..a10201a3ab9d8f 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -761,6 +761,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1081,6 +1082,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index be9db4405ba231..546856700ad1e3 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -761,6 +761,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1245,6 +1246,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 34bf74292995e6..99b7a2e7cfbc58 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -695,6 +695,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 40c423237c181a..d3a64c8e8c4030 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -705,6 +705,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { 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 2f59d01d4fcbdd..05ffb71a7a4f8e 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -761,6 +761,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { 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 73d2de73ab4308..7a8ff362609a89 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -761,6 +761,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1082,6 +1083,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 8c6c9a892e0cc0..8106b7ef775297 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -812,6 +812,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1296,6 +1297,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 2d99894bcf4d4f..16b6442cf56c08 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -318,6 +318,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index bf9b12ed538632..9c5ad39b77cb2f 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -539,6 +539,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index 101588c19c93f3..db613805340dbd 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -170,6 +170,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { 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 998567c2530fac..4f407e54227139 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 @@ -475,6 +475,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { 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 6f1a22ac175f81..b0737400c6cb9e 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 @@ -653,6 +653,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 2d73876882f721..a405132c38fc91 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1402,6 +1402,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -2013,6 +2014,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index f2b0b6e22083e4..e484bc74447b87 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1361,6 +1361,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1972,6 +1973,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 3bac4bf2a3e799..452de8a05b5fac 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -629,6 +629,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { 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 a28e9bb575af0b..b25fd06a2c89e4 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 @@ -554,6 +554,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { 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 ebe168fb236915..46f65cfdc10cd0 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -355,6 +355,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -665,6 +666,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 2338de0db03649..0a1ee06c30cacb 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -799,6 +799,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1281,6 +1282,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index c86d83ad658a8d..fba612d8ff17ac 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -683,6 +683,7 @@ client cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -828,6 +829,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1308,6 +1310,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { 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 ce145138afd91b..8ca6fe9a2476ac 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 @@ -702,6 +702,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -984,6 +985,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 95241b99403f68..aa553cd04da146 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -965,6 +965,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1412,6 +1413,7 @@ server cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml index 7ea62f31ddac2d..04e5a77c0ec9d0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml @@ -39,6 +39,7 @@ limitations under the License. + diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml index c66640ff224a1c..3c81539c55aef5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml @@ -32,7 +32,8 @@ limitations under the License. - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index d5be767865f9ab..a18c9d16d2f4bc 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1497,6 +1497,7 @@ client cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1998,6 +1999,7 @@ client cluster WiFiNetworkDiagnostics = 54 { kN = 3; kAc = 4; kAx = 5; + kAh = 6; } bitmap Feature : BITMAP32 { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index be3f932adda39d..fa63fb454cab35 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -7346,11 +7346,12 @@ class WiFiBand(MatterIntEnum): k5g = 0x02 k6g = 0x03 k60g = 0x04 + k1g = 0x05 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving and unknown # enum value. This specific should never be transmitted. - kUnknownEnumValue = 5, + kUnknownEnumValue = 6, class Bitmaps: class Feature(IntFlag): @@ -10313,11 +10314,12 @@ class WiFiVersionEnum(MatterIntEnum): kN = 0x03 kAc = 0x04 kAx = 0x05 + kAh = 0x06 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving and unknown # enum value. This specific should never be transmitted. - kUnknownEnumValue = 6, + kUnknownEnumValue = 7, class Bitmaps: class Feature(IntFlag): diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index b879c185b19170..1c1004950d358d 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -7580,6 +7580,9 @@ - Rugged - Fabric - Other + NetworkCommissioning: + WiFiBand: + - 1G HEPAFilterMonitoring: ChangeIndicationEnum: - OK @@ -7713,6 +7716,9 @@ - High - Standard - Low + WiFiNetworkDiagnostics: + WiFiVersionEnum: + - Ah bitmaps: AirQuality: - Feature diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 970387513955ed..7d796c812bd366 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -22717,6 +22717,7 @@ typedef NS_ENUM(uint8_t, MTRNetworkCommissioningWiFiBand) { MTRNetworkCommissioningWiFiBand5G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, MTRNetworkCommissioningWiFiBand6G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, MTRNetworkCommissioningWiFiBand60G API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04, + MTRNetworkCommissioningWiFiBand1G MTR_NEWLY_AVAILABLE = 0x05, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_OPTIONS(uint32_t, MTRNetworkCommissioningFeature) { @@ -23059,6 +23060,7 @@ typedef NS_ENUM(uint8_t, MTRWiFiNetworkDiagnosticsWiFiVersion) { MTRWiFiNetworkDiagnosticsWiFiVersionN API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x03, MTRWiFiNetworkDiagnosticsWiFiVersionAc API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x04, MTRWiFiNetworkDiagnosticsWiFiVersionAx API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x05, + MTRWiFiNetworkDiagnosticsWiFiVersionAh MTR_NEWLY_AVAILABLE = 0x06, } API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)); typedef NS_ENUM(uint8_t, MTRWiFiNetworkDiagnosticsWiFiVersionType) { diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp index aba40e3b116528..1cb9cd1d85166c 100644 --- a/src/platform/Linux/ConnectivityManagerImpl.cpp +++ b/src/platform/Linux/ConnectivityManagerImpl.cpp @@ -1409,7 +1409,27 @@ namespace { std::pair GetBandAndChannelFromFrequency(uint32_t freq) { std::pair ret = std::make_pair(WiFiBand::k2g4, 0); - if (freq <= 2472) + if (freq <= 931) + { + ret.first = WiFiBand::k1g; + if (freq >= 916) + { + ret.second = ((freq - 916) * 2) - 1; + } + else if (freq >= 902) + { + ret.second = (freq - 902) * 2; + } + else if (freq >= 863) + { + ret.second = (freq - 863) * 2; + } + else + { + ret.second = 1; + } + } + else if (freq <= 2472) { ret.second = static_cast((freq - 2412) / 5 + 1); } diff --git a/src/platform/webos/ConnectivityManagerImpl.cpp b/src/platform/webos/ConnectivityManagerImpl.cpp index 358b8848c9a47c..b9275ef482f8f6 100644 --- a/src/platform/webos/ConnectivityManagerImpl.cpp +++ b/src/platform/webos/ConnectivityManagerImpl.cpp @@ -1327,7 +1327,27 @@ namespace { std::pair GetBandAndChannelFromFrequency(uint32_t freq) { std::pair ret = std::make_pair(WiFiBand::k2g4, 0); - if (freq <= 2472) + if (freq <= 931) + { + ret.first = WiFiBand::k1g; + if (freq >= 916) + { + ret.second = ((freq - 916) * 2) - 1; + } + else if (freq >= 902) + { + ret.second = (freq - 902) * 2; + } + else if (freq >= 863) + { + ret.second = (freq - 863) * 2; + } + else + { + ret.second = 1; + } + } + else if (freq <= 2472) { ret.second = static_cast((freq - 2412) / 5 + 1); } diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 35bd49ff4d26f0..3be3512246790e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -782,9 +782,10 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(NetworkCommissioning::W case EnumType::k5g: case EnumType::k6g: case EnumType::k60g: + case EnumType::k1g: return val; default: - return static_cast(5); + return static_cast(6); } } @@ -1054,9 +1055,10 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(WiFiNetworkDiagnostics: case EnumType::kN: case EnumType::kAc: case EnumType::kAx: + case EnumType::kAh: return val; default: - return static_cast(6); + return static_cast(7); } } 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 6a6a3c7aad61e8..c68d35bcd3827d 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 @@ -901,11 +901,12 @@ enum class WiFiBand : uint8_t k5g = 0x02, k6g = 0x03, k60g = 0x04, + k1g = 0x05, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown // enum value. This specific should never be transmitted. - kUnknownEnumValue = 5, + kUnknownEnumValue = 6, }; // Bitmap for Feature @@ -1202,11 +1203,12 @@ enum class WiFiVersionEnum : uint8_t kN = 0x03, kAc = 0x04, kAx = 0x05, + kAh = 0x06, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown // enum value. This specific should never be transmitted. - kUnknownEnumValue = 6, + kUnknownEnumValue = 7, }; // Bitmap for Feature