Merge pull request #10833 from tannewt/zephyr_bleio

Add basic _bleio implementation for zephyr-cp port

Author: dhalbert

.github/workflows/run-tests.yml

@@ -95,5 +95,10 @@ jobs:
         uses: ./.github/actions/deps/external
       - name: Build native sim target
         run: make -C ports/zephyr-cp -j2 BOARD=native_native_sim
+      - name: Build bsim
+        run: make -j 2 everything
+        working-directory: ports/zephyr-cp/tools/bsim
+      - name: Build native_nrf5340bsim
+        run: make -C ports/zephyr-cp -j2 BOARD=native_nrf5340bsim
       - name: Run Zephyr tests
         run: make -C ports/zephyr-cp test

.gitignore

@@ -110,3 +110,6 @@ TAGS
 
 # windsurf rules
 .windsurfrules
+
+# git-review-web outputs
+.review

AGENTS.md

@@ -0,0 +1,3 @@
+- Capture CircuitPython output by finding the matching device in `/dev/serial/by-id`
+- You can mount the CIRCUITPY drive by doing `udisksctl mount -b /dev/disk/by-label/CIRCUITPY` and access it via `/run/media/<user>/CIRCUITPY`.
+- `circup` is a command line tool to install libraries and examples to CIRCUITPY.

conf.py

@@ -192,7 +192,12 @@ def autoapi_prepare_jinja_env(jinja_env):
     # Port READMEs in various formats
     "ports/*/README*",
 ]
-exclude_patterns = ["docs/autoapi/templates/**", "docs/README.md"]
+exclude_patterns = [
+    "docs/autoapi/templates/**",
+    "docs/README.md",
+    "AGENTS.md",
+    "**/AGENTS.md",
+]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.

locale/circuitpython.pot

@@ -1331,6 +1331,10 @@ msgstr ""
 msgid "Invalid ROS domain ID"
 msgstr ""
 
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
+msgid "Invalid advertising data"
+msgstr ""
+
 #: ports/espressif/common-hal/espidf/__init__.c py/moderrno.c
 msgid "Invalid argument"
 msgstr ""
@@ -3801,6 +3805,7 @@ msgid "non-hex digit"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "non-zero timeout must be > 0.01"
 msgstr ""
 
@@ -4284,6 +4289,7 @@ msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
 

ports/zephyr-cp/AGENTS.md

@@ -0,0 +1,5 @@
+- Build a board by doing `make BOARD=<vendor>_<board_name>`.
+- The corresponding configuration files are in `boards/<vendor>/<board_name>`
+- The files (not folders) in `boards/` directory are used by Zephyr.
+- To flash it on a board do `make BOARD=<vendor>_<board_name> flash`.
+- Zephyr board docs are at `zephyr/boards/<vendor>/<board_name>`.

ports/zephyr-cp/Kconfig.sysbuild

@@ -8,6 +8,7 @@ config NET_CORE_BOARD
     default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk"
     default "nrf7002dk/nrf5340/cpunet" if $(BOARD) = "nrf7002dk"
     default "nrf5340_audio_dk/nrf5340/cpunet" if $(BOARD) = "nrf5340_audio_dk"
+    default "nrf5340bsim/nrf5340/cpunet" if $(BOARD) = "nrf5340bsim"
 
 config NET_CORE_IMAGE_HCI_IPC
     bool "HCI IPC image on network core"

ports/zephyr-cp/Makefile

@@ -8,7 +8,8 @@ BUILD ?= build-$(BOARD)
 
 TRANSLATION ?= en_US
 
-.PHONY: $(BUILD)/zephyr-cp/zephyr/zephyr.elf flash debug run clean menuconfig all clean-all test fetch-port-submodules
+
+.PHONY: $(BUILD)/zephyr-cp/zephyr/zephyr.elf flash recover debug run clean menuconfig all clean-all test fetch-port-submodules
 
 $(BUILD)/zephyr-cp/zephyr/zephyr.elf:
 	python cptools/pre_zephyr_build_prep.py $(BOARD)
@@ -26,6 +27,9 @@ $(BUILD)/firmware.exe: $(BUILD)/zephyr-cp/zephyr/zephyr.elf
 flash: $(BUILD)/zephyr-cp/zephyr/zephyr.elf
 	west flash -d $(BUILD)
 
+recover: $(BUILD)/zephyr-cp/zephyr/zephyr.elf
+		west flash --recover -d $(BUILD)
+
 debug: $(BUILD)/zephyr-cp/zephyr/zephyr.elf
 	west debug -d $(BUILD)
 

ports/zephyr-cp/boards/board_aliases.cmake

@@ -1,13 +1,17 @@
 set(pca10056_BOARD_ALIAS nrf52840dk/nrf52840)
 set(renesas_ek_ra6m5_BOARD_ALIAS ek_ra6m5)
 set(renesas_ek_ra8d1_BOARD_ALIAS ek_ra8d1)
+set(renesas_da14695_dk_usb_BOARD_ALIAS da14695_dk_usb)
 set(native_native_sim_BOARD_ALIAS native_sim)
+set(native_nrf5340bsim_BOARD_ALIAS nrf5340bsim/nrf5340/cpuapp)
 set(nordic_nrf54l15dk_BOARD_ALIAS nrf54l15dk/nrf54l15/cpuapp)
 set(nordic_nrf54h20dk_BOARD_ALIAS nrf54h20dk/nrf54h20/cpuapp)
 set(nordic_nrf5340dk_BOARD_ALIAS nrf5340dk/nrf5340/cpuapp)
 set(nordic_nrf7002dk_BOARD_ALIAS nrf7002dk/nrf5340/cpuapp)
 set(nxp_frdm_mcxn947_BOARD_ALIAS frdm_mcxn947/mcxn947/cpu0)
+set(nxp_frdm_rw612_BOARD_ALIAS frdm_rw612)
 set(nxp_mimxrt1170_evk_BOARD_ALIAS mimxrt1170_evk@A/mimxrt1176/cm7)
 set(st_stm32h7b3i_dk_BOARD_ALIAS stm32h7b3i_dk)
+set(st_stm32wba65i_dk1_BOARD_ALIAS stm32wba65i_dk1)
 set(st_nucleo_u575zi_q_BOARD_ALIAS nucleo_u575zi_q/stm32u575xx)
 set(st_nucleo_n657x0_q_BOARD_ALIAS nucleo_n657x0_q/stm32n657xx)

ports/zephyr-cp/boards/da14695_dk_usb.conf

@@ -0,0 +1,20 @@
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_EXT_ADV=y
+
+CONFIG_BT_DEVICE_APPEARANCE_DYNAMIC=y
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_DEVICE_NAME_MAX=28
+CONFIG_BT_L2CAP_TX_MTU=253
+
+# BT Buffers
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_COUNT=3
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=1
+CONFIG_BT_BUF_ACL_RX_SIZE=255