From 8d5351b307e8eeec2ed27921ce4f6fde33a72cf3 Mon Sep 17 00:00:00 2001
From: chrysn <chrysn@fsfe.org>
Date: Tue, 25 Jun 2024 13:45:16 +0200
Subject: [PATCH] chore(Cargo): Update CoAP crates after PR branches were
 deleted

---
 Cargo.lock               | 462 ++++++++++++++++-----------------------
 Cargo.toml               |   3 -
 examples/coap/Cargo.toml |   8 +-
 3 files changed, 190 insertions(+), 283 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1815c9296..a955bd260 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -102,6 +102,15 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "as-slice"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516"
+dependencies = [
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "ascii-canvas"
 version = "3.0.0"
@@ -120,6 +129,18 @@ dependencies = [
  "critical-section",
 ]
 
+[[package]]
+name = "atomic-pool"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58c5fc22e05ec2884db458bf307dc7b278c9428888d2b6e6fad9c0ae7804f5f6"
+dependencies = [
+ "as-slice 0.1.5",
+ "as-slice 0.2.1",
+ "atomic-polyfill",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -247,12 +268,6 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
 
-[[package]]
-name = "bitfield"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c821a6e124197eb56d907ccc2188eab1038fb919c914f47976e64dd8dbc855d1"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -299,7 +314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d"
 dependencies = [
  "clap",
- "heck 0.4.1",
+ "heck",
  "indexmap 1.9.3",
  "log",
  "proc-macro2",
@@ -440,6 +455,7 @@ dependencies = [
 name = "coap"
 version = "0.1.0"
 dependencies = [
+ "arrayvec",
  "coap-handler",
  "coap-handler-implementations",
  "coap-message",
@@ -449,6 +465,7 @@ dependencies = [
  "coap-numbers",
  "coap-request",
  "coap-request-implementations",
+ "coap-scroll-ring-server",
  "embassy-executor",
  "embassy-futures",
  "embassy-net",
@@ -465,6 +482,7 @@ dependencies = [
  "minicbor 0.23.0",
  "riot-rs",
  "riot-rs-boards",
+ "scroll-ring",
  "smoltcp",
  "static-alloc",
 ]
@@ -577,6 +595,20 @@ dependencies = [
  "coap-request",
 ]
 
+[[package]]
+name = "coap-scroll-ring-server"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54221724caa364079527fcd8be89bc401f25921f0927e6574c934a8ecb9778a0"
+dependencies = [
+ "coap-handler",
+ "coap-handler-implementations",
+ "coap-message",
+ "coap-message-utils",
+ "coap-numbers",
+ "scroll-ring",
+]
+
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -716,6 +748,12 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -756,24 +794,25 @@ dependencies = [
 [[package]]
 name = "cyw43"
 version = "0.1.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59d6ec798758febb089bd969109385b48dd0fb966193fe97a5f0f8b2d622145e"
 dependencies = [
  "cortex-m",
  "cortex-m-rt",
  "embassy-futures",
  "embassy-net-driver-channel",
- "embassy-sync 0.6.0",
+ "embassy-sync 0.5.0",
  "embassy-time",
  "embedded-hal 1.0.0",
  "futures",
- "heapless 0.8.0",
  "num_enum",
 ]
 
 [[package]]
 name = "cyw43-pio"
 version = "0.1.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f429446fe9420ee0a8743fdffb1d08a90f9332116635bbc819f63649264e480c"
 dependencies = [
  "cyw43",
  "embassy-rp",
@@ -829,60 +868,6 @@ version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
 
-[[package]]
-name = "defmt"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a99dd22262668b887121d4672af5a64b238f026099f1a2a1b322066c9ecfe9e0"
-dependencies = [
- "bitflags 1.3.2",
- "defmt-macros",
-]
-
-[[package]]
-name = "defmt-macros"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9f309eff1f79b3ebdf252954d90ae440599c26c2c553fe87a2d17195f2dcb"
-dependencies = [
- "defmt-parser",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.67",
-]
-
-[[package]]
-name = "defmt-parser"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "defmt-rtt-target"
-version = "0.3.0"
-source = "git+https://github.com/kaspar030/defmt-rtt-target?rev=5668c92ac5a0689b165a6a07bb14e173fc47cd34#5668c92ac5a0689b165a6a07bb14e173fc47cd34"
-dependencies = [
- "cortex-m",
- "critical-section",
- "defmt",
- "rtt-target 0.5.0",
-]
-
-[[package]]
-name = "delegate"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.67",
-]
-
 [[package]]
 name = "der"
 version = "0.7.9"
@@ -1004,7 +989,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eca4a9380d03e61063067b8239f67d2fa9f108ede7c46b4273804f6b79e59a1d"
 dependencies = [
- "defmt",
  "embassy-futures",
  "embassy-sync 0.5.0",
  "embassy-time",
@@ -1019,7 +1003,7 @@ dependencies = [
 [[package]]
 name = "embassy-executor"
 version = "0.5.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-300424#6f3fc1ea35205f0327640804002128e5585518b6"
 dependencies = [
  "cortex-m",
  "critical-section",
@@ -1046,18 +1030,14 @@ name = "embassy-futures"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067"
-dependencies = [
- "defmt",
-]
 
 [[package]]
 name = "embassy-hal-internal"
 version = "0.1.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-300424#6f3fc1ea35205f0327640804002128e5585518b6"
 dependencies = [
  "cortex-m",
  "critical-section",
- "defmt",
  "num-traits",
 ]
 
@@ -1083,36 +1063,38 @@ dependencies = [
 [[package]]
 name = "embassy-net"
 version = "0.4.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-300424#6f3fc1ea35205f0327640804002128e5585518b6"
 dependencies = [
- "defmt",
+ "as-slice 0.2.1",
+ "atomic-pool",
  "document-features",
  "embassy-net-driver",
- "embassy-sync 0.6.0",
+ "embassy-sync 0.5.0",
  "embassy-time",
  "embedded-io-async",
  "embedded-nal-async",
+ "generic-array 0.14.7",
  "heapless 0.8.0",
  "managed",
  "smoltcp",
+ "stable_deref_trait",
 ]
 
 [[package]]
 name = "embassy-net-driver"
 version = "0.2.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
-dependencies = [
- "defmt",
-]
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d"
 
 [[package]]
 name = "embassy-net-driver-channel"
 version = "0.2.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "584ab4da7e5612efaa7d55ee76161d9549adf788eab48d49362eddbf322f9933"
 dependencies = [
  "embassy-futures",
  "embassy-net-driver",
- "embassy-sync 0.6.0",
+ "embassy-sync 0.3.0",
 ]
 
 [[package]]
@@ -1144,18 +1126,17 @@ dependencies = [
 [[package]]
 name = "embassy-nrf"
 version = "0.1.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-300424#6f3fc1ea35205f0327640804002128e5585518b6"
 dependencies = [
  "bitflags 2.5.0",
  "cfg-if",
  "cortex-m",
  "cortex-m-rt",
  "critical-section",
- "defmt",
  "document-features",
  "embassy-embedded-hal",
  "embassy-hal-internal",
- "embassy-sync 0.6.0",
+ "embassy-sync 0.5.0",
  "embassy-time",
  "embassy-time-driver",
  "embassy-usb-driver",
@@ -1184,7 +1165,8 @@ dependencies = [
 [[package]]
 name = "embassy-rp"
 version = "0.1.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "438f170cbd97d4a870e8d57e1738ee815255028ad31dd409d891e2bf797dc531"
 dependencies = [
  "atomic-polyfill",
  "cfg-if",
@@ -1195,7 +1177,7 @@ dependencies = [
  "embassy-embedded-hal",
  "embassy-futures",
  "embassy-hal-internal",
- "embassy-sync 0.6.0",
+ "embassy-sync 0.5.0",
  "embassy-time",
  "embassy-time-driver",
  "embassy-usb-driver",
@@ -1208,6 +1190,7 @@ dependencies = [
  "embedded-storage",
  "embedded-storage-async",
  "fixed",
+ "futures",
  "nb 1.1.0",
  "pio",
  "pio-proc",
@@ -1241,20 +1224,6 @@ dependencies = [
  "heapless 0.8.0",
 ]
 
-[[package]]
-name = "embassy-sync"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e0c49ff02ebe324faf3a8653ba91582e2d0a7fdef5bc88f449d5aa1bfcc05c"
-dependencies = [
- "cfg-if",
- "critical-section",
- "defmt",
- "embedded-io-async",
- "futures-util",
- "heapless 0.8.0",
-]
-
 [[package]]
 name = "embassy-time"
 version = "0.3.1"
@@ -1263,7 +1232,6 @@ checksum = "274c019608a9004aed3cafc871e2a3c87ce9351d537dcaab4cc5db184d4a04b1"
 dependencies = [
  "cfg-if",
  "critical-section",
- "defmt",
  "document-features",
  "embassy-time-driver",
  "embassy-time-queue-driver",
@@ -1277,7 +1245,8 @@ dependencies = [
 [[package]]
 name = "embassy-time-driver"
 version = "0.1.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e0c214077aaa9206958b16411c157961fb7990d4ea628120a78d1a5a28aed24"
 dependencies = [
  "document-features",
 ]
@@ -1285,7 +1254,8 @@ dependencies = [
 [[package]]
 name = "embassy-time-queue-driver"
 version = "0.1.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1177859559ebf42cd24ae7ba8fe6ee707489b01d0bf471f8827b7b12dcb0bc0"
 
 [[package]]
 name = "embassy-usb"
@@ -1293,7 +1263,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1587e58ed8f7e0215246e6bb8d7ef4837db682e209e5ef7410a81c500dc949e5"
 dependencies = [
- "defmt",
  "embassy-futures",
  "embassy-net-driver-channel",
  "embassy-sync 0.5.0",
@@ -1306,10 +1275,8 @@ dependencies = [
 [[package]]
 name = "embassy-usb-driver"
 version = "0.1.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-240605#584940fc7ea02fe184f3ae346ecaa3d00008c95e"
-dependencies = [
- "defmt",
-]
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970"
 
 [[package]]
 name = "embassy-usb-keyboard"
@@ -1326,17 +1293,6 @@ dependencies = [
  "usbd-hid",
 ]
 
-[[package]]
-name = "embassy-usb-synopsys-otg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d46be92e72bcf39e623ff74d739a8ab29b02f4909a9b05986ca81c2157ac254a"
-dependencies = [
- "critical-section",
- "embassy-sync 0.5.0",
- "embassy-usb-driver",
-]
-
 [[package]]
 name = "embedded-can"
 version = "0.4.1"
@@ -1379,9 +1335,6 @@ name = "embedded-hal"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89"
-dependencies = [
- "defmt",
-]
 
 [[package]]
 name = "embedded-hal-async"
@@ -1413,9 +1366,6 @@ name = "embedded-io"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
-dependencies = [
- "defmt",
-]
 
 [[package]]
 name = "embedded-io-async"
@@ -1423,7 +1373,6 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f"
 dependencies = [
- "defmt",
  "embedded-io 0.6.1",
 ]
 
@@ -1502,7 +1451,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -1565,84 +1514,57 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "esp-build"
-version = "0.1.0"
-source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-2024-06-14#abacafb069aac19dfc1c995f58189a3a3aeef411"
-dependencies = [
- "quote",
- "syn 2.0.67",
- "termcolor",
-]
-
 [[package]]
 name = "esp-hal"
-version = "0.18.0"
-source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-2024-06-14#abacafb069aac19dfc1c995f58189a3a3aeef411"
+version = "0.15.0"
+source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-290224#0377453b0b2a72c0e91244ed1550f21a7a2c4be6"
 dependencies = [
  "basic-toml",
- "bitfield 0.15.0",
+ "bitfield 0.14.0",
  "bitflags 2.5.0",
  "cfg-if",
  "critical-section",
- "defmt",
- "delegate",
  "document-features",
+ "embassy-executor",
  "embassy-futures",
- "embassy-sync 0.6.0",
- "embassy-usb-driver",
- "embassy-usb-synopsys-otg",
+ "embassy-sync 0.5.0",
+ "embassy-time-driver",
  "embedded-can",
  "embedded-dma 0.2.0",
+ "embedded-hal 0.2.7",
  "embedded-hal 1.0.0",
  "embedded-hal-async",
  "embedded-hal-nb",
  "embedded-io 0.6.1",
  "embedded-io-async",
  "enumset",
- "esp-build",
  "esp-hal-procmacros",
- "esp-metadata",
  "esp-riscv-rt",
  "esp32",
  "esp32c2",
  "esp32c3",
  "esp32c6",
  "esp32h2",
+ "esp32p4",
  "esp32s2",
  "esp32s3",
  "fugit",
+ "log",
  "nb 1.1.0",
  "paste",
  "portable-atomic",
  "rand_core",
  "riscv",
  "serde",
- "strum 0.26.2",
+ "strum 0.25.0",
  "void",
  "xtensa-lx-rt",
 ]
 
-[[package]]
-name = "esp-hal-embassy"
-version = "0.1.0"
-source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-2024-06-14#abacafb069aac19dfc1c995f58189a3a3aeef411"
-dependencies = [
- "cfg-if",
- "critical-section",
- "document-features",
- "embassy-executor",
- "embassy-time-driver",
- "esp-build",
- "esp-hal",
- "esp-metadata",
- "portable-atomic",
-]
-
 [[package]]
 name = "esp-hal-procmacros"
-version = "0.11.0"
-source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-2024-06-14#abacafb069aac19dfc1c995f58189a3a3aeef411"
+version = "0.8.0"
+source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-290224#0377453b0b2a72c0e91244ed1550f21a7a2c4be6"
 dependencies = [
  "darling",
  "document-features",
@@ -1655,17 +1577,6 @@ dependencies = [
  "syn 2.0.67",
 ]
 
-[[package]]
-name = "esp-metadata"
-version = "0.1.1"
-source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-2024-06-14#abacafb069aac19dfc1c995f58189a3a3aeef411"
-dependencies = [
- "basic-toml",
- "lazy_static",
- "serde",
- "strum 0.26.2",
-]
-
 [[package]]
 name = "esp-println"
 version = "0.9.1"
@@ -1673,141 +1584,138 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e98f0f58453dd2ce08d99228fc8757fad39d05dfd26643665d1093b8844f42cc"
 dependencies = [
  "critical-section",
- "defmt",
  "log",
 ]
 
 [[package]]
 name = "esp-riscv-rt"
-version = "0.8.0"
-source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-2024-06-14#abacafb069aac19dfc1c995f58189a3a3aeef411"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8c734d963f250000961ffcb6135d814a3be0456020fe54f06d71c4277769326"
 dependencies = [
- "document-features",
  "riscv",
  "riscv-rt-macros",
 ]
 
 [[package]]
 name = "esp-wifi"
-version = "0.6.0"
-source = "git+https://github.com/kaspar030/esp-hal?branch=for-riot-rs-2024-06-14#abacafb069aac19dfc1c995f58189a3a3aeef411"
+version = "0.3.0"
+source = "git+https://github.com/kaspar030/esp-wifi?branch=update-esp-hal#e49646926cb8638c061d21bebe20b98db7f40435"
 dependencies = [
  "atomic-waker",
  "cfg-if",
  "critical-section",
- "defmt",
  "embassy-futures",
  "embassy-net-driver",
- "embassy-sync 0.6.0",
+ "embassy-sync 0.5.0",
  "embedded-io 0.6.1",
  "embedded-io-async",
  "enumset",
- "esp-build",
  "esp-hal",
- "esp-hal-embassy",
  "esp-wifi-sys",
  "fugit",
  "futures-util",
  "heapless 0.8.0",
  "libm",
  "linked_list_allocator",
+ "log",
  "no-std-net",
  "num-derive",
  "num-traits",
  "portable-atomic",
  "portable_atomic_enum",
- "smoltcp",
  "toml-cfg",
 ]
 
 [[package]]
 name = "esp-wifi-sys"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551b510b3944844675fcefa1301b3610fe56faa419bcc05dd0dd0056745c6654"
+source = "git+https://github.com/kaspar030/esp-wifi?branch=update-esp-hal#e49646926cb8638c061d21bebe20b98db7f40435"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "esp32"
-version = "0.31.0"
-source = "git+https://github.com/esp-rs/esp-pacs?rev=a7c72f7#a7c72f72c4cc50d1595a0d5a395250306d741fed"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343ac30c4537d3f8526490db4264091a9785a55bcdfc22fc34482751a501d8d2"
 dependencies = [
  "critical-section",
- "defmt",
  "vcell",
  "xtensa-lx",
 ]
 
 [[package]]
 name = "esp32c2"
-version = "0.20.0"
-source = "git+https://github.com/esp-rs/esp-pacs?rev=a7c72f7#a7c72f72c4cc50d1595a0d5a395250306d741fed"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55e30c9147b7a1f388887dfd2fe7da4d6159a0248603674af5f3a5282a46cd11"
 dependencies = [
  "critical-section",
- "defmt",
  "vcell",
 ]
 
 [[package]]
 name = "esp32c3"
-version = "0.23.0"
-source = "git+https://github.com/esp-rs/esp-pacs?rev=a7c72f7#a7c72f72c4cc50d1595a0d5a395250306d741fed"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a7ee710c1e4f16b5e840cdfec3f4e7642b7517a877c5c4b7e1cafa9a14117c5"
 dependencies = [
  "critical-section",
- "defmt",
  "vcell",
 ]
 
 [[package]]
 name = "esp32c6"
-version = "0.14.0"
-source = "git+https://github.com/esp-rs/esp-pacs?rev=a7c72f7#a7c72f72c4cc50d1595a0d5a395250306d741fed"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff0275425ea3a7675b7b5903163a93b65e8ce5b9c8a7749ed397279ed2ade3e3"
 dependencies = [
  "critical-section",
- "defmt",
  "vcell",
 ]
 
 [[package]]
 name = "esp32h2"
-version = "0.10.0"
-source = "git+https://github.com/esp-rs/esp-pacs?rev=a7c72f7#a7c72f72c4cc50d1595a0d5a395250306d741fed"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e606c8e60d3e68afda997fa9fcc8d8fe1d2e3c172505bb03eb9ab79b4bca4d6a"
 dependencies = [
  "critical-section",
- "defmt",
  "vcell",
 ]
 
 [[package]]
-name = "esp32s2"
-version = "0.22.0"
-source = "git+https://github.com/esp-rs/esp-pacs?rev=a7c72f7#a7c72f72c4cc50d1595a0d5a395250306d741fed"
+name = "esp32p4"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03c0bc7973e6805e3c3c3c979e9418ba30380d8c16989a477440dbce8cf1965"
 dependencies = [
  "critical-section",
- "defmt",
  "vcell",
- "xtensa-lx",
 ]
 
 [[package]]
-name = "esp32s3"
-version = "0.26.0"
-source = "git+https://github.com/esp-rs/esp-pacs?rev=a7c72f7#a7c72f72c4cc50d1595a0d5a395250306d741fed"
+name = "esp32s2"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbcb8e9a4097fbf1c455fc776ad46a4bb7861d5bad3c3cd4549b666ad906ce4"
 dependencies = [
  "critical-section",
- "defmt",
  "vcell",
  "xtensa-lx",
 ]
 
 [[package]]
-name = "espressif-esp32-c6-devkitc-1"
-version = "0.1.0"
+name = "esp32s3"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "044e216560a33aa5d6c98163c8ae4278845ec3bae7b9cab520da0697be4f23a6"
 dependencies = [
- "riot-rs-debug",
- "riot-rs-rt",
+ "critical-section",
+ "vcell",
+ "xtensa-lx",
 ]
 
 [[package]]
@@ -1819,6 +1727,14 @@ dependencies = [
  "riot-rs-boards",
 ]
 
+[[package]]
+name = "expressif-esp32-c6-devkitc-1"
+version = "0.1.0"
+dependencies = [
+ "riot-rs-debug",
+ "riot-rs-rt",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.1.0"
@@ -2097,7 +2013,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1"
 dependencies = [
- "as-slice",
+ "as-slice 0.1.5",
  "generic-array 0.13.3",
  "hash32 0.1.1",
  "stable_deref_trait",
@@ -2123,7 +2039,6 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
 dependencies = [
- "defmt",
  "hash32 0.3.1",
  "portable-atomic",
  "serde",
@@ -2136,12 +2051,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "hello-world"
 version = "0.1.0"
@@ -2150,15 +2059,6 @@ dependencies = [
  "riot-rs-boards",
 ]
 
-[[package]]
-name = "hello-world-async"
-version = "0.1.0"
-dependencies = [
- "embassy-executor",
- "riot-rs",
- "riot-rs-boards",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -2296,18 +2196,19 @@ dependencies = [
 
 [[package]]
 name = "lakers"
-version = "0.5.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905e14c2e72626a749cfe6e0b64454ac2e51de3e36cc2ba077b0abc5af5fa535"
+checksum = "64eb682691d02609ff036a7416373edbc7cc769b0908bf2489af79461453669e"
 dependencies = [
  "lakers-shared",
+ "log",
 ]
 
 [[package]]
 name = "lakers-crypto-rustcrypto"
-version = "0.5.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6523b65ffa787062edf5907ce9e8500bde82eb3880d3c5d01e2119da12c4653a"
+checksum = "964a5ea4c01f13129088c784b41928b93f6fd67b9a956314a899c677182c301c"
 dependencies = [
  "aead",
  "aes",
@@ -2321,9 +2222,12 @@ dependencies = [
 
 [[package]]
 name = "lakers-shared"
-version = "0.5.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ddf0b16bd9c88daa047e2ac190ff90fd685990a14ab8b47dfa6ecc28b43247"
+checksum = "dcdc5a0e1a5ea0387ab3e334f2061c633001db79e04d40af65bc68b41b13ef3a"
+dependencies = [
+ "log",
+]
 
 [[package]]
 name = "lalrpop"
@@ -2884,9 +2788,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.0"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "flate2",
  "memchr",
@@ -3301,6 +3205,15 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
+[[package]]
+name = "ringbuf"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "ringbuffer"
 version = "0.1.0"
@@ -3341,7 +3254,7 @@ dependencies = [
  "ai-c3",
  "cfg-if",
  "dwm1001",
- "espressif-esp32-c6-devkitc-1",
+ "expressif-esp32-c6-devkitc-1",
  "linkme",
  "microbit",
  "microbit-v2",
@@ -3368,11 +3281,9 @@ version = "0.1.0"
 dependencies = [
  "cortex-m",
  "cortex-m-semihosting",
- "defmt",
- "defmt-rtt-target",
  "esp-println",
  "log",
- "rtt-target 0.5.0",
+ "rtt-target",
 ]
 
 [[package]]
@@ -3392,13 +3303,11 @@ dependencies = [
  "embassy-time",
  "embassy-usb",
  "esp-hal",
- "esp-hal-embassy",
  "esp-wifi",
  "heapless 0.8.0",
  "linkme",
  "once_cell",
  "riot-rs-debug",
- "riot-rs-macros",
  "riot-rs-random",
  "riot-rs-rt",
  "riot-rs-threads",
@@ -3445,7 +3354,7 @@ dependencies = [
  "riot-rs-debug",
  "riot-rs-threads",
  "riot-rs-utils",
- "rtt-target 0.4.0",
+ "rtt-target",
 ]
 
 [[package]]
@@ -3464,9 +3373,7 @@ dependencies = [
  "esp-hal",
  "linkme",
  "panic-semihosting",
- "paste",
  "riot-rs-runqueue",
- "static_cell",
 ]
 
 [[package]]
@@ -3554,16 +3461,6 @@ dependencies = [
  "ufmt-write",
 ]
 
-[[package]]
-name = "rtt-target"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10b34c9e6832388e45f3c01f1bb60a016384a0a4ad80cdd7d34913bed25037f0"
-dependencies = [
- "critical-section",
- "ufmt-write",
-]
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -3609,9 +3506,9 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "ruzstd"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b"
+checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
 dependencies = [
  "byteorder",
  "derive_more",
@@ -3630,6 +3527,16 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "scroll-ring"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eda0dff67036ba3b032aa68eb47ceb9b53b6e848445f53d10bf93e033b17df2"
+dependencies = [
+ "ringbuf",
+ "try-lock",
+]
+
 [[package]]
 name = "sec1"
 version = "0.7.3"
@@ -3751,7 +3658,6 @@ dependencies = [
  "bitflags 1.3.2",
  "byteorder",
  "cfg-if",
- "defmt",
  "heapless 0.8.0",
  "managed",
 ]
@@ -3879,11 +3785,11 @@ checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
 
 [[package]]
 name = "strum"
-version = "0.26.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 dependencies = [
- "strum_macros 0.26.4",
+ "strum_macros 0.25.3",
 ]
 
 [[package]]
@@ -3892,7 +3798,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -3901,11 +3807,11 @@ dependencies = [
 
 [[package]]
 name = "strum_macros"
-version = "0.26.4"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -4050,7 +3956,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68c587298ddd135c156e92e8c3eae69614d6eecea8e2d8a09daab011e5e6a21d"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "serde",
@@ -4091,6 +3997,12 @@ dependencies = [
  "winnow 0.6.13",
 ]
 
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
 [[package]]
 name = "trybuild"
 version = "1.0.96"
@@ -4191,7 +4103,7 @@ dependencies = [
 [[package]]
 name = "usbd-hid-descriptors"
 version = "0.1.2"
-source = "git+https://github.com/twitchyliquid64/usbd-hid?rev=76bea16537e1a347df2ebced5b9e1d48f71c9859#76bea16537e1a347df2ebced5b9e1d48f71c9859"
+source = "git+https://github.com/kaspar030/usbd-hid?branch=for-riot-rs#1dfc36bf4241e1088a29ebae308868d271ad70be"
 dependencies = [
  "bitfield 0.14.0",
 ]
@@ -4199,7 +4111,7 @@ dependencies = [
 [[package]]
 name = "usbd-hid-macros"
 version = "0.6.0"
-source = "git+https://github.com/twitchyliquid64/usbd-hid?rev=76bea16537e1a347df2ebced5b9e1d48f71c9859#76bea16537e1a347df2ebced5b9e1d48f71c9859"
+source = "git+https://github.com/kaspar030/usbd-hid?branch=for-riot-rs#1dfc36bf4241e1088a29ebae308868d271ad70be"
 dependencies = [
  "byteorder",
  "hashbrown 0.13.2",
diff --git a/Cargo.toml b/Cargo.toml
index e87623e25..82f6edd38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -96,9 +96,6 @@ usbd-hid-macros = { git = "https://github.com/kaspar030/usbd-hid", branch = "for
 # version 0.12-to-be
 smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp.git", rev = "125773e282bc2e0c914a49e9c75573926e26e558" }
 
-coap-message = { git = "https://gitlab.com/chrysn/coap-message/", branch = "enable-downcasts" }
-coap-message-implementations = { git = "https://codeberg.org/chrysn/coap-tools", branch = "downcast" }
-
 [workspace.lints.rust]
 unsafe_op_in_unsafe_fn = "warn"
 unused_must_use = "deny"
diff --git a/examples/coap/Cargo.toml b/examples/coap/Cargo.toml
index 18ce84349..d9e98468a 100644
--- a/examples/coap/Cargo.toml
+++ b/examples/coap/Cargo.toml
@@ -25,14 +25,14 @@ embedded-nal-async = "0.7"
 smoltcp = { version = "0.11", default-features = false }
 embedded-nal-coap = "0.1.0-alpha.2"
 coap-request = "0.2.0-alpha.2"
-coap-message = "0.3.1"
+coap-message = "0.3.2"
 embassy-futures = "0.1.1"
 coap-message-demos = { version = "0.4.0", default-features = false }
 coap-request-implementations = "0.1.0-alpha.4"
 lakers = { version = "0.6.0", default-features = false }
 lakers-crypto-rustcrypto = "0.6.0"
 coap-handler = "0.2.0"
-coap-message-utils = "0.3.2"
+coap-message-utils = "0.3.3"
 coap-handler-implementations = "0.5.0"
 hexlit = "0.5.5"
 coap-numbers = "0.2.3"
@@ -42,9 +42,7 @@ liboscore = { git = "https://gitlab.com/oscore/liboscore/", rev = "e7a4ecd037cbb
 liboscore-msgbackend = { git = "https://gitlab.com/oscore/liboscore/", features = [
   "alloc",
 ], rev = "e7a4ecd037cbb9c7f085047fec5896f4bdc68d50" }
-coap-message-implementations = { git = "https://codeberg.org/chrysn/coap-tools", branch = "downcast", features = [
-  "downcast",
-] }
+coap-message-implementations = { version = "0.1.2", features = ["downcast"] }
 static-alloc = "0.2.5"
 arrayvec = { version = "0.7.4", default-features = false }
 coap-scroll-ring-server = "0.2.0"