[Demo] [ESP32] Enable the BLE stack and get the code to compile (#1241)

project-chip · Jun 27, 2020 · d15fa87 · d15fa87
1 parent 57b87c5
commit d15fa87
Show file tree

Hide file tree

Showing 14 changed files with 177 additions and 206 deletions.
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -487,8 +487,8 @@ menu "CHIP Device Layer"
 
     menu "BLE Options"
 
-        config ENABLE_WOBLE
-            bool "Enable CHIP-over-BLE (WoBLE) Support"
+        config ENABLE_CHIPOBLE
+            bool "Enable CHIP-over-BLE (CHIPoBLE) Support"
             default y
             help
                 Enables support for sending and receiving CHIP messages over a BLE connection.
@@ -500,7 +500,7 @@ menu "CHIP Device Layer"
         config BLE_DEVICE_NAME_PREFIX
             string "BLE Device Name Prefix"
             default "CHIP-"
-            depends on ENABLE_WOBLE
+            depends on ENABLE_CHIPOBLE
             help
                 A prefix string used in forming the BLE device name.  The remainder of the name
                 consists of the final two bytes of the device's CHIP node id in hex.
@@ -512,32 +512,32 @@ menu "CHIP Device Layer"
         config BLE_FAST_ADVERTISING_INTERVAL
             int "Fast Advertising Interval"
             default 800
-            depends on ENABLE_WOBLE
+            depends on ENABLE_CHIPOBLE
             help
                 The interval (in units of 0.625ms) at which the device will send BLE advertisements while
                 in fast advertising mode.
 
         config BLE_SLOW_ADVERTISING_INTERVAL
             int "Slow Advertising Interval"
             default 3200
-            depends on ENABLE_WOBLE
+            depends on ENABLE_CHIPOBLE
             help
                 The interval (in units of 0.625ms) at which the device will send BLE advertisements while
                 in slow advertising mode.
 
-        config WOBLE_SINGLE_CONNECTION
+        config CHIPOBLE_SINGLE_CONNECTION
             bool "Single Connection Mode"
             default n
-            depends on ENABLE_WOBLE
+            depends on ENABLE_CHIPOBLE
             help
                 Limit support for CHIP-over-BLE (WoBLE) to a single inbound connection.
 
                 When set, WoBLE advertisements will stop while a WoBLE connection is active.
 
-        config WOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED
+        config CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED
             bool "Disable Advertising when Provisioned"
             default n
-            depends on ENABLE_WOBLE
+            depends on ENABLE_CHIPOBLE
             help
                 Automatically disable CHIP-over-BLE (WoBLE) advertising when the device transitions
                 to a fully provisioned state.

diff --git a/examples/wifi-echo/server/esp32/sdkconfig.defaults b/examples/wifi-echo/server/esp32/sdkconfig.defaults
@@ -27,6 +27,9 @@ CONFIG_ESPTOOLPY_COMPRESSED=y
 CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 
+#enable BT
+CONFIG_BT_ENABLED=y
+
 #enable lwip ipv6 autoconfig
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
 

diff --git a/examples/wifi-echo/server/esp32/sdkconfig_devkit.defaults b/examples/wifi-echo/server/esp32/sdkconfig_devkit.defaults
@@ -28,6 +28,9 @@ CONFIG_ESPTOOLPY_COMPRESSED=y
 CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 
+#enable BT
+CONFIG_BT_ENABLED=y
+
 #enable lwip ipv6 autoconfig
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
 

diff --git a/examples/wifi-echo/server/esp32/sdkconfig_m5stack.defaults b/examples/wifi-echo/server/esp32/sdkconfig_m5stack.defaults
@@ -28,6 +28,9 @@ CONFIG_ESPTOOLPY_COMPRESSED=y
 CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 
+#enable BT
+CONFIG_BT_ENABLED=y
+
 #enable lwip ipv6 autoconfig
 CONFIG_LWIP_IPV6_AUTOCONFIG=y