Merge pull request #10943 from FoamyGuy/zephyr_bus_device

tannewt · web-flow · commit 75659f717de4 · 2026-04-15T09:37:59.000-07:00
Enable adafruit_bus_device in Zephyr port
diff --git a/ports/zephyr-cp/boards/adafruit/feather_nrf52840_sense_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_sense_zephyr/autogen_board_info.toml
@@ -8,9 +8,9 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
-aesio = false
+aesio = true
 alarm = false
 analogbufio = false
 analogio = false
@@ -63,15 +63,15 @@ keypad = false
 keypad_demux = false
 locale = false
 lvfontio = true # Zephyr board has busio
-math = false
+math = true
 max3421e = false
 mcp4822 = false
 mdns = false
 memorymap = false
 memorymonitor = false
 microcontroller = true
 mipidsi = false
-msgpack = false
+msgpack = true
 neopixel_write = false
 nvm = true # Zephyr board has nvm
 onewireio = false
diff --git a/ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/adafruit/feather_nrf52840_zephyr/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/adafruit/feather_rp2040_zephyr/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/native/native_sim/autogen_board_info.toml b/ports/zephyr-cp/boards/native/native_sim/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/native/nrf5340bsim/autogen_board_info.toml b/ports/zephyr-cp/boards/native/nrf5340bsim/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/nordic/nrf5340dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf5340dk/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/nordic/nrf54h20dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf54h20dk/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/nordic/nrf54l15dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf54l15dk/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml b/ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml
@@ -117,4 +117,4 @@ watchdog = false
 wifi = true # Zephyr board has wifi
 zephyr_display = false
 zephyr_kernel = false
-zlib = true
+zlib = false
diff --git a/ports/zephyr-cp/boards/nordic/nrf7002dk/circuitpython.toml b/ports/zephyr-cp/boards/nordic/nrf7002dk/circuitpython.toml
@@ -2,4 +2,4 @@ CIRCUITPY_BUILD_EXTENSIONS = ["elf"]
 USB_VID=0x239A
 USB_PID=0x8168
 BLOBS=["nrf_wifi"]
-DISABLED_MODULES=["aesio"]
+DISABLED_MODULES=["aesio", "adafruit_bus_device", "zlib"]
diff --git a/ports/zephyr-cp/boards/nxp/frdm_mcxn947/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/frdm_mcxn947/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/nxp/frdm_rw612/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/frdm_rw612/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml b/ports/zephyr-cp/boards/nxp/mimxrt1170_evk/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_w_zephyr/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/raspberrypi/rpi_pico2_zephyr/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_w_zephyr/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/autogen_board_info.toml b/ports/zephyr-cp/boards/raspberrypi/rpi_pico_zephyr/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/renesas/da14695_dk_usb/autogen_board_info.toml b/ports/zephyr-cp/boards/renesas/da14695_dk_usb/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/renesas/ek_ra6m5/autogen_board_info.toml b/ports/zephyr-cp/boards/renesas/ek_ra6m5/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/renesas/ek_ra8d1/autogen_board_info.toml b/ports/zephyr-cp/boards/renesas/ek_ra8d1/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/st/nucleo_n657x0_q/autogen_board_info.toml b/ports/zephyr-cp/boards/st/nucleo_n657x0_q/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/st/nucleo_u575zi_q/autogen_board_info.toml b/ports/zephyr-cp/boards/st/nucleo_u575zi_q/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/st/stm32h750b_dk/autogen_board_info.toml b/ports/zephyr-cp/boards/st/stm32h750b_dk/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/st/stm32h7b3i_dk/autogen_board_info.toml b/ports/zephyr-cp/boards/st/stm32h7b3i_dk/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/boards/st/stm32wba65i_dk1/autogen_board_info.toml b/ports/zephyr-cp/boards/st/stm32wba65i_dk1/autogen_board_info.toml
@@ -8,7 +8,7 @@ _eve = false
 _pew = false
 _pixelmap = false
 _stage = false
-adafruit_bus_device = false
+adafruit_bus_device = true
 adafruit_pixelbuf = false
 aesio = true
 alarm = false
diff --git a/ports/zephyr-cp/cptools/build_circuitpython.py b/ports/zephyr-cp/cptools/build_circuitpython.py
@@ -64,6 +64,7 @@
     "aesio",
     "hashlib",
     "zlib",
+    "adafruit_bus_device",
 ]
 # Flags that don't match with with a *bindings module. Some used by adafruit_requests
 MPCONFIG_FLAGS = ["array", "errno", "io", "json", "math"]
@@ -558,8 +559,8 @@ async def build_circuitpython():
             hal_source.extend(top.glob(f"ports/zephyr-cp/common-hal/{module.name}/*.c"))
             # Only include shared-module/*.c if no common-hal/*.c files were found
             if len(hal_source) == len_before or module.name in SHARED_MODULE_AND_COMMON_HAL:
-                hal_source.extend(top.glob(f"shared-module/{module.name}/*.c"))
-            hal_source.extend(top.glob(f"shared-bindings/{module.name}/*.c"))
+                hal_source.extend(top.glob(f"shared-module/{module.name}/**/*.c"))
+            hal_source.extend(top.glob(f"shared-bindings/{module.name}/**/*.c"))
             if module.name in LIBRARY_SOURCE:
                 for library_source in LIBRARY_SOURCE[module.name]:
                     library_sources.extend(top.glob(library_source))
diff --git a/ports/zephyr-cp/tests/test_adafruit_bus_device.py b/ports/zephyr-cp/tests/test_adafruit_bus_device.py
