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 28c7c6bfe612b0..4d25f93d11f4d4 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 @@ -1346,6 +1346,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1830,6 +1831,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 ec85f9ba50f1c9..7570f498ab177a 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 @@ -1202,6 +1202,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1626,6 +1627,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 bf661389826ff0..ec26c6d289f836 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1102,6 +1102,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 97f16304cbedfd..4c0cf67d49861e 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -705,6 +705,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 4af451a0b8564d..4e8886b0e945cc 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -608,6 +608,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 23575943f6c82d..050111d48e9347 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -757,6 +757,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 cf232ce706a4fd..30c65abc414fc6 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -608,6 +608,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 e8adc8e5d70fdf..4f557933a3e284 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -757,6 +757,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 7423ec65391a67..b32ad8e492896a 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -595,6 +595,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 728c4bc51e9cf5..b8d2ee4fc454eb 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -683,6 +683,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 193bb16d730f1b..faf4f582fc2585 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -751,6 +751,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 c720ca9af5c511..5ddb1843d34113 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -683,6 +683,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 861d88299aff90..b4ef5d3bcb7fa6 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -683,6 +683,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 c43f30d1ffdad4..3e0244a0d80d73 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -683,6 +683,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 683f23dd063d59..d1e2a0497c9502 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -757,6 +757,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 2b143d210a229a..534be03fc13ba4 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -720,6 +720,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 785b9e3d931339..5313ccd0c651c1 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -656,6 +656,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 240047172a7e40..c74e00682b9e17 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -683,6 +683,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 da85cbcca91d0a..a854dc73e79ded 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -751,6 +751,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 5d587cc4128f9f..3f1ab70c806713 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -683,6 +683,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 00b7d4203f2b78..3c40b497258e03 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -608,6 +608,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 26dee3a73a83a8..504db5ebf7a234 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -608,6 +608,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 067a966cb096b3..0b2f62333f6861 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 @@ -595,6 +595,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1079,6 +1080,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 da528ec6203495..c7ce01828f8ce4 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 @@ -903,6 +903,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1387,6 +1388,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 c48e52dd570bfd..b859292889aed1 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -765,6 +765,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 8db786bd654448..ad6be5d5c92b1d 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -765,6 +765,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1085,6 +1086,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 211775292829c5..69852e768f7717 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -765,6 +765,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1249,6 +1250,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 8bfb1e9cfbec32..5b6589c1912c37 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -699,6 +699,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 21aa2b6457b038..f6ea5f41581d15 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -709,6 +709,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 1802f7efe9eeb7..474528bb9c6120 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -765,6 +765,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 ad57778da5dc24..1034b31939d8ae 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -765,6 +765,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1086,6 +1087,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 ca32fe4443b50e..ba31725d568299 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -543,6 +543,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 9d34f9f22eee28..c5cd44ecc88f36 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 @@ -657,6 +657,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 d797865cabaec7..314ffe37b3b9fb 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1406,6 +1406,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -2017,6 +2018,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 8d4aa73840f60d..f4482dda91563f 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1365,6 +1365,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1976,6 +1977,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 1ce6b162502c32..d41bcfa773637d 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -803,6 +803,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1285,6 +1286,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 bd038c366225c8..f7fca99f362288 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 @@ -706,6 +706,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -988,6 +989,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 eb503fb83f2bfa..ce1cc426719bff 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -969,6 +969,7 @@ server cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -1416,6 +1417,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 4c9ae4e6d9b4bf..b6af9b17ca30b8 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1501,6 +1501,7 @@ client cluster NetworkCommissioning = 49 { k5g = 2; k6g = 3; k60g = 4; + k1g = 5; } bitmap Feature : BITMAP32 { @@ -2002,6 +2003,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 4f5dcb2309bdc5..940476388c458c 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -7349,11 +7349,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): @@ -10316,11 +10317,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 41be2ce7647488..10663dbac8e7d0 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 0d40aee8f33289..0172a4103f3922 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -22721,6 +22721,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) { @@ -23063,6 +23064,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 5dfcb41e997c79..bd4ebed53d4da0 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 @@ -907,11 +907,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 @@ -1208,11 +1209,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