diff --git a/components/bt/include/esp32c2/include/esp_bt.h b/components/bt/include/esp32c2/include/esp_bt.h index a92bda8f08..6a5ce5a1d6 100644 --- a/components/bt/include/esp32c2/include/esp_bt.h +++ b/components/bt/include/esp32c2/include/esp_bt.h @@ -73,26 +73,26 @@ typedef enum { } esp_ble_power_type_t; /** - * @brief Bluetooth TX power level(index), it's just a index corresponding to power(dbm). + * @brief Bluetooth TX power level(index), it's just a index corresponding to power(dBm). */ typedef enum { - ESP_PWR_LVL_N24 = 0, /*!< Corresponding to -24dbm */ - ESP_PWR_LVL_N21 = 1, /*!< Corresponding to -21dbm */ - ESP_PWR_LVL_N18 = 2, /*!< Corresponding to -18dbm */ - ESP_PWR_LVL_N15 = 3, /*!< Corresponding to -15dbm */ - ESP_PWR_LVL_N12 = 4, /*!< Corresponding to -12dbm */ - ESP_PWR_LVL_N9 = 5, /*!< Corresponding to -9dbm */ - ESP_PWR_LVL_N6 = 6, /*!< Corresponding to -6dbm */ - ESP_PWR_LVL_N3 = 7, /*!< Corresponding to -3dbm */ - ESP_PWR_LVL_N0 = 8, /*!< Corresponding to 0dbm */ - ESP_PWR_LVL_P3 = 9, /*!< Corresponding to +3dbm */ - ESP_PWR_LVL_P6 = 10, /*!< Corresponding to +6dbm */ - ESP_PWR_LVL_P9 = 11, /*!< Corresponding to +9dbm */ - ESP_PWR_LVL_P12 = 12, /*!< Corresponding to +12dbm */ - ESP_PWR_LVL_P15 = 13, /*!< Corresponding to +15dbm */ - ESP_PWR_LVL_P18 = 14, /*!< Corresponding to +18dbm */ - ESP_PWR_LVL_P20 = 15, /*!< Corresponding to +20dbm */ - ESP_PWR_LVL_P21 = 15, /*!< Corresponding to +20dbm, this enum variable has been deprecated */ + ESP_PWR_LVL_N24 = 0, /*!< Corresponding to -24 dBm */ + ESP_PWR_LVL_N21 = 1, /*!< Corresponding to -21 dBm */ + ESP_PWR_LVL_N18 = 2, /*!< Corresponding to -18 dBm */ + ESP_PWR_LVL_N15 = 3, /*!< Corresponding to -15 dBm */ + ESP_PWR_LVL_N12 = 4, /*!< Corresponding to -12 dBm */ + ESP_PWR_LVL_N9 = 5, /*!< Corresponding to -9 dBm */ + ESP_PWR_LVL_N6 = 6, /*!< Corresponding to -6 dBm */ + ESP_PWR_LVL_N3 = 7, /*!< Corresponding to -3 dBm */ + ESP_PWR_LVL_N0 = 8, /*!< Corresponding to 0 dBm */ + ESP_PWR_LVL_P3 = 9, /*!< Corresponding to +3 dBm */ + ESP_PWR_LVL_P6 = 10, /*!< Corresponding to +6 dBm */ + ESP_PWR_LVL_P9 = 11, /*!< Corresponding to +9 dBm */ + ESP_PWR_LVL_P12 = 12, /*!< Corresponding to +12 dBm */ + ESP_PWR_LVL_P15 = 13, /*!< Corresponding to +15 dBm */ + ESP_PWR_LVL_P18 = 14, /*!< Corresponding to +18 dBm */ + ESP_PWR_LVL_P20 = 15, /*!< Corresponding to +20 dBm */ + ESP_PWR_LVL_P21 = 15, /*!< Corresponding to +20 dBm, this enum variable has been deprecated */ ESP_PWR_LVL_INVALID = 0xFF, /*!< Indicates an invalid value */ } esp_power_level_t; @@ -128,7 +128,7 @@ typedef struct { * @brief Set BLE TX power * Connection Tx power should only be set after connection created. * @param power_type : The type of which tx power, could set Advertising/Connection/Default and etc - * @param power_level: Power level(index) corresponding to absolute value(dbm) + * @param power_level: Power level(index) corresponding to absolute value(dBm) * @return ESP_OK - success, other - failed */ esp_err_t esp_ble_tx_power_set(esp_ble_power_type_t power_type, esp_power_level_t power_level); @@ -146,7 +146,7 @@ esp_power_level_t esp_ble_tx_power_get(esp_ble_power_type_t power_type); * Connection Tx power should only be set after connection created. * @param power_type : The enhanced type of which tx power, could set Advertising/Connection/Default and etc * @param handle : The handle of Advertising or Connection and the value 0 for other enhanced power types. - * @param power_level: Power level(index) corresponding to absolute value(dbm) + * @param power_level: Power level(index) corresponding to absolute value(dBm) * @return ESP_OK - success, other - failed */ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle, esp_power_level_t power_level); diff --git a/examples/bluetooth/.build-test-rules.yml b/examples/bluetooth/.build-test-rules.yml index 925a95dbcd..8ff28bdbca 100644 --- a/examples/bluetooth/.build-test-rules.yml +++ b/examples/bluetooth/.build-test-rules.yml @@ -18,16 +18,9 @@ examples/bluetooth: examples/bluetooth/bluedroid/ble: <<: *bt_default_depends disable: - - if: SOC_BT_SUPPORTED != 1 - depends_components: - - bt - - esp_phy - - nvs_flash - - esp_coex - - esp_log + - if: SOC_BLE_SUPPORTED != 1 + depends_components+: - esp_console - - mbedtls - - vfs - esp_driver_gpio - esp_driver_i2s - esp_driver_uart @@ -35,24 +28,18 @@ examples/bluetooth/bluedroid/ble: - examples/bluetooth/bluedroid/ble/pytest_ble_test.py examples/bluetooth/bluedroid/ble/ble_hid_device_demo: + <<: *bt_default_depends disable: - - if: SOC_BT_SUPPORTED != 1 - depends_components: + - if: SOC_BLE_SUPPORTED != 1 + depends_components+: - esp_driver_gpio examples/bluetooth/bluedroid/ble/ble_throughput: <<: *bt_default_depends disable: - - if: SOC_BT_SUPPORTED != 1 - depends_components: - - bt - - esp_phy - - nvs_flash - - esp_coex - - esp_log + - if: SOC_BLE_SUPPORTED != 1 + depends_components+: - esp_console - - mbedtls - - vfs - esp_driver_gpio - esp_driver_i2s - esp_driver_uart @@ -63,15 +50,8 @@ examples/bluetooth/bluedroid/ble_50: <<: *bt_default_depends disable: - if: SOC_BLE_50_SUPPORTED != 1 - depends_components: - - bt - - esp_phy - - nvs_flash - - esp_coex - - esp_log + depends_components+: - esp_console - - mbedtls - - vfs - esp_driver_gpio - esp_driver_i2s - esp_driver_uart @@ -79,18 +59,16 @@ examples/bluetooth/bluedroid/ble_50: - examples/bluetooth/bluedroid/ble_50/pytest_ble50_test.py examples/bluetooth/bluedroid/classic_bt: + <<: *bt_default_depends disable: - if: SOC_BT_CLASSIC_SUPPORTED != 1 - depends_components: - - bt - - esp_phy - - nvs_flash - - esp_log + depends_components+: - esp_console - - vfs - esp_driver_gpio - esp_driver_i2s - esp_driver_uart + depends_components-: + - mbedtls depends_filepatterns: - components/driver/dac/**/* - examples/bluetooth/bluedroid/esp_hid_host/**/* @@ -103,73 +81,73 @@ examples/bluetooth/bluedroid/coex/a2dp_gatts_coex: - if: IDF_TARGET != "esp32" temporary: true reason: the other targets are not tested yet - depends_components: + depends_components+: - esp_driver_i2s depends_filepatterns: - components/driver/dac/**/* examples/bluetooth/blufi: + <<: *bt_default_depends disable: - if: SOC_BT_SUPPORTED != 1 - if: SOC_WIFI_SUPPORTED != 1 - depends_components: - - bt - - esp_phy - - nvs_flash - - esp_log + depends_components+: - esp_console - - vfs - esp_wifi - esp_event - - mbedtls examples/bluetooth/esp_ble_mesh: + <<: *bt_default_depends disable: - if: SOC_BLE_MESH_SUPPORTED != 1 # limit build configs - if: CI_COMMIT_REF_NAME == "master" and (NIGHTLY_RUN == 0 and CONFIG_NAME not in ["default", "bluedroid", "nimble"]) - depends_components: - - bt - - esp_phy + depends_components+: - esp_console - - vfs - - mbedtls - touch_element - esp_driver_gpio + depends_components-: + - esp_coex depends_filepatterns: - examples/bluetooth/esp_ble_mesh/common_components/**/* examples/bluetooth/esp_ble_mesh/wifi_coexist: + <<: *bt_default_depends disable: - if: SOC_BLE_MESH_SUPPORTED != 1 - if: SOC_WIFI_SUPPORTED != 1 - depends_components: - - bt - - esp_phy + depends_components+: - esp_console - - vfs - - mbedtls - - esp_coex - esp_wifi - esp_netif - esp_driver_gpio depends_filepatterns: - examples/bluetooth/esp_ble_mesh/common_components/**/* +examples/bluetooth/esp_hid_device: + <<: *bt_default_depends + disable: + - if: SOC_BT_SUPPORTED != 1 + depends_components+: + - esp_hid + examples/bluetooth/esp_hid_host: + <<: *bt_default_depends disable_test: - if: IDF_TARGET != "esp32" temporary: true reason: temporarily test esp32 disable: - if: SOC_BT_SUPPORTED != 1 + depends_components+: + - esp_hid -examples/bluetooth/hci: +examples/bluetooth/hci/ble_adv_scan_combined: <<: *bt_default_depends - enable: - - if: IDF_TARGET == "esp32" - temporary: true - reason: the other targets are not tested yet + disable: + - if: SOC_BLE_SUPPORTED != 1 + depends_components+: + - esp_driver_uart depends_filepatterns: - examples/bluetooth/hci/hci_common_component/**/* @@ -177,15 +155,28 @@ examples/bluetooth/hci/controller_hci_uart_esp32: <<: *bt_default_depends enable: - if: IDF_TARGET == "esp32" - depends_components: + depends_components+: - esp_driver_uart + depends_filepatterns: + - examples/bluetooth/hci/hci_common_component/**/* examples/bluetooth/hci/controller_hci_uart_esp32c3_and_esp32s3: <<: *bt_default_depends enable: - if: IDF_TARGET in ["esp32c3", "esp32s3"] - depends_components: + depends_components+: - esp_driver_uart + depends_filepatterns: + - examples/bluetooth/hci/hci_common_component/**/* + +examples/bluetooth/hci/controller_vhci_ble_adv: + <<: *bt_default_depends + disable: + - if: SOC_BLE_SUPPORTED != 1 + depends_components+: + - esp_driver_uart + depends_filepatterns: + - examples/bluetooth/hci/hci_common_component/**/* # config BT_NIMBLE_ENABLED does not depends on any soc cap @@ -257,9 +248,7 @@ examples/bluetooth/nimble/blecent: <<: *bt_default_depends disable: - if: SOC_BLE_SUPPORTED != 1 - depends_components: - - bt - - esp_phy + depends_components+: - esp_event - esp_coex - esp_pm @@ -279,17 +268,15 @@ examples/bluetooth/nimble/blemesh: - examples/bluetooth/nimble/common/**/* examples/bluetooth/nimble/bleprph_wifi_coex: + <<: *bt_default_depends disable: - if: SOC_BLE_SUPPORTED != 1 - if: SOC_WIFI_SUPPORTED != 1 - depends_components: - - bt - - esp_phy + depends_components+: - esp_event - esp_hid - esp_wifi - esp_coex - - nvs_flash - lwip depends_filepatterns: - examples/bluetooth/nimble/common/**/* @@ -305,9 +292,7 @@ examples/bluetooth/nimble/power_save: <<: *bt_default_depends disable: - if: SOC_BLE_SUPPORTED != 1 - depends_components: - - bt - - esp_phy + depends_components+: - esp_event - esp_coex - esp_pm @@ -321,22 +306,18 @@ examples/bluetooth/nimble/throughput_app: <<: *bt_default_depends disable: - if: SOC_BLE_SUPPORTED != 1 - depends_components: + depends_components+: - esp_driver_gpio - esp_driver_uart depends_filepatterns: - examples/bluetooth/nimble/common/**/* - examples/bluetooth/nimble/throughput_app/blecent_throughput/components/**/* -# Remove this special case for esp32c5 after IDF-8638 examples/bluetooth/nimble/throughput_app/blecent_throughput: <<: *bt_default_depends disable: - if: SOC_BLE_SUPPORTED != 1 - - if: IDF_TARGET == "esp32c5" - temporary: true - reason: c5 build failed. Fix in IDF-8638 - depends_components: + depends_components+: - esp_driver_gpio - esp_driver_uart depends_filepatterns: diff --git a/examples/bluetooth/hci/ble_adv_scan_combined/README.md b/examples/bluetooth/hci/ble_adv_scan_combined/README.md index cbbcadd91a..20ea4ac560 100644 --- a/examples/bluetooth/hci/ble_adv_scan_combined/README.md +++ b/examples/bluetooth/hci/ble_adv_scan_combined/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | -| ----------------- | ----- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | ESP-IDF Combined Bluetooth advertising and scanning =================================================== diff --git a/examples/bluetooth/hci/controller_vhci_ble_adv/README.md b/examples/bluetooth/hci/controller_vhci_ble_adv/README.md index ae6fb26dec..7feb7000d1 100644 --- a/examples/bluetooth/hci/controller_vhci_ble_adv/README.md +++ b/examples/bluetooth/hci/controller_vhci_ble_adv/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | -| ----------------- | ----- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | ESP-IDF VHCI ble_advertising app ================================ diff --git a/examples/bluetooth/nimble/throughput_app/blecent_throughput/README.md b/examples/bluetooth/nimble/throughput_app/blecent_throughput/README.md index a79da33136..e963e8fdd6 100644 --- a/examples/bluetooth/nimble/throughput_app/blecent_throughput/README.md +++ b/examples/bluetooth/nimble/throughput_app/blecent_throughput/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | # Throughput blecent Example