diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt index 63dff3ee1f5589..74b79dffc93466 100644 --- a/config/esp32/components/chip/CMakeLists.txt +++ b/config/esp32/components/chip/CMakeLists.txt @@ -31,7 +31,11 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/ota-image.cmake) -set(CHIP_REQURIE_COMPONENTS freertos lwip bt mdns mbedtls fatfs app_update console openthread) +set(CHIP_REQURIE_COMPONENTS freertos lwip bt mbedtls fatfs app_update console openthread nvs_flash) + +if(NOT "${IDF_TARGET}" STREQUAL "esp32h2") + list(APPEND CHIP_REQURIE_COMPONENTS mdns) +endif() if (NOT CMAKE_BUILD_EARLY_EXPANSION) if (CONFIG_COMPILER_OPTIMIZATION_DEFAULT OR CONFIG_COMPILER_OPTIMIZATION_NONE) @@ -270,7 +274,9 @@ if(CONFIG_BT_ENABLED) idf_component_get_property(bt_lib bt COMPONENT_LIB) idf_component_get_property(bt_dir bt COMPONENT_DIR) list(APPEND chip_libraries $) - list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32h2/esp32h2-bt-lib/libcontroller_5p0_seq.a) + if(CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2) + list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32h2/esp32h2-bt-lib/beta2/libble_app.a) + endif() else() idf_component_get_property(bt_lib bt COMPONENT_LIB) list(APPEND chip_libraries $ -lbtdm_app) @@ -287,7 +293,7 @@ if(CONFIG_OPENTHREAD_ENABLED) list(APPEND chip_libraries $) endif() -if(NOT CONFIG_USE_MINIMAL_MDNS) +if(NOT CONFIG_USE_MINIMAL_MDNS AND NOT CONFIG_IDF_TARGET_ESP32H2) idf_component_get_property(mdns_lib mdns COMPONENT_LIB) list(APPEND chip_libraries $) endif() diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig index 4a6cc6dd6e889e..55cafa1c8a07a8 100644 --- a/config/esp32/components/chip/Kconfig +++ b/config/esp32/components/chip/Kconfig @@ -387,6 +387,7 @@ menu "CHIP Device Layer" menu "WiFi AP Options" config ENABLE_WIFI_AP + depends on ESP_WIFI_SOFTAP_SUPPORT bool "Enable CHIP WIFI AP" default y help diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults index 228ba22eac7117..c4ee871459c8f8 100644 --- a/config/nrfconnect/chip-module/Kconfig.defaults +++ b/config/nrfconnect/chip-module/Kconfig.defaults @@ -194,6 +194,10 @@ config NVS_LOOKUP_CACHE bool default y +config NVS_LOOKUP_CACHE_SIZE + int + default 512 + # Increase the default RX stack size config IEEE802154_NRF5_RX_STACK_SIZE int diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der new file mode 100644 index 00000000000000..7803a7190a2d31 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der new file mode 100644 index 00000000000000..38a4e6ac1e53b7 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem new file mode 100644 index 00000000000000..81e05f0a7f029d --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBzjCCAXSgAwIBAgIIRthLwKhF8DUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP +TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0zMTA2Mjgx +NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg +REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw +WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATqOifKLkmYJMB3RLsY7IRXtFKPfcdE +6aIAwpRdhWsVsjO0l8J3LJwC1yHWWUBAFEyQK9Mr2M8AOJKqNiDHvvo6o2AwXjAM +BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUkFx9n9t7p+Hj +TWGViPrG1yH7jREwHwYDVR0jBBgwFoAUMOBrRRehYWxjDv0z4ClLqmWiL64wCgYI +KoZIzj0EAwIDSAAwRQIhAN5899Vst9WNbORgsCmpDWcB32Yvsz6stXooq/8tfNZ5 +AiBjKEAWFaNY3KmhdEMBIBokli8UDrCsQ0B4uA7op/Hjbw== +-----END CERTIFICATE----- diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der new file mode 100644 index 00000000000000..17db5fcf7757de Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem new file mode 100644 index 00000000000000..61bcbe41a42d73 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIFwY1xVBoky9uLjKW+QNOFIRDP5z1yGpGonkq9T/8JcnoAoGCCqGSM49 +AwEHoUQDQgAE6jonyi5JmCTAd0S7GOyEV7RSj33HROmiAMKUXYVrFbIztJfCdyyc +Atch1llAQBRMkCvTK9jPADiSqjYgx776Og== +-----END EC PRIVATE KEY----- diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der new file mode 100644 index 00000000000000..d611b41f376eea Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem new file mode 100644 index 00000000000000..1af94cdddc32ae --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBvjCCAWSgAwIBAgIITbjYRrllfyUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP +TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw +MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg +UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH +A0IABFt/2QNW0x1opUKEqw1AlNuLVdglb1gped3kne4o2Lcj+QGlNJJT92lfHLqJ +8nNc4csQzdoM9ef39fyvRiEfjlejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQw4GtFF6FhbGMO/TPgKUuqZaIvrjAfBgNV +HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA +/9qgBvao0V6PIB6kxmgu80bOuv9Ze/E7ZmNw7/QqBbcCIENSTTJGdmRvXCubWSDo +0kqhXWOQzUIK+tyiGojpm7GV +-----END CERTIFICATE----- diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der new file mode 100644 index 00000000000000..9982c9c6df9119 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem new file mode 100644 index 00000000000000..e86524bcec9776 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIBfWWCzdV+7JxSvXlCxsJP+qtVS0S4eKwQOMpOHO3kcjoAoGCCqGSM49 +AwEHoUQDQgAEW3/ZA1bTHWilQoSrDUCU24tV2CVvWCl53eSd7ijYtyP5AaU0klP3 +aV8cuonyc1zhyxDN2gz15/f1/K9GIR+OVw== +-----END EC PRIVATE KEY----- diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json new file mode 100644 index 00000000000000..64815d0e9a55d4 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json @@ -0,0 +1,9 @@ +{ + "description": "DAC Test Vector: Certificate validity period starts in the future", + "is_success_case": "false", + "dac_cert": "308201ce30820174a003020102020846d84bc0a845f035300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3331303632383134323334335a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ea3a27ca2e499824c07744bb18ec8457b4528f7dc744e9a200c2945d856b15b233b497c2772c9c02d721d6594040144c902bd32bd8cf003892aa3620c7befa3aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414905c7d9fdb7ba7e1e34d619588fac6d721fb8d11301f0603551d2304183016801430e06b4517a1616c630efd33e0294baa65a22fae300a06082a8648ce3d0403020348003045022100de7cf7d56cb7d58d6ce460b029a90d6701df662fb33eacb57a28abff2d7cd67902206328401615a358dca9a1744301201a24962f140eb0ac434078b80ee8a7f1e36f", + "pai_cert": "308201be30820164a00302010202084db8d846b9657f25300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200045b7fd90356d31d68a54284ab0d4094db8b55d8256f582979dde49dee28d8b723f901a5349253f7695f1cba89f2735ce1cb10cdda0cf5e7f7f5fcaf46211f8e57a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041430e06b4517a1616c630efd33e0294baa65a22fae301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ffdaa006f6a8d15e8f201ea4c6682ef346cebaff597bf13b666370eff42a05b7022043524d324676646f5c2b9b5920e8d24aa15d6390cd420afadca21a88e99bb195", + "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100922cd7b5dadac018efcb7529ec7b464014aa65955f9f6bedb274b2be5850538602204d75b379859d1b6b666bd5f9990b2cdde952bdc06fbfc15fbe297bdd1455b79e", + "dac_private_key": "5c18d71541a24cbdb8b8ca5be40d3852110cfe73d721a91a89e4abd4fff09727", + "dac_public_key": "04ea3a27ca2e499824c07744bb18ec8457b4528f7dc744e9a200c2945d856b15b233b497c2772c9c02d721d6594040144c902bd32bd8cf003892aa3620c7befa3a" +} diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der new file mode 100644 index 00000000000000..c6cc9f9ba51595 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der new file mode 100644 index 00000000000000..9f942cf5eb3d06 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem new file mode 100644 index 00000000000000..ab8fdec3ca9cd0 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBzjCCAXSgAwIBAgIINGjVPWtZ1dYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP +TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMTA2Mjgx +NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg +REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw +WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQU15UFVuguhvGdZobRrZZ+grBniEij +oXF/euUu3fEEXljwpK82trkZcEJW3yQWi7DKhsYE7jK4CtteksBDINM1o2AwXjAM +BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUS76dzjsCK9Ol +psqaCfLu7DxTgdgwHwYDVR0jBBgwFoAUAuubPzDHJ6jhlR4ZY2jOcqc4JTMwCgYI +KoZIzj0EAwIDSAAwRQIhALVkejOXN6HUWz56eRNB7S0OatCqXpQpY8kFd3x3AZDL +AiBjH9hxvmJGeXKA34/tm2UQgAPX97huZjUyAg0qVNhIhA== +-----END CERTIFICATE----- diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der new file mode 100644 index 00000000000000..3ee6da7d9f48dc Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem new file mode 100644 index 00000000000000..4024c4b5f0b799 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIFBUJNBC3tXdgaQ3v+GHxqTUa/38r940UzrRSJrsMLeioAoGCCqGSM49 +AwEHoUQDQgAEFNeVBVboLobxnWaG0a2WfoKwZ4hIo6Fxf3rlLt3xBF5Y8KSvNra5 +GXBCVt8kFouwyobGBO4yuArbXpLAQyDTNQ== +-----END EC PRIVATE KEY----- diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der new file mode 100644 index 00000000000000..dea87a5d2a7ac5 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem new file mode 100644 index 00000000000000..fc9dd322359eac --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBvjCCAWSgAwIBAgIIM6/3FLb2b08wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP +TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw +MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg +UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH +A0IABEjDRNICkoYIMqcl90afYvst0TYH/M0Z7/ig2xbedw+4MOBgCa6ItEJNZHHM +5pNNQ7lYtUb5PY2bmHJ/wbg+Q52jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQC65s/MMcnqOGVHhljaM5ypzglMzAfBgNV +HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBx +RqKMoAyIbzXnqAdBxcti2pAdHFCHj57eBrrUWk6PHAIhALCUlEh51jUwIkXQHtDZ +Lk1FbenZA7UrrdU6DV+3nMD1 +-----END CERTIFICATE----- diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der new file mode 100644 index 00000000000000..89aa7d89dd4145 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der differ diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem new file mode 100644 index 00000000000000..7ea4f341a47b88 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIJQ7UBEg4WpJ+nqKylXLvvSfr/WvdGG2kFiSYVp0QmHooAoGCCqGSM49 +AwEHoUQDQgAESMNE0gKShggypyX3Rp9i+y3RNgf8zRnv+KDbFt53D7gw4GAJroi0 +Qk1kcczmk01DuVi1Rvk9jZuYcn/BuD5DnQ== +-----END EC PRIVATE KEY----- diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json new file mode 100644 index 00000000000000..c6a599820ad504 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json @@ -0,0 +1,9 @@ +{ + "description": "DAC Test Vector: Certificate validity period starts in the past", + "is_success_case": "false", + "dac_cert": "308201ce30820174a00302010202083468d53d6b59d5d6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3231303632383134323334335a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000414d7950556e82e86f19d6686d1ad967e82b0678848a3a1717f7ae52eddf1045e58f0a4af36b6b919704256df24168bb0ca86c604ee32b80adb5e92c04320d335a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144bbe9dce3b022bd3a5a6ca9a09f2eeec3c5381d8301f0603551d2304183016801402eb9b3f30c727a8e1951e196368ce72a7382533300a06082a8648ce3d0403020348003045022100b5647a339737a1d45b3e7a791341ed2d0e6ad0aa5e942963c905777c770190cb0220631fd871be6246797280df8fed9b65108003d7f7b86e663532020d2a54d84884", + "pai_cert": "308201be30820164a003020102020833aff714b6f66f4f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000448c344d20292860832a725f7469f62fb2dd13607fccd19eff8a0db16de770fb830e06009ae88b4424d6471cce6934d43b958b546f93d8d9b98727fc1b83e439da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041402eb9b3f30c727a8e1951e196368ce72a7382533301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207146a28ca00c886f35e7a80741c5cb62da901d1c50878f9ede06bad45a4e8f1c022100b094944879d635302245d01ed0d92e4d456de9d903b52badd53a0d5fb79cc0f5", + "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cb29c572c7b6866da5d38c8dae26156660435978b51e16ca25a249426078f97e022100e083d7c69f32d8f18c1ad5f09dab0e7f12d59f16921040375c20e6455741aa7c", + "dac_private_key": "505424d042ded5dd81a437bfe187c6a4d46bfdfcafde34533ad1489aec30b7a2", + "dac_public_key": "0414d7950556e82e86f19d6686d1ad967e82b0678848a3a1717f7ae52eddf1045e58f0a4af36b6b919704256df24168bb0ca86c604ee32b80adb5e92c04320d335" +} diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der new file mode 100644 index 00000000000000..f6e033a3c9c8ea Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der new file mode 100644 index 00000000000000..daae9bc57d9c28 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem new file mode 100644 index 00000000000000..5374feea9d99aa --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBzjCCAXSgAwIBAgIINUXeObnulDYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP +TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw +MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg +REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw +WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARC2bKsgzrrD4NfrMC/cy1NR64fLDkn +AbGgAZ04c3j8kTM5JpNzJizLCoIfQEsrvzT/cKM05WrCUD1tpvSRT2Gjo2AwXjAM +BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUBXTgpJcmW04c +ADb7T2869dJ0BogwHwYDVR0jBBgwFoAUVgxxvkgr/bx4gspWRGmZNkP/PJUwCgYI +KoZIzj0EAwIDSAAwRQIgG8SmsG70/+AmfLac3pJCeWTj9HOQKi2HzAmACQK6JyoC +IQCnCKT688LV0mmSpZLid0KYl192il4v74IW89HL7qLZ9Q== +-----END CERTIFICATE----- diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der new file mode 100644 index 00000000000000..ea4dcf248ed022 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem new file mode 100644 index 00000000000000..103036b3452d36 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEID3cVEubgyJnOckFJtVwy9jdAMjrzK59SeK8Z5QW0n6voAoGCCqGSM49 +AwEHoUQDQgAEQtmyrIM66w+DX6zAv3MtTUeuHyw5JwGxoAGdOHN4/JEzOSaTcyYs +ywqCH0BLK780/3CjNOVqwlA9bab0kU9how== +-----END EC PRIVATE KEY----- diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der new file mode 100644 index 00000000000000..b0a95223737df6 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem new file mode 100644 index 00000000000000..8a9d68b91280ab --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBvzCCAWSgAwIBAgIIIAWHpDSRw+wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP +TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0zMTA2Mjgx +NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg +UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH +A0IABCblK8SbyesXS0P8r+hJyv7+8wLEDQUFn919zJaKZLtN3wMPJhvfoK/ixGjx +hYxs+KXP1y9342aJV6ZsZYaFh9WjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRWDHG+SCv9vHiCylZEaZk2Q/88lTAfBgNV +HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA +kqG/Pfim+54OYW7ODwhPSs5xlnlPFXV1xtruaq8qkMMCIQDR0tRNp4I/+ohgyok0 +mKqVzIu87Wo8AwXgoHki1LR9Cg== +-----END CERTIFICATE----- diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der new file mode 100644 index 00000000000000..63ff4e13760dcc Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem new file mode 100644 index 00000000000000..a96a6024cd14a7 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIH7wht0SaCGVV+tkUGcCoTWe79NzAYQIK1NVUase0QG2oAoGCCqGSM49 +AwEHoUQDQgAEJuUrxJvJ6xdLQ/yv6EnK/v7zAsQNBQWf3X3Mlopku03fAw8mG9+g +r+LEaPGFjGz4pc/XL3fjZolXpmxlhoWH1Q== +-----END EC PRIVATE KEY----- diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json new file mode 100644 index 00000000000000..5115b95a9ff111 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json @@ -0,0 +1,9 @@ +{ + "description": "PAI Test Vector: Certificate validity period starts in the future", + "is_success_case": "false", + "dac_cert": "308201ce30820174a00302010202083545de39b9ee9436300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000442d9b2ac833aeb0f835facc0bf732d4d47ae1f2c392701b1a0019d387378fc913339269373262ccb0a821f404b2bbf34ff70a334e56ac2503d6da6f4914f61a3a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140574e0a497265b4e1c0036fb4f6f3af5d2740688301f0603551d23041830168014560c71be482bfdbc7882ca564469993643ff3c95300a06082a8648ce3d040302034800304502201bc4a6b06ef4ffe0267cb69cde92427964e3f473902a2d87cc09800902ba272a022100a708a4faf3c2d5d26992a592e2774298975f768a5e2fef8216f3d1cbeea2d9f5", + "pai_cert": "308201bf30820164a0030201020208200587a43491c3ec300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3331303632383134323334335a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000426e52bc49bc9eb174b43fcafe849cafefef302c40d05059fdd7dcc968a64bb4ddf030f261bdfa0afe2c468f1858c6cf8a5cfd72f77e3668957a66c65868587d5a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414560c71be482bfdbc7882ca564469993643ff3c95301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210092a1bf3df8a6fb9e0e616ece0f084f4ace7196794f157575c6daee6aaf2a90c3022100d1d2d44da7823ffa8860ca893498aa95cc8bbced6a3c0305e0a07922d4b47d0a", + "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022040c1ccd18748a33c8a1a4085c1860f5578c91a926f3ff6f7fddf7d9c8d7226d1022051cedb3515d9130927802192e75a1fa212b960401674b443ee9e9bab4bbe6a87", + "dac_private_key": "3ddc544b9b83226739c90526d570cbd8dd00c8ebccae7d49e2bc679416d27eaf", + "dac_public_key": "0442d9b2ac833aeb0f835facc0bf732d4d47ae1f2c392701b1a0019d387378fc913339269373262ccb0a821f404b2bbf34ff70a334e56ac2503d6da6f4914f61a3" +} diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der new file mode 100644 index 00000000000000..cb6555be037cc5 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der new file mode 100644 index 00000000000000..c178c6aee01b92 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem new file mode 100644 index 00000000000000..9861fbe051d653 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBzTCCAXSgAwIBAgIIAzh3GKRPeSIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP +TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw +MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg +REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw +WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASGNhiEzu1Nm2NPYt0qHFiDitHMuQXM +NW8Tqb4BSqBefVoSdB7pMMPKsFiltjkkst0GPOVYfnVCDc8T1rHLYhjRo2AwXjAM +BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU5j2AINpYLELe +iWoKio8yNPwar/QwHwYDVR0jBBgwFoAUnlDkAxmNkJ5WoKbiieGY5914qrYwCgYI +KoZIzj0EAwIDRwAwRAIgDqpLJJdwnIWrj/7GeYsovkrrkd1J1nDrscBp7nGsnKgC +IDbq6Z0hqWMkXPGfvLq4yB/3ImWNOytbsDOF9+YoUT9y +-----END CERTIFICATE----- diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der new file mode 100644 index 00000000000000..384108f7d00186 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem new file mode 100644 index 00000000000000..cb0dddc49c22fc --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIOkpVGVymlFSxwTrHLW9jPJEdNDVRCk7OeI7OgHMsaC4oAoGCCqGSM49 +AwEHoUQDQgAEhjYYhM7tTZtjT2LdKhxYg4rRzLkFzDVvE6m+AUqgXn1aEnQe6TDD +yrBYpbY5JLLdBjzlWH51Qg3PE9axy2IY0Q== +-----END EC PRIVATE KEY----- diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der new file mode 100644 index 00000000000000..5b9d48a00c0798 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem new file mode 100644 index 00000000000000..89a646b39013c3 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBvTCCAWSgAwIBAgIIWxl2V64Pys8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP +TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMTA2Mjgx +NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg +UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH +A0IABLE8m7IlP/47B8ve/nBbLuI89Q8Sh54oENkAN+J+4hOkZ/Aq50Uh8/aOK6Zu +WF8PMrd5z474vPlsT0cXVTgUpK6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD +VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSeUOQDGY2QnlagpuKJ4Zjn3XiqtjAfBgNV +HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAY +S1vVbraCM62P6PczOuGdZVgKdv4IOP6RfU+T7lpcCgIgfRuTnP2JVuD/JQApmy2p +F7ZAgXXl/jv4hWjTO59L/Tg= +-----END CERTIFICATE----- diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der new file mode 100644 index 00000000000000..b08d04fe680fb7 Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der differ diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem new file mode 100644 index 00000000000000..3505a1d3b7471c --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEII6tJ++vRDrh8n6WL7RJysPA8x/kugv8UpHU7swwmU9joAoGCCqGSM49 +AwEHoUQDQgAEsTybsiU//jsHy97+cFsu4jz1DxKHnigQ2QA34n7iE6Rn8CrnRSHz +9o4rpm5YXw8yt3nPjvi8+WxPRxdVOBSkrg== +-----END EC PRIVATE KEY----- diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json new file mode 100644 index 00000000000000..4d6edf368d6c88 --- /dev/null +++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json @@ -0,0 +1,9 @@ +{ + "description": "PAI Test Vector: Certificate validity period starts in the past", + "is_success_case": "false", + "dac_cert": "308201cd30820174a003020102020803387718a44f7922300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000486361884ceed4d9b634f62dd2a1c58838ad1ccb905cc356f13a9be014aa05e7d5a12741ee930c3cab058a5b63924b2dd063ce5587e75420dcf13d6b1cb6218d1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e63d8020da582c42de896a0a8a8f3234fc1aaff4301f0603551d230418301680149e50e403198d909e56a0a6e289e198e7dd78aab6300a06082a8648ce3d040302034700304402200eaa4b2497709c85ab8ffec6798b28be4aeb91dd49d670ebb1c069ee71ac9ca8022036eae99d21a963245cf19fbcbab8c81ff722658d3b2b5bb03385f7e628513f72", + "pai_cert": "308201bd30820164a00302010202085b197657ae0fcacf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3231303632383134323334335a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b13c9bb2253ffe3b07cbdefe705b2ee23cf50f12879e2810d90037e27ee213a467f02ae74521f3f68e2ba66e585f0f32b779cf8ef8bcf96c4f4717553814a4aea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149e50e403198d909e56a0a6e289e198e7dd78aab6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220184b5bd56eb68233ad8fe8f7333ae19d65580a76fe0838fe917d4f93ee5a5c0a02207d1b939cfd8956e0ff2500299b2da917b6408175e5fe3bf88568d33b9f4bfd38", + "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022065588a5c17483f8509ab39305d5aea5f23b626a756d6e70a7d484e18aef8f2a5022100b2cad7017e7b3d4df69746347ec04b16e0adadbe38eaaa0f849b74cbd53074f6", + "dac_private_key": "e9295465729a5152c704eb1cb5bd8cf24474d0d544293b39e23b3a01ccb1a0b8", + "dac_public_key": "0486361884ceed4d9b634f62dd2a1c58838ad1ccb905cc356f13a9be014aa05e7d5a12741ee930c3cab058a5b63924b2dd063ce5587e75420dcf13d6b1cb6218d1" +} diff --git a/docs/guides/esp32/setup_idf_chip.md b/docs/guides/esp32/setup_idf_chip.md index acc001e67a6874..f6c7f649834fd7 100644 --- a/docs/guides/esp32/setup_idf_chip.md +++ b/docs/guides/esp32/setup_idf_chip.md @@ -39,13 +39,13 @@ step. $ ./install.sh ``` -- For ESP32H2, please checkout commit id - [10f3aba770](https://github.com/espressif/esp-idf/tree/10f3aba770), +- For ESP32H2, please checkout tag + [v5.0-beta1](https://github.com/espressif/esp-idf/tree/v5.0-beta1), currently only lighting-app is supported on H2 ``` $ cd esp-idf - $ git checkout 10f3aba770 + $ git checkout v5.0-beta1 $ git submodule update --init $ ./install.sh ``` 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 18d7c48c099ad3..96c706ad0ed1fe 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 @@ -2851,7 +2851,7 @@ server cluster ColorControl = 768 { readonly attribute int16u colorTempPhysicalMinMireds = 16395; readonly attribute int16u colorTempPhysicalMaxMireds = 16396; readonly attribute int16u coupleColorTempToLevelMinMireds = 16397; - attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400; + attribute access(write: manage) nullable int16u startUpColorTemperatureMireds = 16400; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/all-clusters-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-app/esp32/main/Kconfig.projbuild index 8791a80a443e71..dbf11ecaab5a57 100644 --- a/examples/all-clusters-app/esp32/main/Kconfig.projbuild +++ b/examples/all-clusters-app/esp32/main/Kconfig.projbuild @@ -53,6 +53,7 @@ menu "Demo" config RENDEZVOUS_MODE_SOFTAP bool "Soft-AP" + select ESP_WIFI_SOFTAP_SUPPORT config RENDEZVOUS_MODE_BLE bool "BLE" depends on BT_ENABLED @@ -60,17 +61,11 @@ menu "Demo" bool "On-Network" config RENDEZVOUS_MODE_SOFTAP_ON_NETWORK bool "Soft-AP / On-Network" + select ESP_WIFI_SOFTAP_SUPPORT config RENDEZVOUS_MODE_BLE_ON_NETWORK bool "BLE / On-Network" endchoice - config ECHO_HOST_IP - string "IPV4 address" - default "127.0.0.1" - depends on USE_ECHO_CLIENT - help - The IPV4 Address of the ECHO Server. - # NOTE: This config is not displayed as a input in the Kconfig menu, as its value is # entirely derived from the Device Type choice. However the CONFIG_EXAMPLE_DISPLAY_TYPE # define that is produced is needed to configure the TFT library correctly. diff --git a/examples/all-clusters-app/esp32/sdkconfig.defaults b/examples/all-clusters-app/esp32/sdkconfig.defaults index 5f996f40946d68..a9c28a1a863a25 100644 --- a/examples/all-clusters-app/esp32/sdkconfig.defaults +++ b/examples/all-clusters-app/esp32/sdkconfig.defaults @@ -53,3 +53,6 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y # Serial Flasher config CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESPTOOLPY_FLASHSIZE="4MB" + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild index 8791a80a443e71..dbf11ecaab5a57 100644 --- a/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild +++ b/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild @@ -53,6 +53,7 @@ menu "Demo" config RENDEZVOUS_MODE_SOFTAP bool "Soft-AP" + select ESP_WIFI_SOFTAP_SUPPORT config RENDEZVOUS_MODE_BLE bool "BLE" depends on BT_ENABLED @@ -60,17 +61,11 @@ menu "Demo" bool "On-Network" config RENDEZVOUS_MODE_SOFTAP_ON_NETWORK bool "Soft-AP / On-Network" + select ESP_WIFI_SOFTAP_SUPPORT config RENDEZVOUS_MODE_BLE_ON_NETWORK bool "BLE / On-Network" endchoice - config ECHO_HOST_IP - string "IPV4 address" - default "127.0.0.1" - depends on USE_ECHO_CLIENT - help - The IPV4 Address of the ECHO Server. - # NOTE: This config is not displayed as a input in the Kconfig menu, as its value is # entirely derived from the Device Type choice. However the CONFIG_EXAMPLE_DISPLAY_TYPE # define that is produced is needed to configure the TFT library correctly. diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults index 5f996f40946d68..a9c28a1a863a25 100644 --- a/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults +++ b/examples/all-clusters-minimal-app/esp32/sdkconfig.defaults @@ -53,3 +53,6 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y # Serial Flasher config CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESPTOOLPY_FLASHSIZE="4MB" + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/bridge-app/esp32/sdkconfig.defaults b/examples/bridge-app/esp32/sdkconfig.defaults index 6a6589e1040577..d76496f541c9ba 100644 --- a/examples/bridge-app/esp32/sdkconfig.defaults +++ b/examples/bridge-app/esp32/sdkconfig.defaults @@ -39,3 +39,6 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index e9d7612115a077..7fa6bae61d59dc 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1614,7 +1614,7 @@ server cluster ColorControl = 768 { readonly attribute int16u colorTempPhysicalMinMireds = 16395; readonly attribute int16u colorTempPhysicalMaxMireds = 16396; readonly attribute int16u coupleColorTempToLevelMinMireds = 16397; - attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400; + attribute access(write: manage) nullable int16u startUpColorTemperatureMireds = 16400; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn index c567ae9d8f1cbf..3d1bf35352fa93 100644 --- a/examples/chef/efr32/BUILD.gn +++ b/examples/chef/efr32/BUILD.gn @@ -91,8 +91,9 @@ chip_data_model("chef-common") { is_server = true } -# ThunderBoards (No LCD) -if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") { +# ThunderBoards and Explorer Kit (No LCD) +if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B" || + efr32_board == "BRD2703A") { show_qr_code = false disable_lcd = true } @@ -207,7 +208,7 @@ efr32_executable("chef_app") { if (chip_enable_openthread) { deps += [ "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread_device", + "${chip_root}/third_party/openthread:openthread-platform", "${examples_plat_dir}:efr-matter-shell", ] } diff --git a/examples/chef/esp32/main/Kconfig.projbuild b/examples/chef/esp32/main/Kconfig.projbuild index 307b7f6ccb83bc..a2b3ea3ce1c34c 100644 --- a/examples/chef/esp32/main/Kconfig.projbuild +++ b/examples/chef/esp32/main/Kconfig.projbuild @@ -55,6 +55,7 @@ menu "Demo" bool "Bypass" config RENDEZVOUS_MODE_SOFTAP bool "Soft-AP" + select ESP_WIFI_SOFTAP_SUPPORT config RENDEZVOUS_MODE_BLE bool "BLE" depends on BT_ENABLED @@ -62,17 +63,11 @@ menu "Demo" bool "On-Network" config RENDEZVOUS_MODE_SOFTAP_ON_NETWORK bool "Soft-AP / On-Network" + select ESP_WIFI_SOFTAP_SUPPORT config RENDEZVOUS_MODE_BLE_ON_NETWORK bool "BLE / On-Network" endchoice - config ECHO_HOST_IP - string "IPV4 address" - default "127.0.0.1" - depends on USE_ECHO_CLIENT - help - The IPV4 Address of the ECHO Server. - # NOTE: This config is not displayed as a input in the Kconfig menu, as its value is # entirely derived from the Device Type choice. However the CONFIG_EXAMPLE_DISPLAY_TYPE # define that is produced is needed to configure the TFT library correctly. diff --git a/examples/chef/esp32/sdkconfig.defaults b/examples/chef/esp32/sdkconfig.defaults index ab2bb7c5dcb419..a3a1d8a272b8b3 100644 --- a/examples/chef/esp32/sdkconfig.defaults +++ b/examples/chef/esp32/sdkconfig.defaults @@ -47,3 +47,6 @@ CONFIG_STACK_CHECK=y # Serial Flasher config CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESPTOOLPY_FLASHSIZE="4MB" + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn index e2705abdedcb65..4b6c15741224d0 100644 --- a/examples/light-switch-app/efr32/BUILD.gn +++ b/examples/light-switch-app/efr32/BUILD.gn @@ -84,8 +84,9 @@ if (chip_enable_wifi) { assert(use_rs911x || use_wf200) } -# ThunderBoards (No LCD) -if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") { +# ThunderBoards and Explorer Kit (No LCD) +if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B" || + efr32_board == "BRD2703A") { show_qr_code = false disable_lcd = true } @@ -200,7 +201,7 @@ efr32_executable("light_switch_app") { if (chip_enable_openthread) { deps += [ "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread_device", + "${chip_root}/third_party/openthread:openthread-platform", "${examples_plat_dir}:efr-matter-shell", ] } diff --git a/examples/light-switch-app/esp32/sdkconfig.defaults b/examples/light-switch-app/esp32/sdkconfig.defaults index f8d119e98c2bec..4e780d862ad614 100644 --- a/examples/light-switch-app/esp32/sdkconfig.defaults +++ b/examples/light-switch-app/esp32/sdkconfig.defaults @@ -45,4 +45,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESPTOOLPY_FLASHSIZE="4MB" #enable debug shell -CONFIG_ENABLE_CHIP_SHELL=y \ No newline at end of file +CONFIG_ENABLE_CHIP_SHELL=y + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n 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 0a6d27521c8a74..27a458acdc6195 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 @@ -1565,7 +1565,7 @@ client cluster ColorControl = 768 { readonly attribute int16u colorTempPhysicalMinMireds = 16395; readonly attribute int16u colorTempPhysicalMaxMireds = 16396; readonly attribute int16u coupleColorTempToLevelMinMireds = 16397; - attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400; + attribute access(write: manage) nullable int16u startUpColorTemperatureMireds = 16400; readonly attribute int16u clusterRevision = 65533; request struct MoveToHueRequest { diff --git a/examples/light-switch-app/nrfconnect/README.md b/examples/light-switch-app/nrfconnect/README.md index a40ed845742c0c..7d55b031e6b73d 100644 --- a/examples/light-switch-app/nrfconnect/README.md +++ b/examples/light-switch-app/nrfconnect/README.md @@ -695,35 +695,20 @@ To perform the unicast binding process, complete the following steps: 1. Build the CHIP Tool according to the steps from the [CHIP Tool user guide](../../../docs/guides/chip_tool_guide.md#building). 2. Go to the CHIP Tool build directory. -3. Add an ACL to the [lighting endpoint](../../lighting-app/nrfconnect/) - permissions by running the following command: - chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": [2], "targets": [{"cluster": 6, "endpoint": 1, "deviceType": null}, {"cluster": 8, "endpoint": 1, "deviceType": null}]}]' 1 0 - - In this command: - - - `{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}` - is an ACL for the communication with the CHIP Tool. - - `{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [2], "targets": [{"cluster": 6, "endpoint": 1, "deviceType": null}, {"cluster": 8, "endpoint": 1, "deviceType": null}]}` - is an ACL for binding (cluster `no. 6` is the On/Off cluster and the - cluster `no. 8` is the Level Control cluster). - - This allows the lighting application device to receive commands from the - light switch device. - -4. Add the light switch device to the multicast group by running the following +3. Add the light switch device to the multicast group by running the following command: chip-tool tests TestGroupDemoConfig --nodeId 1 -5. Add all light bulbs to the same multicast group by applying command below +4. Add all light bulbs to the same multicast group by applying command below for each of the light bulbs, using the appropriate `` (the user-defined ID of the node being commissioned except `2` due to use this `` for light-switch) for each of them: chip-tool tests TestGroupDemoConfig --nodeId -6. Add Binding commands for group multicast: +5. Add Binding commands for group multicast: chip-tool binding write binding '[{"fabricIndex": 1, "group": 257}]' 2 1 diff --git a/examples/lighting-app/bouffalolab/bl602/README.md b/examples/lighting-app/bouffalolab/bl602/README.md index 398562aaa17b63..52d87bab0820fe 100644 --- a/examples/lighting-app/bouffalolab/bl602/README.md +++ b/examples/lighting-app/bouffalolab/bl602/README.md @@ -1,10 +1,10 @@ # BL602 This example functions as a wifi light bulb device type, with on/off -capabilities. The steps were verified on BL602 development board. +capabilities. The steps were verified on BL602-IoT-Matter-V1 board. -BL602 development board: - +BL602-IoT-Matter-V1 board: + ## Initial setup @@ -85,6 +85,54 @@ picocom -b 115200 /dev/ttyACM0 2.To reset the board, press the RESET button, and you will see the log in the `picocom terminal`. +``` +Starting bl602 now.... +Booting BL602 Chip... +``` + +3.To control the development board after successfully debugging the development +board, press the BOOT button and you should see the following output in the +terminal: + +``` +[ 404197][:588238200] Short press +[ 404198][:588238200] receiving event type: 0 +[ 404203][:588238200] sending event type: 0 +[ 404207][:588238200] receiving event type: 0 +[ 404211][:588238200] Turning light ON +[ 406211][:588238200] sending event type: 1 +[ 406212][:588238200] receiving event type: 1 +[ 406217][:588238200] Light ON +[ 406220][:588238200] updating on/off = 1 +``` + +4.To restore the board to factory Settings, press and hold the BOOT button for 5 +seconds, and you should see the following output in the terminal: + +``` +[ 37268][:588238200] LongLong press +[ 37269][:588238200] receiving event type: 0 +[ 37274][:588238200] FactoryReset! please release button!!! +[ 37279][:588238200] Toggling state to 1 +[ 37283][:588238200] brightness: 255, mHue: 0, mSaturation: 0, red: 255, green: 255, blue: 255 +[ 37292][:588238200] red level: 10000 +[ 38296][:588238200] Toggling state to 0 +[ 38297][:588238200] brightness: 0, mHue: 0, mSaturation: 0, red: 0, green: 0, blue: 0 +[ 38305][:588238200] red level: 0 +[ 39308][:588238200] Toggling state to 1 +[ 39309][:588238200] brightness: 255, mHue: 0, mSaturation: 0, red: 255, green: 255, blue: 255 +[ 39318][:588238200] red level: 10000 +[ 42323][:588238200] [DL] Easyflash erase: f/1/n +[ 42327][:588238200] [DL] Easyflash erase: f/1/i +[ 42332][:588238200] [DL] Easyflash erase: f/1/r +[ 42335][:588238200] [DL] Easyflash erase: f/1/m +[ 42340][:588238200] [DL] Easyflash erase: f/1/o +[ 42349][:588238200] [DIS] Fabric (0x1) deleted. Calling OnFabricDeletedFromStorage +[ 42403][:588238200] [DL] Easyflash erase: f/1/k/0 +[ 42462][:588238200] [DL] Easyflash erase: f/1/g +[ 42465][:588238200] [DMG] AccessControl: removing fabric 1 +``` + ## Commission a device using chip-tool To initiate a client commissioning request to a device, run the built executable diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn index 060b9f67343aa0..6301fede13a30a 100644 --- a/examples/lighting-app/efr32/BUILD.gn +++ b/examples/lighting-app/efr32/BUILD.gn @@ -84,8 +84,9 @@ if (chip_enable_wifi) { assert(use_rs911x || use_wf200) } -# ThunderBoards (No LCD) -if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") { +# ThunderBoards and Explorer Kit (No LCD) +if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B" || + efr32_board == "BRD2703A") { show_qr_code = false disable_lcd = true } @@ -205,7 +206,7 @@ efr32_executable("lighting_app") { if (chip_enable_openthread) { deps += [ "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread_device", + "${chip_root}/third_party/openthread:openthread-platform", "${examples_plat_dir}:efr-matter-shell", ] } diff --git a/examples/lighting-app/esp32/main/Button.cpp b/examples/lighting-app/esp32/main/Button.cpp index 73a3758818070f..aadae002bc2d08 100644 --- a/examples/lighting-app/esp32/main/Button.cpp +++ b/examples/lighting-app/esp32/main/Button.cpp @@ -1,4 +1,22 @@ +/* + * + * Copyright (c) 2022 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "Button.h" +#include "esp_attr.h" #define GPIO_INPUT_IO_0 9 #define GPIO_INPUT_PIN_SEL (1ULL << GPIO_INPUT_IO_0) diff --git a/examples/lighting-app/esp32/main/CMakeLists.txt b/examples/lighting-app/esp32/main/CMakeLists.txt index e82f0c3f33e77c..ff9fac181e2e5d 100644 --- a/examples/lighting-app/esp32/main/CMakeLists.txt +++ b/examples/lighting-app/esp32/main/CMakeLists.txt @@ -68,7 +68,7 @@ set(SRC_DIRS_LIST "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server" ) -set(PRIV_REQUIRES_LIST chip QRCode bt led_strip app_update openthread) +set(PRIV_REQUIRES_LIST chip QRCode bt led_strip app_update openthread driver nvs_flash) if (CONFIG_ENABLE_PW_RPC) # Append additional directories for RPC build diff --git a/examples/lighting-app/esp32/main/LEDWidget.cpp b/examples/lighting-app/esp32/main/LEDWidget.cpp index 12cbf0f6d3295a..bf2221b26446c9 100644 --- a/examples/lighting-app/esp32/main/LEDWidget.cpp +++ b/examples/lighting-app/esp32/main/LEDWidget.cpp @@ -17,6 +17,7 @@ #include "LEDWidget.h" #include "ColorFormat.h" +#include "led_strip.h" static const char * TAG = "LEDWidget"; @@ -26,6 +27,14 @@ void LEDWidget::Init(void) mBrightness = UINT8_MAX; #if CONFIG_LED_TYPE_RMT +#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) + led_strip_config_t strip_config = { + .strip_gpio_num = CONFIG_LED_GPIO, + .max_leds = 1, + }; + + led_strip_new_rmt_device(&strip_config, &mStrip); +#else rmt_config_t config = RMT_DEFAULT_CONFIG_TX((gpio_num_t) CONFIG_LED_GPIO, (rmt_channel_t) CONFIG_LED_RMT_CHANNEL); led_strip_config_t strip_config = LED_STRIP_DEFAULT_CONFIG(1, (led_strip_dev_t) config.channel); @@ -33,7 +42,8 @@ void LEDWidget::Init(void) rmt_config(&config); rmt_driver_install(config.channel, 0, 0); - mStrip = led_strip_new_rmt_ws2812(&strip_config); + mStrip = led_strip_new_rmt_ws2812(&strip_config); +#endif mHue = 0; mSaturation = 0; #else @@ -121,9 +131,13 @@ void LEDWidget::DoSet(void) { HsvColor_t hsv = { mHue, mSaturation, brightness }; RgbColor_t rgb = HsvToRgb(hsv); - +#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) + led_strip_set_pixel(mStrip, 0, rgb.r, rgb.g, rgb.b); + led_strip_refresh(mStrip); +#else mStrip->set_pixel(mStrip, 0, rgb.r, rgb.g, rgb.b); mStrip->refresh(mStrip, 100); +#endif } #else ESP_LOGI(TAG, "DoSet to GPIO number %d", mGPIONum); diff --git a/examples/lighting-app/esp32/main/include/LEDWidget.h b/examples/lighting-app/esp32/main/include/LEDWidget.h index c390d63ac1024f..f9d00a2b6882a9 100644 --- a/examples/lighting-app/esp32/main/include/LEDWidget.h +++ b/examples/lighting-app/esp32/main/include/LEDWidget.h @@ -50,7 +50,11 @@ class LEDWidget #if CONFIG_LED_TYPE_RMT uint8_t mHue; uint8_t mSaturation; +#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) + led_strip_handle_t mStrip; +#else led_strip_t * mStrip; +#endif #else gpio_num_t mGPIONum; #endif diff --git a/examples/lighting-app/esp32/sdkconfig.defaults b/examples/lighting-app/esp32/sdkconfig.defaults index 23a3766c340c04..e051a3f2b37aee 100644 --- a/examples/lighting-app/esp32/sdkconfig.defaults +++ b/examples/lighting-app/esp32/sdkconfig.defaults @@ -43,3 +43,6 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y # Serial Flasher config CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESPTOOLPY_FLASHSIZE="4MB" + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2 index 3a6d8da8ff4033..dc637d31dc7a2e 100644 --- a/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2 +++ b/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2 @@ -1,4 +1,5 @@ CONFIG_IDF_TARGET="esp32h2" +CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2=y # Default to 921600 baud when flashing and monitoring device CONFIG_ESPTOOLPY_BAUD_921600B=y @@ -16,14 +17,9 @@ CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y # NIMBLE CONFIG_BT_ENABLED=y -CONFIG_BT_BLUEDROID_ENABLED=n CONFIG_BT_NIMBLE_ENABLED=y -CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=y CONFIG_BT_NIMBLE_EXT_ADV=n -CONFIG_BT_NIMBLE_USE_ESP_TIMER=n -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n +CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70 CONFIG_DEINIT_BLE_ON_COMMISSIONING_COMPLETE=n # Enable OpenThread @@ -45,22 +41,19 @@ CONFIG_LWIP_MULTICAST_PING=y CONFIG_MBEDTLS_HARDWARE_AES=n CONFIG_MBEDTLS_HARDWARE_MPI=n CONFIG_MBEDTLS_HARDWARE_SHA=n +CONFIG_MBEDTLS_HARDWARE_ECC=y CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN=n CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY=n CONFIG_MBEDTLS_CMAC_C=y CONFIG_MBEDTLS_SSL_PROTO_DTLS=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +# rtc clk for ble +# CONFIG_ESP32H2_RTC_CLK_SRC_EXT_CRYS=y + # MDNS platform CONFIG_USE_MINIMAL_MDNS=n - -# Increase stacks size -CONFIG_NIMBLE_CONTROLLER_TASK_STACK_SIZE=5120 -CONFIG_NIMBLE_HOST_TASK_STACK_SIZE=5120 - -# ESP32H2 BLE using a ext 32k crystal -CONFIG_ESP32H2_RTC_CLK_SRC_EXT_CRYS=y -CONFIG_ESP32H2_RTC_CLK_CAL_CYCLES=576 +CONFIG_ENABLE_EXTENDED_DISCOVERY=y # FreeRTOS should use legacy API CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y @@ -71,3 +64,6 @@ CONFIG_ENABLE_WIFI_AP=n # Enable OTA Requestor CONFIG_ENABLE_OTA_REQUESTOR=y + +# Enable chip shell +CONFIG_ENABLE_CHIP_SHELL=y diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index d538c8232f7bb0..43839293478d6d 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1511,7 +1511,7 @@ server cluster ColorControl = 768 { readonly attribute int16u colorTempPhysicalMinMireds = 16395; readonly attribute int16u colorTempPhysicalMaxMireds = 16396; readonly attribute int16u coupleColorTempToLevelMinMireds = 16397; - attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400; + attribute access(write: manage) nullable int16u startUpColorTemperatureMireds = 16400; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn index 2f8f2dc6bf67b4..d757da6c50c4ff 100644 --- a/examples/lock-app/efr32/BUILD.gn +++ b/examples/lock-app/efr32/BUILD.gn @@ -84,8 +84,9 @@ if (chip_enable_wifi) { assert(use_rs911x || use_wf200) } -# ThunderBoards (No LCD) -if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") { +# ThunderBoards and Explorer Kit (No LCD) +if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B" || + efr32_board == "BRD2703A") { show_qr_code = false disable_lcd = true } @@ -202,7 +203,7 @@ efr32_executable("lock_app") { if (chip_enable_openthread) { deps += [ "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread_device", + "${chip_root}/third_party/openthread:openthread-platform", "${examples_plat_dir}:efr-matter-shell", ] } diff --git a/examples/lock-app/esp32/main/Kconfig.projbuild b/examples/lock-app/esp32/main/Kconfig.projbuild index e2ec051d774fe1..4ec2e859c0b1f5 100644 --- a/examples/lock-app/esp32/main/Kconfig.projbuild +++ b/examples/lock-app/esp32/main/Kconfig.projbuild @@ -36,20 +36,6 @@ menu "Demo" bool "Ethernet" endchoice - config USE_ECHO_CLIENT - bool "Enable the built-in Echo Client" - default "n" - help - This enables a local FreeRTOS Echo Client so that the end-to-end echo server can be - tested easily - - config ECHO_HOST_IP - string "IPV4 address" - default "127.0.0.1" - depends on USE_ECHO_CLIENT - help - The IPV4 Address of the ECHO Server. - config RENDEZVOUS_MODE int range 0 8 diff --git a/examples/lock-app/esp32/sdkconfig.defaults b/examples/lock-app/esp32/sdkconfig.defaults index c9b513d752fc6c..d53bfc85c76c22 100644 --- a/examples/lock-app/esp32/sdkconfig.defaults +++ b/examples/lock-app/esp32/sdkconfig.defaults @@ -43,3 +43,6 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y #Lock app PID CONFIG_DEVICE_PRODUCT_ID=0x8006 + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/ota-provider-app/esp32/sdkconfig.defaults b/examples/ota-provider-app/esp32/sdkconfig.defaults index 537c6deab2897f..7fce894e5a80d8 100644 --- a/examples/ota-provider-app/esp32/sdkconfig.defaults +++ b/examples/ota-provider-app/esp32/sdkconfig.defaults @@ -58,3 +58,6 @@ CONFIG_USE_TEST_SETUP_DISCRIMINATOR=0xF01 # Enable chip shell CONFIG_ENABLE_CHIP_SHELL=y + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/ota-requestor-app/esp32/sdkconfig.defaults b/examples/ota-requestor-app/esp32/sdkconfig.defaults index beec4822b35cdf..17b6e378f65ca9 100644 --- a/examples/ota-requestor-app/esp32/sdkconfig.defaults +++ b/examples/ota-requestor-app/esp32/sdkconfig.defaults @@ -59,3 +59,6 @@ CONFIG_DEVICE_SOFTWARE_VERSION_NUMBER=2 # Enable Chip Shell CONFIG_ENABLE_CHIP_SHELL=y + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 48822ed58e83bf..eb235f5eaa24fa 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1916,7 +1916,7 @@ server cluster ColorControl = 768 { readonly attribute int16u currentY = 4; attribute bitmap8 options = 15; readonly attribute int16u coupleColorTempToLevelMinMireds = 16397; - attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400; + attribute access(write: manage) nullable int16u startUpColorTemperatureMireds = 16400; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 48822ed58e83bf..eb235f5eaa24fa 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1916,7 +1916,7 @@ server cluster ColorControl = 768 { readonly attribute int16u currentY = 4; attribute bitmap8 options = 15; readonly attribute int16u coupleColorTempToLevelMinMireds = 16397; - attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400; + attribute access(write: manage) nullable int16u startUpColorTemperatureMireds = 16400; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/platform/bouffalolab/bl602/doc/images/BL602-IoT-Matter_V1.png b/examples/platform/bouffalolab/bl602/doc/images/BL602-IoT-Matter_V1.png new file mode 100644 index 00000000000000..6cb4dc049f6ef5 Binary files /dev/null and b/examples/platform/bouffalolab/bl602/doc/images/BL602-IoT-Matter_V1.png differ diff --git a/examples/platform/bouffalolab/bl602/doc/images/bl602_iot_3S_v2.jpg b/examples/platform/bouffalolab/bl602/doc/images/bl602_iot_3S_v2.jpg deleted file mode 100755 index 2506a1e2aa3901..00000000000000 Binary files a/examples/platform/bouffalolab/bl602/doc/images/bl602_iot_3S_v2.jpg and /dev/null differ diff --git a/examples/platform/bouffalolab/bl602/doc/images/dev-cube-home.png b/examples/platform/bouffalolab/bl602/doc/images/dev-cube-home.png deleted file mode 100755 index 6988dc3dc050d0..00000000000000 Binary files a/examples/platform/bouffalolab/bl602/doc/images/dev-cube-home.png and /dev/null differ diff --git a/examples/platform/bouffalolab/bl602/doc/images/dev-cube-iot.png b/examples/platform/bouffalolab/bl602/doc/images/dev-cube-iot.png deleted file mode 100644 index c7898b331d0bf9..00000000000000 Binary files a/examples/platform/bouffalolab/bl602/doc/images/dev-cube-iot.png and /dev/null differ diff --git a/examples/platform/bouffalolab/bl602/doc/images/dev-cube.png b/examples/platform/bouffalolab/bl602/doc/images/dev-cube.png deleted file mode 100755 index 518a972ddfc608..00000000000000 Binary files a/examples/platform/bouffalolab/bl602/doc/images/dev-cube.png and /dev/null differ diff --git a/examples/platform/bouffalolab/bl602/doc/images/image-dev-cube.png b/examples/platform/bouffalolab/bl602/doc/images/image-dev-cube.png deleted file mode 100755 index 2e7ceff5c2430f..00000000000000 Binary files a/examples/platform/bouffalolab/bl602/doc/images/image-dev-cube.png and /dev/null differ diff --git a/examples/platform/bouffalolab/bl602/doc/images/image-web-login.png b/examples/platform/bouffalolab/bl602/doc/images/image-web-login.png deleted file mode 100755 index d8d610dd30549f..00000000000000 Binary files a/examples/platform/bouffalolab/bl602/doc/images/image-web-login.png and /dev/null differ diff --git a/examples/platform/bouffalolab/bl602/doc/images/image-web.png b/examples/platform/bouffalolab/bl602/doc/images/image-web.png deleted file mode 100755 index 02e07b2fffa3b3..00000000000000 Binary files a/examples/platform/bouffalolab/bl602/doc/images/image-web.png and /dev/null differ diff --git a/examples/platform/bouffalolab/bl602/hal-config-app-common.h b/examples/platform/bouffalolab/bl602/hal-config-app-common.h deleted file mode 100644 index b19a61575b89e2..00000000000000 --- a/examples/platform/bouffalolab/bl602/hal-config-app-common.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - * - * Copyright (c) 2020 Project CHIP Authors - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/****************************************************************************** - * @file - * @brief hal-config-app-common.h - ******************************************************************************* - * # License - * Copyright 2018 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * The licensor of this software is Silicon Laboratories Inc. Your use of this - * software is governed by the terms of Silicon Labs Master Software License - * Agreement (MSLA) available at - * www.silabs.com/about-us/legal/master-software-license-agreement. This - * software is distributed to you in Source Code format and is governed by the - * sections of the MSLA applicable to Source Code. - * - ******************************************************************************/ - -#pragma once - -#include "em_device.h" -#include "hal-config-types.h" - -#if defined(FEATURE_IOEXPANDER) -#include "hal-config-ioexp.h" -#endif - -#define HAL_EXTFLASH_FREQUENCY (1000000) - -#define HAL_PTI_ENABLE (1) -#define HAL_PTI_MODE (HAL_PTI_MODE_UART) -#define HAL_PTI_BAUD_RATE (1600000) - -#define HAL_PA_RAMP (10) -#define HAL_PA_2P4_LOWPOWER (0) -#define HAL_PA_POWER (252) -#define HAL_PA_CURVE_HEADER "pa_curves_efr32.h" - -#define HAL_PA_VOLTAGE BSP_PA_VOLTAGE - -// Select antenna path on EFR32xG2x devices: -// - RF2G2_IO1: 0 -// - RF2G2_IO2: 1 -#define GECKO_RF_ANTENNA 1 -#if defined(FEATURE_EXP_HEADER_USART3) - -#define BSP_EXP_USART USART3 - -#define BSP_EXP_USART_CTS_PIN BSP_USART3_CTS_PIN -#define BSP_EXP_USART_CTS_PORT BSP_USART3_CTS_PORT -#define BSP_EXP_USART_CTS_LOC BSP_USART3_CTS_LOC - -#define BSP_EXP_USART_RTS_PIN BSP_USART3_RTS_PIN -#define BSP_EXP_USART_RTS_PORT BSP_USART3_RTS_PORT -#define BSP_EXP_USART_RTS_LOC BSP_USART3_RTS_LOC - -#define BSP_EXP_USART_RX_PIN BSP_USART3_RX_PIN -#define BSP_EXP_USART_RX_PORT BSP_USART3_RX_PORT -#define BSP_EXP_USART_RX_LOC BSP_USART3_RX_LOC - -#define BSP_EXP_USART_TX_PIN BSP_USART3_TX_PIN -#define BSP_EXP_USART_TX_PORT BSP_USART3_TX_PORT -#define BSP_EXP_USART_TX_LOC BSP_USART3_TX_LOC - -#elif defined(FEATURE_EXP_HEADER_USART1) - -#define BSP_EXP_USART USART1 - -#define BSP_EXP_USART_CTS_PIN BSP_USART1_CTS_PIN -#define BSP_EXP_USART_CTS_PORT BSP_USART1_CTS_PORT -#define BSP_EXP_USART_CTS_LOC BSP_USART1_CTS_LOC - -#define BSP_EXP_USART_RTS_PIN BSP_USART1_RTS_PIN -#define BSP_EXP_USART_RTS_PORT BSP_USART1_RTS_PORT -#define BSP_EXP_USART_RTS_LOC BSP_USART1_RTS_LOC - -#define BSP_EXP_USART_RX_PIN BSP_USART1_RX_PIN -#define BSP_EXP_USART_RX_PORT BSP_USART1_RX_PORT -#define BSP_EXP_USART_RX_LOC BSP_USART1_RX_LOC - -#define BSP_EXP_USART_TX_PIN BSP_USART1_TX_PIN -#define BSP_EXP_USART_TX_PORT BSP_USART1_TX_PORT -#define BSP_EXP_USART_TX_LOC BSP_USART1_TX_LOC - -#else - -#define BSP_EXP_USART USART0 - -#define BSP_EXP_USART_CTS_PIN BSP_USART0_CTS_PIN -#define BSP_EXP_USART_CTS_PORT BSP_USART0_CTS_PORT -#define BSP_EXP_USART_CTS_LOC BSP_USART0_CTS_LOC - -#define BSP_EXP_USART_RTS_PIN BSP_USART0_RTS_PIN -#define BSP_EXP_USART_RTS_PORT BSP_USART0_RTS_PORT -#define BSP_EXP_USART_RTS_LOC BSP_USART0_RTS_LOC - -#define BSP_EXP_USART_RX_PIN BSP_USART0_RX_PIN -#define BSP_EXP_USART_RX_PORT BSP_USART0_RX_PORT -#define BSP_EXP_USART_RX_LOC BSP_USART0_RX_LOC - -#define BSP_EXP_USART_TX_PIN BSP_USART0_TX_PIN -#define BSP_EXP_USART_TX_PORT BSP_USART0_TX_PORT -#define BSP_EXP_USART_TX_LOC BSP_USART0_TX_LOC - -#endif // FEATURE_EXP_HEADER_USART3 diff --git a/examples/platform/efr32/display/demo-ui-bitmaps.h b/examples/platform/efr32/display/demo-ui-bitmaps.h index 6f77ce4b733139..4eca9c0c48e7aa 100644 --- a/examples/platform/efr32/display/demo-ui-bitmaps.h +++ b/examples/platform/efr32/display/demo-ui-bitmaps.h @@ -264,6 +264,36 @@ 0x00, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF +#elif IS_DEMO_THERMOSTAT +#define ON_DEMO_BITMAP \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0xE0, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0x81, 0x81, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x83, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x07, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x07, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x00, 0x00, \ + 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0xF0, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0x0F, 0x00, 0x00, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, \ + 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0x07, 0x00, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, \ + 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0xF0, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0x0F, 0x00, 0x00, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x00, 0x00, \ + 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0xE0, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \ + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF +#define OFF_DEMO_BITMAP ON_DEMO_BITMAP + #else // Unknown demo.... #define ON_DEMO_BITMAP \ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \ diff --git a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp index e975dce62914f2..ba9eafc19c1397 100644 --- a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp +++ b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp @@ -20,7 +20,9 @@ #if CONFIG_BT_ENABLED #include "esp_bt.h" #if CONFIG_BT_NIMBLE_ENABLED +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0) #include "esp_nimble_hci.h" +#endif // ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0) #include "nimble/nimble_port.h" #endif // CONFIG_BT_NIMBLE_ENABLED #endif // CONFIG_BT_ENABLED @@ -45,6 +47,9 @@ using namespace chip::DeviceLayer; using namespace chip::System; DeviceCallbacksDelegate * appDelegate = nullptr; +#if CONFIG_ENABLE_OTA_REQUESTOR +static bool isOTAInitialized = false; +#endif void CommonDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg) { @@ -62,17 +67,30 @@ void CommonDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, i ESP_LOGI(TAG, "CHIPoBLE disconnected"); break; + case DeviceEventType::kThreadConnectivityChange: +#if CONFIG_ENABLE_OTA_REQUESTOR + if (event->ThreadConnectivityChange.Result == kConnectivity_Established && !isOTAInitialized) + { + OTAHelpers::Instance().InitOTARequestor(); + isOTAInitialized = true; + } +#endif + break; + case DeviceEventType::kCommissioningComplete: { ESP_LOGI(TAG, "Commissioning complete"); #if CONFIG_BT_NIMBLE_ENABLED && CONFIG_DEINIT_BLE_ON_COMMISSIONING_COMPLETE if (ble_hs_is_enabled()) { - int ret = nimble_port_stop(); + int ret = nimble_port_stop(); + esp_err_t err = ESP_OK; if (ret == 0) { nimble_port_deinit(); - esp_err_t err = esp_nimble_hci_and_controller_deinit(); +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0) + err = esp_nimble_hci_and_controller_deinit(); +#endif // ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0) err += esp_bt_mem_release(ESP_BT_MODE_BLE); if (err == ESP_OK) { @@ -114,9 +132,6 @@ void CommonDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, i void CommonDeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event) { -#if CONFIG_ENABLE_OTA_REQUESTOR - static bool isOTAInitialized = false; -#endif appDelegate = DeviceCallbacksDelegate::Instance().GetAppDelegate(); if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established) { diff --git a/examples/shell/shell_common/BUILD.gn b/examples/shell/shell_common/BUILD.gn index 0217eb057fdff4..d601f0b54764b8 100644 --- a/examples/shell/shell_common/BUILD.gn +++ b/examples/shell/shell_common/BUILD.gn @@ -53,8 +53,8 @@ static_library("shell_common") { if (chip_enable_openthread && (current_os == "freertos" || current_os == "zephyr")) { public_deps += [ + "${chip_root}/third_party/openthread:openthread", "${chip_root}/third_party/openthread:openthread_cli", - "${chip_root}/third_party/openthread:openthread_device", ] } diff --git a/examples/temperature-measurement-app/esp32/main/Kconfig.projbuild b/examples/temperature-measurement-app/esp32/main/Kconfig.projbuild index e2ec051d774fe1..4ec2e859c0b1f5 100644 --- a/examples/temperature-measurement-app/esp32/main/Kconfig.projbuild +++ b/examples/temperature-measurement-app/esp32/main/Kconfig.projbuild @@ -36,20 +36,6 @@ menu "Demo" bool "Ethernet" endchoice - config USE_ECHO_CLIENT - bool "Enable the built-in Echo Client" - default "n" - help - This enables a local FreeRTOS Echo Client so that the end-to-end echo server can be - tested easily - - config ECHO_HOST_IP - string "IPV4 address" - default "127.0.0.1" - depends on USE_ECHO_CLIENT - help - The IPV4 Address of the ECHO Server. - config RENDEZVOUS_MODE int range 0 8 diff --git a/examples/temperature-measurement-app/esp32/sdkconfig.defaults b/examples/temperature-measurement-app/esp32/sdkconfig.defaults index 4659af909a144f..dcd05c0734f36a 100644 --- a/examples/temperature-measurement-app/esp32/sdkconfig.defaults +++ b/examples/temperature-measurement-app/esp32/sdkconfig.defaults @@ -84,3 +84,6 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096 #enable lwIP route hooks CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y + +# Disable softap support by default +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n diff --git a/examples/thermostat/efr32/BUILD.gn b/examples/thermostat/efr32/BUILD.gn index edb03073686e3e..bb4e2cb7a17e61 100644 --- a/examples/thermostat/efr32/BUILD.gn +++ b/examples/thermostat/efr32/BUILD.gn @@ -81,8 +81,9 @@ if (chip_enable_wifi) { assert(use_rs911x || use_wf200) } -# ThunderBoards (No LCD) -if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") { +# ThunderBoards and Explorer Kit (No LCD) +if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B" || + efr32_board == "BRD2703A") { show_qr_code = false disable_lcd = true } @@ -196,7 +197,7 @@ efr32_executable("thermostat_app") { if (chip_enable_openthread) { deps += [ "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread_device", + "${chip_root}/third_party/openthread:openthread-platform", "${examples_plat_dir}:efr-matter-shell", ] } @@ -245,8 +246,15 @@ efr32_executable("thermostat_app") { } if (!disable_lcd) { - sources += [ "${examples_plat_dir}/display/lcd.c" ] - defines += [ "DISPLAY_ENABLED" ] + sources += [ + "${examples_plat_dir}/display/demo-ui.c", + "${examples_plat_dir}/display/lcd.cpp", + ] + include_dirs += [ "${examples_plat_dir}/display" ] + defines += [ + "DISPLAY_ENABLED", + "IS_DEMO_THERMOSTAT=1", + ] if (show_qr_code) { defines += [ "QR_CODE_ENABLED" ] deps += [ "${chip_root}/examples/common/QRCode" ] diff --git a/examples/thermostat/efr32/include/AppConfig.h b/examples/thermostat/efr32/include/AppConfig.h index 91501d889a6234..946b593cab50a4 100644 --- a/examples/thermostat/efr32/include/AppConfig.h +++ b/examples/thermostat/efr32/include/AppConfig.h @@ -32,7 +32,7 @@ extern "C" { #endif -void efr32LogInit(void); +void efr32InitLog(void); void efr32Log(const char * aFormat, ...); #define EFR32_LOG(...) efr32Log(__VA_ARGS__); diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm index e854db7092e9eb..2eccbf8242a0a9 100644 --- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm +++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm @@ -309,7 +309,7 @@ - (void)mediaPlayback_stopPlayback:(void (^_Nonnull)(bool))responseCallback _mediaPlayback_pauseResponseCallback = responseCallback; dispatch_async(_chipWorkQueue, ^{ - CHIP_ERROR err = CastingServer::GetInstance()->MediaPlayback_Pause([](CHIP_ERROR err) { + CHIP_ERROR err = CastingServer::GetInstance()->MediaPlayback_StopPlayback([](CHIP_ERROR err) { [CastingServerBridge getSharedInstance].mediaPlayback_stopPlaybackResponseCallback(CHIP_NO_ERROR == err); }); dispatch_async(clientQueue, ^{ diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn index c7a3f57e4b9ff8..a9e0c030a9c292 100644 --- a/examples/window-app/efr32/BUILD.gn +++ b/examples/window-app/efr32/BUILD.gn @@ -77,8 +77,9 @@ if (chip_enable_wifi) { assert(use_rs911x || use_wf200) } -# ThunderBoards (No LCD) -if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B") { +# ThunderBoards and Explorer Kit (No LCD) +if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B" || + efr32_board == "BRD2703A") { show_qr_code = false disable_lcd = true } @@ -188,7 +189,7 @@ efr32_executable("window_app") { if (chip_enable_openthread) { deps += [ "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread_device", + "${chip_root}/third_party/openthread:openthread-platform", "${examples_plat_dir}:efr-matter-shell", ] } diff --git a/examples/window-app/efr32/include/WindowAppImpl.h b/examples/window-app/efr32/include/WindowAppImpl.h index a052838add1c89..8bfbe8ead0b7be 100644 --- a/examples/window-app/efr32/include/WindowAppImpl.h +++ b/examples/window-app/efr32/include/WindowAppImpl.h @@ -26,6 +26,9 @@ #include #include #include +#ifdef DISPLAY_ENABLED +#include +#endif class WindowAppImpl : public WindowApp { @@ -81,6 +84,8 @@ class WindowAppImpl : public WindowApp // Get QR Code and emulate its content using NFC tag char mQRCodeBuffer[chip::QRCodeBasicSetupPayloadGenerator::kMaxQRCodeBase38RepresentationLength + 1]; +#ifdef DISPLAY_ENABLED Timer mIconTimer; LcdIcon mIcon = LcdIcon::None; +#endif }; diff --git a/examples/window-app/efr32/src/WindowAppImpl.cpp b/examples/window-app/efr32/src/WindowAppImpl.cpp index 8ccfa97ea098a7..3f2cad957c068a 100644 --- a/examples/window-app/efr32/src/WindowAppImpl.cpp +++ b/examples/window-app/efr32/src/WindowAppImpl.cpp @@ -16,12 +16,10 @@ */ #include -#include #include #include #include #include -#include #include #include #include @@ -37,6 +35,11 @@ #include "wfx_host_events.h" #endif +#ifdef DISPLAY_ENABLED +#include +SilabsLCD slLCD; +#endif + #define APP_TASK_STACK_SIZE (4096) #define APP_TASK_PRIORITY 2 #define APP_EVENT_QUEUE_SIZE 10 @@ -129,16 +132,16 @@ StaticQueue_t sAppEventQueueStruct; WindowAppImpl WindowAppImpl::sInstance; -#ifdef DISPLAY_ENABLED -SilabsLCD slLCD; -#endif - WindowApp & WindowApp::Instance() { return WindowAppImpl::sInstance; } +#ifdef DISPLAY_ENABLED WindowAppImpl::WindowAppImpl() : mIconTimer("Timer:icon", LCD_ICON_TIMEOUT, OnIconTimeout, this) {} +#else +WindowAppImpl::WindowAppImpl() {} +#endif void WindowAppImpl::OnTaskCallback(void * parameter) { @@ -147,8 +150,10 @@ void WindowAppImpl::OnTaskCallback(void * parameter) void WindowAppImpl::OnIconTimeout(WindowApp::Timer & timer) { +#ifdef DISPLAY_ENABLED sInstance.mIcon = LcdIcon::None; sInstance.UpdateLCD(); +#endif } CHIP_ERROR WindowAppImpl::Init() @@ -331,6 +336,7 @@ void WindowAppImpl::DispatchEvent(const WindowApp::Event & event) case EventId::BLEConnectionsChanged: UpdateLEDs(); break; +#ifdef DISPLAY_ENABLED case EventId::CoverTypeChange: UpdateLCD(); break; @@ -344,6 +350,7 @@ void WindowAppImpl::DispatchEvent(const WindowApp::Event & event) mIcon = mTiltMode ? LcdIcon::Tilt : LcdIcon::Lift; UpdateLCD(); break; +#endif default: break; } @@ -433,10 +440,12 @@ void WindowAppImpl::UpdateLCD() Attributes::CurrentPositionTilt::Get(cover.mEndpoint, tilt); chip::DeviceLayer::PlatformMgr().UnlockChipStack(); +#ifdef DISPLAY_ENABLED if (!tilt.IsNull() && !lift.IsNull()) { LcdPainter::Paint(slLCD, type, lift.Value(), tilt.Value(), mIcon); } +#endif } #ifdef QR_CODE_ENABLED else diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml index c8c09ad722319f..2c4eda7cec36c9 100644 --- a/integrations/cloudbuild/build-all.yaml +++ b/integrations/cloudbuild/build-all.yaml @@ -21,6 +21,19 @@ steps: path: /pwenv timeout: 900s + - name: "connectedhomeip/chip-build-vscode:0.5.91" + env: + - PW_ENVIRONMENT_ROOT=/pwenv + args: + - "-c" + - ./scripts/checkout_submodules.py --shallow --recursive --platform efr32 + id: Checkout EFR32 + entrypoint: /usr/bin/bash + volumes: + - name: pwenv + path: /pwenv + timeout: 900s + - name: "connectedhomeip/chip-build-vscode:0.5.91" env: - PW_ENVIRONMENT_ROOT=/pwenv diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index b0333fab36f327..8bcc5128739092 100644 --- a/integrations/cloudbuild/smoke-test.yaml +++ b/integrations/cloudbuild/smoke-test.yaml @@ -21,6 +21,19 @@ steps: path: /pwenv timeout: 900s + - name: "connectedhomeip/chip-build-vscode:0.5.91" + env: + - PW_ENVIRONMENT_ROOT=/pwenv + args: + - "-c" + - ./scripts/checkout_submodules.py --shallow --recursive --platform efr32 + id: Checkout EFR32 + entrypoint: /usr/bin/bash + volumes: + - name: pwenv + path: /pwenv + timeout: 900s + - name: "connectedhomeip/chip-build-vscode:0.5.91" id: ESP32 env: diff --git a/integrations/docker/images/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/chip-build-nrf-platform/Dockerfile index f27f0813c748b3..280534cac6c9fe 100644 --- a/integrations/docker/images/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/chip-build-nrf-platform/Dockerfile @@ -61,7 +61,7 @@ RUN set -x \ && (apt-get remove -fy python3-yaml && apt-get autoremove || exit 0) \ && python3 -m pip install -U --no-cache-dir cmake==3.22.5 \ && python3 -m pip install --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/zephyr/scripts/requirements.txt \ - && python3 -m pip install --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/nrf/scripts/requirements.txt \ + && python3 -m pip install --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/nrf/scripts/requirements-build.txt \ && python3 -m pip install --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/bootloader/mcuboot/scripts/requirements.txt \ && : # last line diff --git a/integrations/docker/images/chip-build-ti/Dockerfile b/integrations/docker/images/chip-build-ti/Dockerfile index 5e99fb9f44fc5a..20eb5889c16f36 100644 --- a/integrations/docker/images/chip-build-ti/Dockerfile +++ b/integrations/docker/images/chip-build-ti/Dockerfile @@ -11,9 +11,9 @@ RUN set -x \ # Install Sysconfig RUN set -x \ - && wget https://software-dl.ti.com/ccs/esd/sysconfig/sysconfig-1.11.0_2225-setup.run \ - && chmod +x sysconfig-1.11.0_2225-setup.run \ - && ./sysconfig-1.11.0_2225-setup.run --mode unattended \ + && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.13.0.2553/sysconfig-1.13.0_2553-setup.run \ + && chmod +x sysconfig-1.13.0_2553-setup.run \ + && ./sysconfig-1.13.0_2553-setup.run --mode unattended \ && : # last line -ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.11.0 +ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.13.0 diff --git a/integrations/docker/images/chip-build/Dockerfile b/integrations/docker/images/chip-build/Dockerfile index bfcfea5e40e755..861f5ecb2df4e7 100644 --- a/integrations/docker/images/chip-build/Dockerfile +++ b/integrations/docker/images/chip-build/Dockerfile @@ -28,14 +28,16 @@ RUN set -x \ libcairo2-dev \ libdbus-1-dev \ libdbus-glib-1-dev \ + libdmalloc-dev \ libgif-dev \ libglib2.0-dev \ libical-dev \ libjpeg-dev \ - libdmalloc-dev \ libmbedtls-dev \ libncurses5-dev \ libncursesw5-dev \ + libnl-3-dev \ + libnl-route-3-dev \ libnspr4-dev \ libpango1.0-dev \ libpixman-1-dev \ diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 0791656d59351a..1baaf2f8150e0b 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.5.94 Version bump reason: Install ccache to the chip-build image +0.5.97 Version bump reason: [TI] Update SysConfig to 1.13.0 diff --git a/scripts/tools/generate_esp32_chip_factory_bin.py b/scripts/tools/generate_esp32_chip_factory_bin.py index d5f6ed380a91c6..64b6c293fd6510 100755 --- a/scripts/tools/generate_esp32_chip_factory_bin.py +++ b/scripts/tools/generate_esp32_chip_factory_bin.py @@ -140,7 +140,7 @@ 'encoding': 'string', 'value': None, }, - 'unique-id': { + 'rd-id-uid': { 'type': 'data', 'encoding': 'hex2bin', 'value': None, @@ -260,7 +260,7 @@ def validate_args(args): check_str_range(args.product_name, 1, 32, 'Product name') check_str_range(args.hw_ver_str, 1, 64, 'Hardware version string') check_str_range(args.mfg_date, 8, 16, 'Manufacturing date') - check_str_range(args.unique_id, 32, 32, 'Unique id') + check_str_range(args.rd_id_uid, 32, 32, 'Rotating device Unique id') logging.info('Discriminator:{} Passcode:{}'.format(args.discriminator, args.passcode)) @@ -295,8 +295,8 @@ def populate_factory_data(args, spake2p_params): if args.serial_num is not None: FACTORY_DATA['serial-num']['value'] = args.serial_num - if args.unique_id is not None: - FACTORY_DATA['unique-id']['value'] = args.unique_id + if args.rd_id_uid is not None: + FACTORY_DATA['rd-id-uid']['value'] = args.rd_id_uid if args.mfg_date is not None: FACTORY_DATA['mfg-date']['value'] = args.mfg_date if args.vendor_id is not None: @@ -460,8 +460,8 @@ def any_base_int(s): return int(s, 0) parser.add_argument('--hw-ver-str', type=str, required=False, help='Hardware version string') parser.add_argument('--mfg-date', type=str, required=False, help='Manufacturing date in format YYYY-MM-DD') parser.add_argument('--serial-num', type=str, required=False, help='Serial number') - parser.add_argument('--unique-id', type=str, required=False, - help='128-bit unique identifier, provide 32-byte hex string, e.g. "1234567890abcdef1234567890abcdef"') + parser.add_argument('--rd-id-uid', type=str, required=False, + help='128-bit unique identifier for generating rotating device identifier, provide 32-byte hex string, e.g. "1234567890abcdef1234567890abcdef"') # These will be used by DeviceInfoProvider parser.add_argument('--calendar-types', type=str, nargs='+', required=False, diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt index 1bb841b81965b3..217cbc00737721 100644 --- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt +++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/AddressUpdateFragment.kt @@ -13,7 +13,6 @@ import com.google.chip.chiptool.R import com.google.chip.chiptool.util.DeviceIdUtil import kotlinx.android.synthetic.main.address_update_fragment.deviceIdEd import kotlinx.android.synthetic.main.address_update_fragment.fabricIdEd -import kotlinx.android.synthetic.main.address_update_fragment.view.updateAddressBtn /** Fragment for updating the address of a device given its fabric and node ID. */ class AddressUpdateFragment: Fragment() { @@ -28,9 +27,7 @@ class AddressUpdateFragment: Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View { - return inflater.inflate(R.layout.address_update_fragment, container, false).apply { - updateAddressBtn.setOnClickListener { updateAddressClick() } - } + return inflater.inflate(R.layout.address_update_fragment, container, false).apply { } } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -40,16 +37,4 @@ class AddressUpdateFragment: Fragment() { fabricIdEd.setText(compressedFabricId.toULong().toString(16).padStart(16, '0')) deviceIdEd.setText(DeviceIdUtil.getLastDeviceId(requireContext()).toString()) } - - private fun updateAddressClick() { - try { - deviceController.updateDevice( - fabricIdEd.text.toString().toULong(16).toLong(), - deviceIdEd.text.toString().toULong().toLong() - ) - Toast.makeText(requireContext(), "Address update started", Toast.LENGTH_SHORT).show() - } catch (ex: Exception) { - Toast.makeText(requireContext(), "Address update failed: $ex", Toast.LENGTH_SHORT).show() - } - } } \ No newline at end of file diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt index 64f35095652732..587eb85020651c 100644 --- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt +++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt @@ -66,7 +66,6 @@ class SensorClientFragment : Fragment() { ChipClient.getDeviceController(requireContext()).setCompletionListener(null) deviceIdEd.setOnEditorActionListener { textView, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_DONE) { - updateAddress(textView.text.toString()) resetSensorGraph() // reset the graph on device change } actionId == EditorInfo.IME_ACTION_DONE @@ -116,7 +115,6 @@ class SensorClientFragment : Fragment() { override fun onStart() { super.onStart() deviceIdEd.setText(DeviceIdUtil.getLastDeviceId(requireContext()).toString()) - updateAddress(deviceIdEd.text.toString()) } override fun onStop() { @@ -124,17 +122,6 @@ class SensorClientFragment : Fragment() { super.onStop() } - private fun updateAddress(deviceId: String) { - try { - ChipClient.getDeviceController(requireContext()).updateDevice( - /* fabric ID */ 5544332211, - deviceId.toULong().toLong() - ) - } catch (ex: Exception) { - showMessage(R.string.update_device_address_failure, ex.toString()) - } - } - private fun resetSensorGraph() { watchSensorBtn.isChecked = false sensorGraph.visibility = View.INVISIBLE diff --git a/src/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml index c76cc76fc7b85e..3a401297e326aa 100644 --- a/src/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml +++ b/src/android/CHIPTool/app/src/main/res/layout/address_update_fragment.xml @@ -32,18 +32,4 @@ android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="fabricIdEd,deviceIdEd" /> - -