Merge branch 'main' of https://github.com/embassy-rs/embassy into timer

Author: xoviat

ci.sh

@@ -65,6 +65,7 @@ rm out/tests/pimoroni-pico-plus-2/pwm
 # flaky
 rm out/tests/rpi-pico/pwm
 rm out/tests/rpi-pico/cyw43-perf
+rm out/tests/rpi-pico/uart_buffered
 
 # tests are implemented but the HIL test farm doesn't actually have these boards, yet
 rm -rf out/tests/stm32c071rb

cyw43-pio/CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- next-header -->
 ## Unreleased - ReleaseDate
 
+## 0.9.0 - 2025-11-27
+
 - Select pio program based on core clock speed #4792
 
 ## 0.8.0 - 2025-08-28

cyw43-pio/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cyw43-pio"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2024"
 description = "RP2040 PIO SPI implementation for cyw43"
 keywords = ["embedded", "cyw43", "embassy-net", "embedded-hal-async", "wifi"]
@@ -10,8 +10,8 @@ repository = "https://github.com/embassy-rs/embassy"
 documentation = "https://docs.embassy.dev/cyw43-pio"
 
 [dependencies]
-cyw43 = { version = "0.5.0", path = "../cyw43" }
-embassy-rp = { version = "0.8.0", path = "../embassy-rp" }
+cyw43 = { version = "0.6.0", path = "../cyw43" }
+embassy-rp = { version = "0.9.0", path = "../embassy-rp" }
 fixed = "1.23.1"
 defmt = { version = "1.0.1", optional = true }
 

cyw43/CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- next-header -->
 ## Unreleased - ReleaseDate
 
+## 0.6.0 - 2025-11-27
+
 - Updated documentation for Control::join() #4678
 - Bump bt-hci to 0.6.0.
 - Add error handling to HCI transport implementation.

cyw43/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cyw43"
-version = "0.5.0"
+version = "0.6.0"
 edition = "2024"
 description = "Rust driver for the CYW43439 WiFi chip, used in the Raspberry Pi Pico W."
 keywords = ["embedded", "cyw43", "embassy-net", "embedded-hal-async", "wifi"]

embassy-boot-rp/CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- next-header -->
 ## Unreleased - ReleaseDate
 
+## 0.9.0 - 2025-11-27
+
 ## 0.8.0 - 2025-08-26
 
 ## 0.1.1 - 2025-08-15

embassy-boot-rp/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2024"
 name = "embassy-boot-rp"
-version = "0.8.0"
+version = "0.9.0"
 description = "Bootloader lib for RP2040 chips"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/embassy-rs/embassy"
@@ -31,7 +31,7 @@ defmt = { version = "1.0.1", optional = true }
 log = { version = "0.4", optional = true }
 
 embassy-sync = { version = "0.7.2", path = "../embassy-sync" }
-embassy-rp = { version = "0.8.0", path = "../embassy-rp", default-features = false }
+embassy-rp = { version = "0.9.0", path = "../embassy-rp", default-features = false }
 embassy-boot = { version = "0.6.1", path = "../embassy-boot" }
 embassy-time = { version = "0.5.0", path = "../embassy-time" }
 

embassy-net-nrf91/Cargo.toml

@@ -18,7 +18,7 @@ log = ["dep:log"]
 defmt = { version = "1.0.1", optional = true }
 log = { version = "0.4.14", optional = true }
 
-nrf-pac = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-pac.git", rev = "58198c23bce72edc10b4e1656d1b54441fc74e7c" }
+nrf-pac = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-pac.git", rev = "176dc4afe1dd8df78f3cbda4479ab5151aa32252" }
 cortex-m = "0.7.7"
 
 embassy-time = { version = "0.5.0", path = "../embassy-time" }

embassy-nrf/CHANGELOG.md

@@ -8,7 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- next-header -->
 ## Unreleased - ReleaseDate
 
-- added: Add basic RTC support for nRF54L
 - changed: apply trimming values from FICR.TRIMCNF on nrf53/54l
 - changed: do not panic on BufferedUarte overrun
 - added: allow direct access to the input pin of `gpiote::InputChannel`
@@ -29,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bugfix: use correct flash size for nRF54l
 - changed: add workaround for anomaly 66 on nrf52
 - added: expose PPI events available on SPIS peripheral
+- added: add basic GRTC time driver support for nRF54L
 
 ## 0.8.0 - 2025-09-30
 

embassy-nrf/Cargo.toml

@@ -23,8 +23,8 @@ build = [
     {target = "thumbv8m.main-none-eabihf", features = ["gpiote", "nrf5340-app-s", "time", "time-driver-rtc1"]},
     {target = "thumbv8m.main-none-eabihf", features = ["gpiote", "nrf5340-app-ns", "time", "time-driver-rtc1"]},
     {target = "thumbv8m.main-none-eabihf", features = ["gpiote", "nrf5340-net", "time", "time-driver-rtc1"]},
-    {target = "thumbv8m.main-none-eabihf", features = ["gpiote", "nrf54l15-app-s", "time", "time-driver-rtc1"]},
-    {target = "thumbv8m.main-none-eabihf", features = ["gpiote", "nrf54l15-app-ns", "time", "time-driver-rtc1"]},
+    {target = "thumbv8m.main-none-eabihf", features = ["gpiote", "nrf54l15-app-s", "time", "time-driver-grtc"]},
+    {target = "thumbv8m.main-none-eabihf", features = ["gpiote", "nrf54l15-app-ns", "time", "time-driver-grtc"]},
     {target = "thumbv7em-none-eabi", features = ["gpiote", "nrf52840", "time"]},
     {target = "thumbv7em-none-eabi", features = ["gpiote", "nrf52840", "time-driver-rtc1"]},
     {target = "thumbv7em-none-eabi", features = ["gpiote", "nrf52840", "time", "time-driver-rtc1"]},
@@ -80,9 +80,10 @@ unstable-pac = []
 gpiote = []
 
 ## Use RTC1 as the time driver for `embassy-time`, with a tick rate of 32.768khz
-## 
-## Note: For nRF54L, it's actually RTC30
-time-driver-rtc1 = ["_time-driver"]
+time-driver-rtc1 = ["_time-driver", "embassy-time-driver?/tick-hz-32_768"]
+
+## Use GRTC (CC n=1, GRTC_1 irq) as the time driver for `embassy-time`, with a tick rate of 1 MHz
+time-driver-grtc = ["_time-driver", "embassy-time-driver?/tick-hz-1_000_000"]
 
 ## Enable embassy-net 802.15.4 driver
 net-driver = ["_net-driver"]
@@ -152,15 +153,15 @@ _nrf5340-net = ["_nrf5340", "nrf-pac/nrf5340-net"]
 _nrf5340 = ["_gpio-p1", "_dppi"]
 _nrf54l15-app = ["_nrf54l15", "nrf-pac/nrf54l15-app"]
 _nrf54l15 = ["_nrf54l", "_gpio-p1", "_gpio-p2"]
-_nrf54l = ["_dppi"]
+_nrf54l = ["_dppi", "_grtc"]
 
 _nrf9160 = ["nrf-pac/nrf9160", "_dppi", "_spi-v1"]
 _nrf9120 = ["nrf-pac/nrf9120", "_dppi", "_spi-v1"]
 _nrf52 = ["_ppi"]
 _nrf51 = ["_ppi", "_spi-v1"]
 _nrf91 = []
 
-_time-driver = ["dep:embassy-time-driver", "embassy-time-driver?/tick-hz-32_768", "dep:embassy-time-queue-utils", "embassy-embedded-hal/time"]
+_time-driver = ["dep:embassy-time-driver", "dep:embassy-time-queue-utils", "embassy-embedded-hal/time"]
 
 _net-driver = ["dep:embassy-net-driver-channel","dep:embassy-futures"]
 
@@ -173,6 +174,7 @@ _dppi = []
 _gpio-p1 = []
 _gpio-p2 = []
 _spi-v1 = []
+_grtc = []
 
 # Errata workarounds
 _nrf52832_anomaly_109 = []
@@ -200,7 +202,7 @@ embedded-io-async = { version = "0.6.1" }
 rand-core-06 = { package = "rand_core", version = "0.6" }
 rand-core-09 = { package = "rand_core", version = "0.9" }
 
-nrf-pac = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-pac.git", rev = "58198c23bce72edc10b4e1656d1b54441fc74e7c" }
+nrf-pac = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-pac.git", rev = "176dc4afe1dd8df78f3cbda4479ab5151aa32252" }
 
 defmt = { version = "1.0.1", optional = true }
 bitflags = "2.4.2"