Merge a0eca21 into b15e1ef

micropython · Jun 5, 2021 · 301d5ce · 301d5ce
2 parents b15e1ef + a0eca21
commit 301d5ce
Show file tree

Hide file tree

Showing 8 changed files with 438 additions and 4 deletions.
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
@@ -40,6 +40,7 @@ set(MICROPY_SOURCE_PORT
     machine_i2c.c
     machine_pin.c
     machine_uart.c
+    modbluetooth_zephyr.c
     modmachine.c
     moduos.c
     modusocket.c

diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
@@ -1,2 +1,6 @@
 CONFIG_CONSOLE_SUBSYS=n
 CONFIG_NETWORKING=n
+CONFIG_BT=y
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
@@ -49,6 +49,7 @@
 #include "py/stackctrl.h"
 #include "lib/utils/pyexec.h"
 #include "lib/mp-readline/readline.h"
+#include "extmod/modbluetooth.h"
 
 #if MICROPY_VFS
 #include "extmod/vfs.h"
@@ -168,6 +169,9 @@ int real_main(void) {
 
     printf("soft reboot\n");
 
+    #if MICROPY_PY_BLUETOOTH
+    mp_bluetooth_deinit();
+    #endif
     #if MICROPY_PY_MACHINE
     machine_pin_deinit();
     #endif