fix(nimble): Added CS service support

Author: rahult-github

components/bt/CMakeLists.txt

@@ -775,6 +775,7 @@ if(CONFIG_BT_ENABLED)
                     "host/nimble/nimble/nimble/host/services/hid/src/ble_svc_hid.c"
                     "host/nimble/nimble/nimble/host/services/sps/src/ble_svc_sps.c"
                     "host/nimble/nimble/nimble/host/services/cte/src/ble_svc_cte.c"
+                    "host/nimble/nimble/nimble/host/services/ras/src/ble_svc_ras.c"
                     "host/nimble/nimble/nimble/host/src/ble_cs.c"
                     "host/nimble/nimble/nimble/host/src/ble_hs_conn.c"
                     "host/nimble/nimble/nimble/host/src/ble_store_util.c"

components/bt/host/nimble/Kconfig.in

@@ -708,6 +708,27 @@ menu "BLE 5.x Features"
     endif
 endmenu #BLE5.x
 
+menu "BLE 6.x Features"
+    depends on (SOC_BLE_60_SUPPORTED || BT_CONTROLLER_DISABLED)
+
+    menuconfig BT_NIMBLE_60_FEATURE_SUPPORT
+        bool "Enable BLE 6 feature"
+        depends on BT_NIMBLE_ENABLED && (SOC_BLE_60_SUPPORTED || BT_CONTROLLER_DISABLED)
+        default n
+        help
+            Enable BLE 6 feature
+
+    if BT_NIMBLE_60_FEATURE_SUPPORT
+        config BT_NIMBLE_CHANNEL_SOUNDING
+            bool "ble channel souding feature"
+            depends on BT_NIMBLE_ENABLED
+            default n
+            help
+                Used to enable/disable the channel sounding feature
+
+    endif
+endmenu #BLE6.x
+
 menu "Services"
     depends on BT_NIMBLE_GATT_SERVER
 
@@ -955,6 +976,7 @@ menu "Services"
             default 0 if BT_NIMBLE_SVC_GAP_CAR_NOT_SUPP
             default 1 if BT_NIMBLE_SVC_GAP_CAR_SUPP
 
+
         menu "GAP Appearance write permissions"
             depends on BT_NIMBLE_GAP_SERVICE
 

components/bt/host/nimble/port/include/esp_nimble_cfg.h

@@ -2196,7 +2196,7 @@
 #ifdef CONFIG_BT_NIMBLE_CHANNEL_SOUNDING
 #define MYNEWT_VAL_BLE_CHANNEL_SOUNDING (CONFIG_BT_NIMBLE_CHANNEL_SOUNDING)
 #else
-#define MYNEWT_VAL_BLE_CHANNEL_SOUNDING (1)
+#define MYNEWT_VAL_BLE_CHANNEL_SOUNDING (0)
 #endif
 #endif
 

examples/bluetooth/.build-test-rules.yml

@@ -187,6 +187,25 @@ examples/bluetooth/nimble/ble_ancs:
   depends_filepatterns:
     - examples/bluetooth/nimble/common/**/*
 
+examples/bluetooth/nimble/ble_chan_sound_initiator:
+  <<: *bt_default_depends
+  enable:
+    - if: SOC_BLE_SUPPORTED == 1 and IDF_TARGET == "esp32c6"
+      temporary: true
+      reason: Channel Sounding example only supported on ESP32-C6
+  depends_filepatterns:
+    - examples/bluetooth/nimble/ble_chan_sound_initiator/**/*
+    - examples/bluetooth/nimble/common/**/*
+
+examples/bluetooth/nimble/ble_chan_sound_reflector:
+  <<: *bt_default_depends
+  enable:
+    - if: SOC_BLE_SUPPORTED == 1 and IDF_TARGET == "esp32c6"
+      temporary: true
+      reason: Channel Sounding example only supported on ESP32-C6
+  depends_filepatterns:
+    - examples/bluetooth/nimble/ble_chan_sound_reflector/**/*
+    - examples/bluetooth/nimble/common/**/*
 examples/bluetooth/nimble/ble_cte:
   <<: *bt_default_depends
   enable:

examples/bluetooth/nimble/ble_chan_sound_initiator/CMakeLists.txt

@@ -5,4 +5,4 @@ cmake_minimum_required(VERSION 3.16)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 idf_build_set_property(MINIMAL_BUILD ON)
-project(blecent)
+project(ble_chan_sound_initiator)

examples/bluetooth/nimble/ble_chan_sound_initiator/README.md

@@ -1,37 +1,32 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
+| Supported Targets | ESP32-C6 |
+| ----------------- | -------- |
 
-# BLE Central Example
+# BLE Channel sounding example
+(See the README.md file in the upper-level 'examples' directory for more information about examples.)
+* This example demonstrates the capability of the CS procedure to be executed on the ESP host + external controller.
+* It is important to note that the current example does not provide support for distance calculation, and it is currently under development.
 
-(See the README.md file in the upper level 'examples' directory for more information about examples.)
+## Example output
 
-This example creates GATT client and performs passive scan, it then connects to peripheral device if the device advertises connectability and the device advertises support for the Alert Notification service (0x1811) as primary service UUID.
+I (372) hal_uart: set baud_rate:115200.
 
-After connection it enables bonding and link encryprion if the `Enable Link Encryption` flag is set in the example config.
+I (382) NimBLE_RAS_INITIATOR: BLE Host Task Started
+I (382) main_task: Returned from app_main()
 
-It performs six GATT operations against the specified peer:
+I (432) NimBLE: GAP procedure initiated: extended discovery;
 
-* Reads the ANS Supported New Alert Category characteristic.
+I (157332) NimBLE: GAP procedure initiated: extended connect;
+I (157552) NimBLE: Connection established
+I (157562) NimBLE: Connection secured
+I (162222) NimBLE: encryption change event; status=0
 
-* After the read operation is completed, writes the ANS Alert Notification Control Point characteristic.
+I (162372) NimBLE: CS capabilities exchanged
+I (162372) NimBLE: Set default CS settings
+I (162392) NimBLE: create CS config
+I (162392) NimBLE: Setup phase completed
 
-* After the write operation is completed, subscribes to notifications for the ANS Unread Alert Status characteristic.
-
-* After the subscribe operation is completed, it subscribes to notifications for a user defined characteristic.
-
-* After this subscribe operation is completed, it writes to the user defined characteristic.
-
-* After the write operation is completed, it reads from the user defined characteristic.
-
-If the peer does not support a required service, characteristic, or descriptor, then the peer lied when it claimed support for the alert notification service! When this happens, or if a GATT procedure fails, this function immediately terminates the connection.
-
-It uses ESP32's Bluetooth controller and NimBLE stack based BLE host.
-
-This example aims at understanding BLE service discovery, connection, encryption and characteristic operations.
-
-To test this demo, use any BLE GATT server app that advertises support for the Alert Notification service (0x1811) and includes it in the GATT database.
-
-Note :
+## Note:
+* This example currently requires an external Bluetooth controller supporting BLE Channel sounding functionality,as the ESP chips listed above do not have native controller support for BLE channel sounding feature and is under development phase
 
 * To install the dependency packages needed, please refer to the top level [README file](../../../README.md#running-test-python-script-pytest).
 
@@ -45,7 +40,7 @@ idf.py set-target <chip_name>
 
 ### Hardware Required
 
-* A development board with ESP32/ESP32-C2/ESP32-C3/ESP32-S3 SoC (e.g., ESP32-DevKitC, ESP-WROVER-KIT, etc.)
+* A development board with ESP32/ESP32-C2/ESP32-C3/ESP32-S3/ESP32-C6 SoC (e.g., ESP32-DevKitC, ESP-WROVER-KIT, etc.)
 * A USB cable for Power supply and programming
 
 See [Development Boards](https://www.espressif.com/en/products/devkits) for more information about it.
@@ -70,68 +65,6 @@ Run `idf.py -p PORT flash monitor` to build, flash and monitor the project.
 
 See the [Getting Started Guide](https://idf.espressif.com/) for full steps to configure and use ESP-IDF to build projects.
 
-## Example Output
-
-This is the console output on successful connection:
-
-```
-I (202) BTDM_INIT: BT controller compile version [0b60040]
-I (202) system_api: Base MAC address is not set, read default base MAC address from BLK0 of EFUSE
-W (212) phy_init: failed to load RF calibration data (0xffffffff), falling back to full calibration
-I (422) phy: phy_version: 4007, 9c6b43b, Jan 11 2019, 16:45:07, 0, 2
-I (722) NimBLE_BLE_CENT: BLE Host Task Started
-GAP procedure initiated: stop advertising.
-GAP procedure initiated: discovery; own_addr_type=0 filter_policy=0 passive=1 limited=0 filter_duplicates=1 duration=forever
-GAP procedure initiated: connect; peer_addr_type=1 peer_addr=xx:xx:xx:xx:xx:xx scan_itvl=16 scan_window=16 itvl_min=24 itvl_max=40 latency=0 supervision_timeout=256 min_ce_len=16 max_ce_len=768 own_addr_type=0
-Connection established
-Connection secured
-encryption change event; status=0
-GATT procedure initiated: discover all services
-GATT procedure initiated: discover all characteristics; start_handle=1 end_handle=3
-GATT procedure initiated: discover all characteristics; start_handle=20 end_handle=26
-GATT procedure initiated: discover all characteristics; start_handle=40 end_handle=65535
-GATT procedure initiated: discover all descriptors; chr_val_handle=42 end_handle=43
-GATT procedure initiated: discover all descriptors; chr_val_handle=49 end_handle=65535
-Service discovery complete; status=0 conn_handle=0
-GATT procedure initiated: read; att_handle=45
-GATT procedure initiated: write; att_handle=47 len=2
-GATT procedure initiated: write; att_handle=43 len=2
-Read complete; status=0 conn_handle=0 attr_handle=45 value=0x02
-Write complete; status=0 conn_handle=0 attr_handle=47
-Subscribe complete; status=0 conn_handle=0 attr_handle=43
-GATT procedure initiated: write; att_handle=26 len=2
-GATT procedure initiated: write; att_handle=25 len=1
-GATT procedure initiated: read; att_handle=25
-Subscribe to the custom subscribable characteristic complete; status=0 conn_handle=1 attr_handle=26 value=
-Write to the custom subscribable characteristic complete; status=0 conn_handle=1 attr_handle=25
-received notification; conn_handle=1 attr_handle=25 attr_len=4
-Read complete for the subscribable characteristic; status=0 conn_handle=1 attr_handle=25 value=0x19
-```
-
-This is the console output on failure (or peripheral does not support New Alert Service category):
-
-```
-I (180) BTDM_INIT: BT controller compile version [8e87ec7]
-I (180) system_api: Base MAC address is not set, read default base MAC address from BLK0 of EFUSE
-I (250) phy: phy_version: 4000, b6198fa, Sep  3 2018, 15:11:06, 0, 0
-I (480) NimBLE_BLE_CENT: BLE Host Task Started
-GAP procedure initiated: stop advertising.
-GAP procedure initiated: discovery; own_addr_type=0 filter_policy=0 passive=1 limited=0 filter_duplicates=1 duration=forever
-GAP procedure initiated: connect; peer_addr_type=1 peer_addr=xx:xx:xx:xx:xx:xx scan_itvl=16 scan_window=16 itvl_min=24 itvl_max=40 latency=0 supervision_timeout=256 min_ce_len=16 max_ce_len=768 own_addr_type=0
-Connection established
-GATT procedure initiated: discover all services
-GATT procedure initiated: discover all characteristics; start_handle=1 end_handle=3
-GATT procedure initiated: discover all characteristics; start_handle=20 end_handle=26
-GATT procedure initiated: discover all characteristics; start_handle=40 end_handle=65535
-GATT procedure initiated: discover all descriptors; chr_val_handle=42 end_handle=43
-GATT procedure initiated: discover all descriptors; chr_val_handle=47 end_handle=65535
-Service discovery complete; status=0 conn_handle=0
-Error: Peer doesn't support the Supported New Alert Category characteristic
-GAP procedure initiated: terminate connection; conn_handle=0 hci_reason=19
-disconnect; reason=534
-```
-
-
 ## Troubleshooting
 
 For any technical queries, please open an [issue](https://github.com/espressif/esp-idf/issues) on GitHub. We will get back to you soon.

examples/bluetooth/nimble/ble_chan_sound_initiator/main/Kconfig.projbuild

@@ -1,39 +1,14 @@
 menu "Example Configuration"
 
-    config EXAMPLE_PEER_ADDR
-        string "Peer Address"
-        default "ADDR_ANY"
-        help
-            Enter the peer address in aa:bb:cc:dd:ee:ff form to connect to a specific peripheral
 
     config EXAMPLE_EXTENDED_ADV
         bool
         depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
-        default y if SOC_ESP_NIMBLE_CONTROLLER
+        default y
         select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         help
             Use this option to enable extended advertising in the example.
             If this option is disabled, ensure config BT_NIMBLE_EXT_ADV is
             also disabled from Nimble stack menuconfig
-
-    config EXAMPLE_INIT_DEINIT_LOOP
-        bool
-        prompt "Perform init deinit of nimble stack in a loop"
-        help
-            Enable this flag, to perform only stack Init and Deinit in a loop.
-
-    config EXAMPLE_ENCRYPTION
-        bool
-        prompt "Enable Link Encryption"
-        help
-            This enables bonding and encryption after connection has been established.
-
-    config EXAMPLE_USE_CI_ADDRESS
-        bool
-        default n
-        prompt "Advertise using Test address(Internal Test ONLY)"
-        help
-            Used for internal test ONLY.
-            Use this option to advertise in a specific random address.
 endmenu

examples/bluetooth/nimble/ble_chan_sound_initiator/main/ble_chan_initiator.h

@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+* SPDX-License-Identifier: Unlicense OR CC0-1.0
+*/
+
+#ifndef H_BLE_CHAN_INITIATOR_
+#define H_BLE_CHAN_INITIATOR_
+
+#include "modlog/modlog.h"
+#include "esp_central.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ble_hs_adv_fields;
+struct ble_gap_conn_desc;
+struct ble_hs_cfg;
+union ble_store_value;
+union ble_store_key;
+
+
+#define BLE_HCI_LE_CS_SUBEVENT_DONE_STATUS_COMPLETE   0x0
+#define BLE_HCI_LE_CS_SUBEVENT_DONE_STATUS_PARTIAL   0x1
+#define BLE_HCI_LE_CS_SUBEVENT_DONE_STATUS_ABORTED   0xF
+
+#define LOCAL_PROCEDURE_MEM  1024  // Replace with an appropriate constant value
+struct ble_hs_cfg;
+struct ble_gatt_register_ctxt;
+
+/** GATT server. */
+
+#define BLE_UUID_RANGING_SERVICE_VAL (0x185B)
+
+/** @brief UUID of the RAS Features Characteristic. **/
+#define BLE_UUID_RAS_FEATURES_VAL (0x2C14)
+
+/** @brief UUID of the Real-time Ranging Data Characteristic. **/
+#define BLE_UUID_RAS_REALTIME_RD_VAL (0x2C15)
+
+/** @brief UUID of the On-demand Ranging Data Characteristic. **/
+#define BLE_UUID_RAS_ONDEMAND_RD_VAL (0x2C16)
+
+/** @brief UUID of the RAS Control Point Characteristic. **/
+#define BLE_UUID_RAS_CP_VAL (0x2C17)
+
+/** @brief UUID of the Ranging Data Ready Characteristic. **/
+#define BLE_UUID_RAS_RD_READY_VAL (0x2C18)
+
+/** @brief UUID of the Ranging Data Overwritten Characteristic. **/
+#define BLE_UUID_RAS_RD_OVERWRITTEN_VAL (0x2C19)
+
+void gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg);
+int gatt_svr_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif