diff --git a/components/esp_matter_controller/esp_matter_controller_console.cpp b/components/esp_matter_controller/esp_matter_controller_console.cpp index 967756041..1c6783e85 100644 --- a/components/esp_matter_controller/esp_matter_controller_console.cpp +++ b/components/esp_matter_controller/esp_matter_controller_console.cpp @@ -287,7 +287,7 @@ esp_err_t controller_register_commands() .name = "pairing", .description = "Pairing a node.\n" "\tUsage: controller pairing onnetwork [nodeid] [pincode] OR\n" - "\tcontroller pairing ble-wifi [nodeid] [pincode] [ssid] [password] [discriminator] OR\n" + "\tcontroller pairing ble-wifi [nodeid] [ssid] [password] [pincode] [discriminator] OR\n" "\tcontroller pairing ble-thread [nodeid] [pincode] [discriminator] [dataset]", .handler = controller_pairing_handler, }, diff --git a/docs/en/developing.rst b/docs/en/developing.rst index ccc17b79b..8af677cd7 100644 --- a/docs/en/developing.rst +++ b/docs/en/developing.rst @@ -872,7 +872,17 @@ As an example, you can build *light* example on ``ESP32_custom`` platform with f 2.4.5 Controller Example ~~~~~~~~~~~~~~~~~~~~~~~~ -This section introduces the Matter controller example. Now this example supports 8 features of the standard Matter controller, including onnetwork-pairing, invoke-cluster-commands, read-attributes-commands, write-attributes-commands, read-events-commands, subscribe-attributes-commands, subscribe-events-commands, and groupsettings-command. +This section introduces the Matter controller example. Now this example supports the following features of the standard Matter controller: + +- BLE-WiFi pairing +- On-network pairing +- Invoke cluster commands +- Read attributes commands +- Write attributes commands +- Read events commands +- Subscribe attributes commands +- Subscribe events commands +- Group settings command. 2.4.5.1 Starting with device console ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -889,7 +899,12 @@ The ``pairing`` command is used for commissioning the end-devices. Here are thre matter esp wifi connect matter esp controller pairing onnetwork -- Ble-wifi pairing. This commissioning method is still not supported on current controller example. +- Ble-wifi pairing. This pairing method is supported for ESP32S3. Before you execute this commissioning method, connect the controller to the Wi-Fi network and ensure that the end-device is in commissioning mode. You can use the command ``matter esp wifi connect`` to connect the controller to your wifi network. Then we can start the pairing. + + :: + + matter esp wifi connect + matter esp controller pairing ble-wifi - Ble-thread pairing. This commissioning method is still not supported on current controller example. diff --git a/examples/controller/sdkconfig.defaults b/examples/controller/sdkconfig.defaults index 29b481b40..70ab7199b 100644 --- a/examples/controller/sdkconfig.defaults +++ b/examples/controller/sdkconfig.defaults @@ -50,6 +50,3 @@ CONFIG_MBEDTLS_HKDF_C=y # Increase LwIP IPv6 address number to 6 (MAX_FABRIC + 1) # unique local addresses for fabrics(MAX_FABRIC), a link local address(1) CONFIG_LWIP_IPV6_NUM_ADDRESSES=6 - -# Enable ble controller -CONFIG_ENABLE_ESP32_BLE_CONTROLLER=y diff --git a/examples/controller/sdkconfig.defaults.esp32s3 b/examples/controller/sdkconfig.defaults.esp32s3 new file mode 100644 index 000000000..b4b86e9ad --- /dev/null +++ b/examples/controller/sdkconfig.defaults.esp32s3 @@ -0,0 +1,4 @@ +CONFIG_IDF_TARGET="esp32s3" + +# Enable ble controller +CONFIG_ENABLE_ESP32_BLE_CONTROLLER=y