Просмотр исходного кода

Nimble: Update example configuration to enable ext adv feature only for BLE5.0 supported chips

Rahul Tank 3 лет назад
Родитель
Сommit
d89736babf

+ 1 - 1
components/bt/host/nimble/Kconfig.in

@@ -502,7 +502,7 @@ config BT_NIMBLE_MAX_CONN_REATTEMPT
 
 
 menuconfig BT_NIMBLE_50_FEATURE_SUPPORT
 menuconfig BT_NIMBLE_50_FEATURE_SUPPORT
     bool "Enable BLE 5 feature"
     bool "Enable BLE 5 feature"
-    depends on BT_NIMBLE_ENABLED
+    depends on BT_NIMBLE_ENABLED && (SOC_BLE_50_SUPPORTED || !BT_CONTROLLER_ENABLED)
     default y
     default y
     help
     help
             Enable BLE 5 feature
             Enable BLE 5 feature

+ 4 - 0
components/soc/esp32c2/include/soc/Kconfig.soc_caps.in

@@ -662,3 +662,7 @@ config SOC_BLE_MESH_SUPPORTED
 config SOC_ESP_NIMBLE_CONTROLLER
 config SOC_ESP_NIMBLE_CONTROLLER
     bool
     bool
     default y
     default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y

+ 1 - 0
components/soc/esp32c2/include/soc/soc_caps.h

@@ -308,3 +308,4 @@
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (0)    /*!< Support BLE MESH */
 #define SOC_BLE_MESH_SUPPORTED          (0)    /*!< Support BLE MESH */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */

+ 4 - 0
components/soc/esp32c3/include/soc/Kconfig.soc_caps.in

@@ -958,3 +958,7 @@ config SOC_BLE_SUPPORTED
 config SOC_BLE_MESH_SUPPORTED
 config SOC_BLE_MESH_SUPPORTED
     bool
     bool
     default y
     default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y

+ 1 - 0
components/soc/esp32c3/include/soc/soc_caps.h

@@ -417,3 +417,4 @@
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
+#define SOC_BLE_50_SUPPORTED		(1)    /*!< Support Bluetooth 5.0 */

+ 4 - 0
components/soc/esp32c6/include/soc/Kconfig.soc_caps.in

@@ -1182,3 +1182,7 @@ config SOC_BLE_MESH_SUPPORTED
 config SOC_ESP_NIMBLE_CONTROLLER
 config SOC_ESP_NIMBLE_CONTROLLER
     bool
     bool
     default y
     default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y

+ 1 - 0
components/soc/esp32c6/include/soc/soc_caps.h

@@ -494,3 +494,4 @@
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */

+ 4 - 0
components/soc/esp32h2/include/soc/Kconfig.soc_caps.in

@@ -1078,3 +1078,7 @@ config SOC_BLE_MESH_SUPPORTED
 config SOC_ESP_NIMBLE_CONTROLLER
 config SOC_ESP_NIMBLE_CONTROLLER
     bool
     bool
     default y
     default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y

+ 1 - 0
components/soc/esp32h2/include/soc/soc_caps.h

@@ -471,3 +471,4 @@
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */

+ 4 - 0
components/soc/esp32h4/include/soc/Kconfig.soc_caps.in

@@ -858,3 +858,7 @@ config SOC_BLE_MESH_SUPPORTED
 config SOC_ESP_NIMBLE_CONTROLLER
 config SOC_ESP_NIMBLE_CONTROLLER
     bool
     bool
     default y
     default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y

+ 1 - 0
components/soc/esp32h4/include/soc/soc_caps.h

@@ -402,3 +402,4 @@
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
 #define SOC_ESP_NIMBLE_CONTROLLER       (1)    /*!< Support BLE EMBEDDED controller V1 */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */

+ 4 - 0
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in

@@ -1230,3 +1230,7 @@ config SOC_BLE_SUPPORTED
 config SOC_BLE_MESH_SUPPORTED
 config SOC_BLE_MESH_SUPPORTED
     bool
     bool
     default y
     default y
+
+config SOC_BLE_50_SUPPORTED
+    bool
+    default y

+ 1 - 0
components/soc/esp32s3/include/soc/soc_caps.h

@@ -502,3 +502,4 @@
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 /*---------------------------------- Bluetooth CAPS ----------------------------------*/
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_SUPPORTED               (1)    /*!< Support Bluetooth Low Energy hardware */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
 #define SOC_BLE_MESH_SUPPORTED          (1)    /*!< Support BLE MESH */
+#define SOC_BLE_50_SUPPORTED            (1)    /*!< Support Bluetooth 5.0 */

+ 2 - 1
examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/Kconfig.projbuild

@@ -8,8 +8,9 @@ menu "Example Configuration"
 
 
     config EXAMPLE_EXTENDED_ADV
     config EXAMPLE_EXTENDED_ADV
         bool
         bool
+        depends on SOC_BLE_50_SUPPORTED
         default y if SOC_ESP_NIMBLE_CONTROLLER
         default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         prompt "Enable Extended Adv"
         help
         help
             Use this option to enable extended advertising in the example
             Use this option to enable extended advertising in the example

+ 2 - 1
examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/Kconfig.projbuild

@@ -50,8 +50,9 @@ menu "Example Configuration"
 
 
     config EXAMPLE_EXTENDED_ADV
     config EXAMPLE_EXTENDED_ADV
         bool
         bool
+        depends on SOC_BLE_50_SUPPORTED
         default y if SOC_ESP_NIMBLE_CONTROLLER
         default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         prompt "Enable Extended Adv"
         help
         help
             Use this option to enable extended advertising in the example
             Use this option to enable extended advertising in the example

+ 2 - 1
examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild

@@ -2,8 +2,9 @@ menu "Example Configuration"
 
 
     config EXAMPLE_EXTENDED_ADV
     config EXAMPLE_EXTENDED_ADV
         bool
         bool
+        depends on SOC_BLE_50_SUPPORTED
         default y if SOC_ESP_NIMBLE_CONTROLLER
         default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         prompt "Enable Extended Adv"
         help
         help
             Use this option to enable extended advertising in the example
             Use this option to enable extended advertising in the example

+ 2 - 1
examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild

@@ -1,8 +1,9 @@
 menu "Example Configuration"
 menu "Example Configuration"
     config EXAMPLE_EXTENDED_ADV
     config EXAMPLE_EXTENDED_ADV
         bool
         bool
+        depends on SOC_BLE_50_SUPPORTED
         default y if SOC_ESP_NIMBLE_CONTROLLER
         default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         prompt "Enable Extended Adv"
         help
         help
             Use this option to enable extended advertising in the example
             Use this option to enable extended advertising in the example

+ 2 - 1
examples/bluetooth/nimble/ble_phy/phy_cent/main/Kconfig.projbuild

@@ -8,8 +8,9 @@ menu "Example Configuration"
 
 
     config EXAMPLE_EXTENDED_ADV
     config EXAMPLE_EXTENDED_ADV
         bool
         bool
+        depends on SOC_BLE_50_SUPPORTED
         default y if SOC_ESP_NIMBLE_CONTROLLER
         default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         prompt "Enable Extended Adv"
         help
         help
             Use this option to enable extended advertising in the example
             Use this option to enable extended advertising in the example

+ 2 - 1
examples/bluetooth/nimble/ble_phy/phy_prph/main/Kconfig.projbuild

@@ -47,8 +47,9 @@ menu "Example Configuration"
 
 
     config EXAMPLE_EXTENDED_ADV
     config EXAMPLE_EXTENDED_ADV
         bool
         bool
+        depends on SOC_BLE_50_SUPPORTED
         default y if SOC_ESP_NIMBLE_CONTROLLER
         default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         prompt "Enable Extended Adv"
         help
         help
             Use this option to enable extended advertising in the example
             Use this option to enable extended advertising in the example

+ 2 - 1
examples/bluetooth/nimble/blecent/main/Kconfig.projbuild

@@ -8,8 +8,9 @@ menu "Example Configuration"
 
 
     config EXAMPLE_EXTENDED_ADV
     config EXAMPLE_EXTENDED_ADV
         bool
         bool
+        depends on SOC_BLE_50_SUPPORTED
         default y if SOC_ESP_NIMBLE_CONTROLLER
         default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         prompt "Enable Extended Adv"
         help
         help
             Use this option to enable extended advertising in the example
             Use this option to enable extended advertising in the example

+ 2 - 1
examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild

@@ -50,8 +50,9 @@ menu "Example Configuration"
 
 
     config EXAMPLE_EXTENDED_ADV
     config EXAMPLE_EXTENDED_ADV
         bool
         bool
+        depends on SOC_BLE_50_SUPPORTED
         default y if SOC_ESP_NIMBLE_CONTROLLER
         default y if SOC_ESP_NIMBLE_CONTROLLER
-        select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER
+        select BT_NIMBLE_EXT_ADV
         prompt "Enable Extended Adv"
         prompt "Enable Extended Adv"
         help
         help
             Use this option to enable extended advertising in the example
             Use this option to enable extended advertising in the example