diff --git a/Cargo.lock b/Cargo.lock
index c284eeb..e858bd0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,6 +17,12 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -77,6 +83,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.0",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -86,6 +103,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -108,15 +134,15 @@ dependencies = [
 
 [[package]]
 name = "embedded-io"
-version = "0.6.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7"
 
 [[package]]
 name = "embedded-io-adapters"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03facd2b544d24916f312a6026c1b548b8af012f788a554d498afdc8ef9c775"
+checksum = "c900a1c087f1f7d17cdc84a1290df91521cd90933efa76d68e568385d889f2f4"
 dependencies = [
  "embedded-io",
  "embedded-io-async",
@@ -125,13 +151,19 @@ dependencies = [
 
 [[package]]
 name = "embedded-io-async"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f"
+checksum = "2564b9f813c544241430e147d8bc454815ef9ac998878d30cc3055449f7fd4c0"
 dependencies = [
  "embedded-io",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
 [[package]]
 name = "fastwebsockets"
 version = "0.10.0"
@@ -158,11 +190,17 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
 [[package]]
 name = "framez"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474fb26e41fcc113f86bb8e0818c7e1150dd1d28dd9c47dfdd95f925df5f2947"
+checksum = "ddadef40a5b6d93abf81e40930527a71381e2cbe3fa4084425c7946735af2fdd"
 dependencies = [
  "embedded-io-async",
  "futures",
@@ -275,19 +313,21 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "rand_core 0.10.0",
+ "wasip2",
+ "wasip3",
 ]
 
 [[package]]
@@ -296,6 +336,27 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -377,6 +438,24 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
+[[package]]
+name = "indexmap"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.16.1",
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "io-uring"
 version = "0.7.8"
@@ -394,6 +473,12 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
 [[package]]
 name = "libc"
 version = "0.2.172"
@@ -410,6 +495,12 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+
 [[package]]
 name = "memchr"
 version = "2.7.5"
@@ -432,7 +523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.59.0",
 ]
 
@@ -509,6 +600,16 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.95"
@@ -529,9 +630,9 @@ dependencies = [
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "rand"
@@ -540,18 +641,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
+ "rand_chacha",
  "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
 dependencies = [
- "rand_chacha 0.9.0",
- "rand_core 0.9.3",
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.0",
 ]
 
 [[package]]
@@ -564,16 +666,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.9.3",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -585,12 +677,9 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
-dependencies = [
- "getrandom 0.3.3",
-]
+checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
 
 [[package]]
 name = "redox_syscall"
@@ -613,6 +702,54 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "semver"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -620,7 +757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
  "digest",
 ]
 
@@ -666,9 +803,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.102"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -764,6 +901,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -792,17 +935,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen 0.46.0",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen 0.51.0",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
- "wit-bindgen-rt",
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
 ]
 
 [[package]]
 name = "websocketz"
-version = "0.1.3"
+version = "0.2.0"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -817,8 +1003,8 @@ dependencies = [
  "httparse",
  "hyper",
  "hyper-util",
- "rand 0.9.1",
- "rand_core 0.9.3",
+ "rand 0.10.0",
+ "rand_core 0.10.0",
  "sha1",
  "thiserror 2.0.12",
  "tokio",
@@ -907,12 +1093,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
  "bitflags",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
 ]
 
 [[package]]
@@ -934,3 +1205,9 @@ dependencies = [
  "quote",
  "syn",
 ]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/Cargo.toml b/Cargo.toml
index 6b52ab1..f204b51 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "websocketz"
-version = "0.1.3"
+version = "0.2.0"
 edition = "2024"
 rust-version = "1.85.1"
 authors = ["Jad K. Haddad <jadkhaddad@gmail.com>"]
@@ -11,29 +11,29 @@ repository = "https://github.com/zealloc/websocketz"
 keywords = ["no_std", "embedded", "websockets", "zerocopy"]
 
 [dependencies]
-framez = { version = "0.3.0", default-features = false }
-embedded-io-async = { version = "0.6.1", default-features = false }
-rand_core = { version = "0.9.3", default-features = false }
-rand = { version = "0.9.1", default-features = false }
-thiserror = { version = "2.0.12", default-features = false }
-httparse = { version = "1.10.1", default-features = false }
-base64 = { version = "0.22.1", default-features = false }
-sha1 = { version = "0.10.6", default-features = false }
+framez = { version = "0.4", default-features = false }
+embedded-io-async = { version = "0.7", default-features = false }
+rand_core = { version = "0.10", default-features = false }
+rand = { version = "0.10", default-features = false }
+thiserror = { version = "2", default-features = false }
+httparse = { version = "1", default-features = false }
+base64 = { version = "0.22", default-features = false }
+sha1 = { version = "0.10", default-features = false }
 
 [dev-dependencies]
-rand = { version = "0.9.1", features = ["std_rng"] }
-embedded-io-adapters = { version = "0.6.1", default-features = false, features = [
+rand = { version = "0.10", features = ["std_rng"] }
+embedded-io-adapters = { version = "0.7", default-features = false, features = [
     "tokio-1",
 ] }
-tokio = { version = "1.46.1", features = ["full"] }
-futures-util = "0.3.31"
-fastwebsockets = { version = "0.10.0", features = ["upgrade"] }
-http = "1.3.1"
-http-body-util = "0.1.3"
-bytes = "1.10.1"
-hyper = "1.6.0"
-futures = "0.3.31"
-hyper-util = "0.1.15"
+tokio = { version = "1", features = ["full"] }
+futures-util = "0.3"
+fastwebsockets = { version = "0.10", features = ["upgrade"] }
+http = "1"
+http-body-util = "0.1"
+bytes = "1"
+hyper = "1"
+futures = "0.3"
+hyper-util = "0.1"
 
 [profile.release]
 opt-level = 3
diff --git a/cspell.json b/cspell.json
index ecd6a5a..0a2deb0 100644
--- a/cspell.json
+++ b/cspell.json
@@ -23,6 +23,7 @@
         "nextest",
         "nostartfiles",
         "println",
+        "reborrow",
         "reportfile",
         "repr",
         "rngs",
@@ -42,7 +43,9 @@
         "WSSERVER",
         "wstest",
         "xtensa",
-        "zerocopy"
+        "zerocopy",
+        "nvim",
+        "MSVC"
     ],
     "ignorePaths": [
         "target",
diff --git a/examples/autobahn-client.rs b/examples/autobahn-client.rs
index 4de35ee..f5c8f9a 100644
--- a/examples/autobahn-client.rs
+++ b/examples/autobahn-client.rs
@@ -5,7 +5,10 @@
 //! ```
 
 use embedded_io_adapters::tokio_1::FromTokio;
-use rand::{SeedableRng, rngs::StdRng};
+use rand::{
+    SeedableRng,
+    rngs::{StdRng, SysRng},
+};
 use tokio::net::TcpStream;
 use websocketz::{
     CloseCode, CloseFrame, Message, WebSocket, http::Header, next, options::ConnectOptions, send,
@@ -28,7 +31,7 @@ async fn connect<'buf>(
     let websocketz = WebSocket::connect::<16>(
         ConnectOptions::new_unchecked(path).with_headers(headers),
         FromTokio::new(stream),
-        StdRng::from_os_rng(),
+        StdRng::try_from_rng(&mut SysRng).unwrap(),
         read_buf,
         write_buf,
         fragments_buf,
diff --git a/examples/autobahn-server.rs b/examples/autobahn-server.rs
index 8cf890b..1786d19 100644
--- a/examples/autobahn-server.rs
+++ b/examples/autobahn-server.rs
@@ -5,7 +5,10 @@
 //! ```
 
 use embedded_io_adapters::tokio_1::FromTokio;
-use rand::{SeedableRng, rngs::StdRng};
+use rand::{
+    SeedableRng,
+    rngs::{StdRng, SysRng},
+};
 use tokio::net::TcpListener;
 use websocketz::{Message, WebSocket, error::Error, next, options::AcceptOptions, send};
 
@@ -27,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             let mut websocketz = WebSocket::accept::<16>(
                 AcceptOptions::default(),
                 FromTokio::new(stream),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 &mut read_buf,
                 &mut write_buf,
                 &mut fragments_buf,
diff --git a/examples/client-callback.rs b/examples/client-callback.rs
index 1e30843..94565b3 100644
--- a/examples/client-callback.rs
+++ b/examples/client-callback.rs
@@ -10,7 +10,10 @@ use std::time::Duration;
 
 use embedded_io_adapters::tokio_1::FromTokio;
 use httparse::Header;
-use rand::{SeedableRng, rngs::StdRng};
+use rand::{
+    SeedableRng,
+    rngs::{StdRng, SysRng},
+};
 use tokio::net::TcpStream;
 use websocketz::{Message, WebSocket, http::Response, next, options::ConnectOptions};
 
@@ -25,7 +28,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let read_buf = &mut [0u8; 8192];
     let write_buf = &mut [0u8; 8192];
     let fragments_buf = &mut [0u8; 8192];
-    let rng = StdRng::from_os_rng();
+    let rng = StdRng::try_from_rng(&mut SysRng).unwrap();
 
     let (mut websocketz, custom) = WebSocket::connect_with(
         ConnectOptions::default()
diff --git a/examples/esp32/.clippy.toml b/examples/esp32/.clippy.toml
new file mode 100644
index 0000000..76f6c1d
--- /dev/null
+++ b/examples/esp32/.clippy.toml
@@ -0,0 +1 @@
+stack-size-threshold = 1024
diff --git a/examples/esp32/.gitignore b/examples/esp32/.gitignore
index 6e771f8..deb0257 100644
--- a/examples/esp32/.gitignore
+++ b/examples/esp32/.gitignore
@@ -1,8 +1,13 @@
-# Generated by Cargo
 # will have compiled files and executables
 debug/
 target/
 
+# Editor configuration
+.vscode/
+.zed/
+.helix/
+.nvim.lua
+
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
@@ -15,3 +20,7 @@ target/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+
+# Ignore .DS_Store file in mac
+**/.DS_Store
diff --git a/examples/esp32/Cargo.lock b/examples/esp32/Cargo.lock
index bfc9b30..8aacfbb 100644
--- a/examples/esp32/Cargo.lock
+++ b/examples/esp32/Cargo.lock
@@ -4,30 +4,15 @@ version = 4
 
 [[package]]
 name = "allocator-api2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78200ac3468a57d333cd0ea5dd398e25111194dcacd49208afca95c629a6311d"
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
+checksum = "c583acf993cf4245c4acb0a2cc2ab1f9cc097de73411bb6d3647ff6af2b1013d"
 
 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "autocfg"
@@ -37,37 +22,34 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "base64"
-version = "0.22.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
-name = "basic-toml"
-version = "0.1.10"
+name = "base64"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba62675e8242a4c4e806d12f11d136e626e6c8361d6b829310732241652a178a"
-dependencies = [
- "serde",
-]
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitfield"
-version = "0.19.1"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db1bcd90f88eabbf0cadbfb87a45bceeaebcd3b4bc9e43da379cd2ef0162590d"
+checksum = "21ba6517c6b0f2bf08be60e187ab64b038438f22dd755614d8fe4d4098c46419"
 dependencies = [
  "bitfield-macros",
 ]
 
 [[package]]
 name = "bitfield-macros"
-version = "0.19.1"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3787a07661997bfc05dd3431e379c0188573f78857080cf682e1393ab8e4d64c"
+checksum = "f48d6ace212fdf1b45fd6b566bb40808415344642b76c3224c07c8df9da81e97"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -78,9 +60,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
 
 [[package]]
 name = "block-buffer"
@@ -91,17 +73,11 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "bumpalo"
-version = "3.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
-
 [[package]]
 name = "bytemuck"
-version = "1.23.1"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
 
 [[package]]
 name = "byteorder"
@@ -109,38 +85,17 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
-[[package]]
-name = "cc"
-version = "1.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
-dependencies = [
- "shlex",
-]
-
 [[package]]
 name = "cfg-if"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
-
-[[package]]
-name = "chrono"
-version = "0.4.41"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "num-traits",
- "windows-link",
-]
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
+name = "const-default"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa"
 
 [[package]]
 name = "cpufeatures"
@@ -159,9 +114,9 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
  "typenum",
@@ -173,8 +128,28 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+dependencies = [
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
+]
+
+[[package]]
+name = "darling"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
+dependencies = [
+ "darling_core 0.23.0",
+ "darling_macro 0.23.0",
 ]
 
 [[package]]
@@ -188,7 +163,33 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
+dependencies = [
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -197,20 +198,42 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core 0.21.3",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
+dependencies = [
+ "darling_core 0.23.0",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "delegate"
-version = "0.13.3"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b6483c2bbed26f97861cf57651d4f2b731964a28cd2257f934a4b452480d21"
+checksum = "780eb241654bf097afb00fc5f054a09b687dad862e485fdcf8399bb056565370"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -225,22 +248,22 @@ dependencies = [
 
 [[package]]
 name = "document-features"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
 dependencies = [
  "litrs",
 ]
 
 [[package]]
 name = "embassy-embedded-hal"
-version = "0.3.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fea5ef5bed4d3468dfd44f5c9fa4cda8f54c86d4fb4ae683eacf9d39e2ea12"
+checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8"
 dependencies = [
  "embassy-futures",
- "embassy-sync",
- "embassy-time",
+ "embassy-hal-internal",
+ "embassy-sync 0.7.2",
  "embedded-hal 0.2.7",
  "embedded-hal 1.0.0",
  "embedded-hal-async",
@@ -251,47 +274,63 @@ dependencies = [
 
 [[package]]
 name = "embassy-executor"
-version = "0.7.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6"
+checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b"
 dependencies = [
  "critical-section",
  "document-features",
  "embassy-executor-macros",
+ "embassy-executor-timer-queue",
  "log",
 ]
 
 [[package]]
 name = "embassy-executor-macros"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3577b1e9446f61381179a330fc5324b01d511624c55f25e3c66c9e3c626dbecf"
+checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472"
 dependencies = [
- "darling",
+ "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
+[[package]]
+name = "embassy-executor-timer-queue"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c"
+
 [[package]]
 name = "embassy-futures"
-version = "0.1.1"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01"
+
+[[package]]
+name = "embassy-hal-internal"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067"
+checksum = "95285007a91b619dc9f26ea8f55452aa6c60f7115a4edc05085cd2bd3127cd7a"
+dependencies = [
+ "num-traits",
+]
 
 [[package]]
 name = "embassy-net"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "940c4b9fe5c1375b09a0c6722c0100d6b2ed46a717a34f632f26e8d7327c4383"
+checksum = "71f0aa32082b7df00164f485322d6edab59122c9718b363b07ec23424c2c06a0"
 dependencies = [
  "document-features",
  "embassy-net-driver",
- "embassy-sync",
+ "embassy-sync 0.7.2",
  "embassy-time",
- "embedded-io-async",
+ "embedded-io-async 0.7.0",
  "embedded-nal-async",
- "heapless",
+ "heapless 0.8.0",
  "log",
  "managed",
  "smoltcp",
@@ -311,17 +350,31 @@ checksum = "8d2c8cdff05a7a51ba0087489ea44b0b1d97a296ca6b1d6d1a33ea7423d34049"
 dependencies = [
  "cfg-if",
  "critical-section",
- "embedded-io-async",
+ "embedded-io-async 0.6.1",
  "futures-sink",
  "futures-util",
- "heapless",
+ "heapless 0.8.0",
+]
+
+[[package]]
+name = "embassy-sync"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b"
+dependencies = [
+ "cfg-if",
+ "critical-section",
+ "embedded-io-async 0.6.1",
+ "futures-core",
+ "futures-sink",
+ "heapless 0.8.0",
 ]
 
 [[package]]
 name = "embassy-time"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f820157f198ada183ad62e0a66f554c610cdcd1a9f27d4b316358103ced7a1f8"
+checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65"
 dependencies = [
  "cfg-if",
  "critical-section",
@@ -330,27 +383,27 @@ dependencies = [
  "embedded-hal 0.2.7",
  "embedded-hal 1.0.0",
  "embedded-hal-async",
- "futures-util",
+ "futures-core",
  "log",
 ]
 
 [[package]]
 name = "embassy-time-driver"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d45f5d833b6d98bd2aab0c2de70b18bfaa10faf661a1578fd8e5dfb15eb7eba"
+checksum = "a0a244c7dc22c8d0289379c8d8830cae06bb93d8f990194d0de5efb3b5ae7ba6"
 dependencies = [
  "document-features",
 ]
 
 [[package]]
 name = "embassy-time-queue-utils"
-version = "0.1.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc55c748d16908a65b166d09ce976575fb8852cf60ccd06174092b41064d8f83"
+checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454"
 dependencies = [
- "embassy-executor",
- "heapless",
+ "embassy-executor-timer-queue",
+ "heapless 0.8.0",
 ]
 
 [[package]]
@@ -393,13 +446,28 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
 
+[[package]]
+name = "embedded-io"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7"
+
 [[package]]
 name = "embedded-io-async"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f"
 dependencies = [
- "embedded-io",
+ "embedded-io 0.6.1",
+]
+
+[[package]]
+name = "embedded-io-async"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2564b9f813c544241430e147d8bc454815ef9ac998878d30cc3055449f7fd4c0"
+dependencies = [
+ "embedded-io 0.7.1",
 ]
 
 [[package]]
@@ -413,11 +481,11 @@ dependencies = [
 
 [[package]]
 name = "embedded-nal-async"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76959917cd2b86f40a98c28dd5624eddd1fa69d746241c8257eac428d83cb211"
+checksum = "eb5a1bd585135d302f8f6d7de329310938093da6271b37a6c94b8798795c0c6d"
 dependencies = [
- "embedded-io-async",
+ "embedded-io-async 0.7.0",
  "embedded-nal",
 ]
 
@@ -436,37 +504,25 @@ dependencies = [
  "embedded-storage",
 ]
 
-[[package]]
-name = "enum-as-inner"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "enumset"
-version = "1.1.6"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a6b7c3d347de0a9f7bfd2f853be43fe32fa6fac30c70f6d6d67a1e936b87ee"
+checksum = "25b07a8dfbbbfc0064c0a6bdf9edcf966de6b1c33ce344bdeca3b41615452634"
 dependencies = [
  "enumset_derive",
 ]
 
 [[package]]
 name = "enumset_derive"
-version = "0.11.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6da3ea9e1d1a3b1593e15781f930120e72aa7501610b2f82e5b6739c72e8eac5"
+checksum = "f43e744e4ea338060faee68ed933e46e722fb7f3617e722a5772d7e856d8b3ce"
 dependencies = [
- "darling",
+ "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -477,63 +533,76 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "esp-alloc"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e95f1de57ce5a6600368f3d3c931b0dfe00501661e96f5ab83bc5cdee031784"
+checksum = "641e43d6a60244429117ef2fa7a47182120c7561336ea01f6fb08d634f46bae1"
 dependencies = [
  "allocator-api2",
  "cfg-if",
- "critical-section",
  "document-features",
  "enumset",
+ "esp-config",
+ "esp-sync",
  "linked_list_allocator",
+ "rlsf",
 ]
 
 [[package]]
-name = "esp-bootloader-esp-idf"
-version = "0.1.0"
+name = "esp-backtrace"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3cb352a8df9c459d0bdf06957cb8293b8bc574138e8c546949955b29c485769"
+checksum = "3318413fb566c7227387f67736cf70cd74d80a11f2bb31c7b95a9eb48d079669"
 dependencies = [
- "chrono",
+ "cfg-if",
  "document-features",
- "embedded-storage",
  "esp-config",
- "md-5",
- "strum",
+ "esp-metadata-generated",
+ "esp-println",
+ "heapless 0.9.2",
+ "riscv",
+ "semihosting",
+ "xtensa-lx",
 ]
 
 [[package]]
-name = "esp-build"
-version = "0.3.0"
+name = "esp-bootloader-esp-idf"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "837020ff95fbf4c15c206541dda7994f1bbe6e1505e36a6a5ecb51fdb61656d7"
+checksum = "02a56964ab5479ac20c9cf76fa3b0d3f2233b20b5d8554e81ef5d65f63c20567"
 dependencies = [
- "quote",
- "syn",
- "termcolor",
+ "cfg-if",
+ "document-features",
+ "embedded-storage",
+ "esp-config",
+ "esp-hal-procmacros",
+ "esp-metadata-generated",
+ "esp-rom-sys",
+ "jiff",
+ "log",
+ "strum",
 ]
 
 [[package]]
 name = "esp-config"
-version = "0.4.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8c4c95d8d6243ddb39efe1fcf2524c9becd0f86bb3e24048ed30b4f553609f"
+checksum = "102871054f8dd98202177b9890cb4b71d0c6fe1f1413b7a379a8e0841fc2473c"
 dependencies = [
  "document-features",
+ "esp-metadata-generated",
  "serde",
- "serde_json",
+ "serde_yaml",
+ "somni-expr",
 ]
 
 [[package]]
 name = "esp-hal"
-version = "1.0.0-beta.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d973697621cd3eef9c3f260fa8c1af77d8547cfc92734255d8e8ddf05c7d331"
+checksum = "54786287c0a61ca0f78cb0c338a39427551d1be229103b4444591796c579e093"
 dependencies = [
- "basic-toml",
  "bitfield",
- "bitflags 2.9.1",
+ "bitflags 2.11.0",
  "bytemuck",
  "cfg-if",
  "critical-section",
@@ -542,19 +611,28 @@ dependencies = [
  "document-features",
  "embassy-embedded-hal",
  "embassy-futures",
- "embassy-sync",
+ "embassy-sync 0.7.2",
  "embedded-can",
  "embedded-hal 1.0.0",
  "embedded-hal-async",
- "embedded-io",
- "embedded-io-async",
+ "embedded-io 0.6.1",
+ "embedded-io 0.7.1",
+ "embedded-io-async 0.6.1",
+ "embedded-io-async 0.7.0",
  "enumset",
- "esp-build",
  "esp-config",
  "esp-hal-procmacros",
- "esp-metadata",
+ "esp-metadata-generated",
  "esp-riscv-rt",
+ "esp-rom-sys",
+ "esp-sync",
  "esp32",
+ "esp32c2",
+ "esp32c3",
+ "esp32c6",
+ "esp32h2",
+ "esp32s2",
+ "esp32s3",
  "fugit",
  "instability",
  "log",
@@ -562,165 +640,272 @@ dependencies = [
  "paste",
  "portable-atomic",
  "rand_core 0.6.4",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
  "riscv",
- "serde",
+ "sha1",
+ "sha2",
  "strum",
  "ufmt-write",
  "xtensa-lx",
  "xtensa-lx-rt",
 ]
 
-[[package]]
-name = "esp-hal-embassy"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87807cdf22124ba46dbac7d7f6d3ee2e7f06c4e461f3783443464d868101647d"
-dependencies = [
- "cfg-if",
- "critical-section",
- "document-features",
- "embassy-executor",
- "embassy-sync",
- "embassy-time",
- "embassy-time-driver",
- "embassy-time-queue-utils",
- "esp-build",
- "esp-config",
- "esp-hal",
- "esp-hal-procmacros",
- "esp-metadata",
- "log",
- "portable-atomic",
- "static_cell",
-]
-
 [[package]]
 name = "esp-hal-procmacros"
-version = "0.18.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73164008cb2eada2ef85e6b0e459001d851f9b8e65e96e0d594bdfa8cf1b813b"
+checksum = "3e025a7a7a0affdb4ff913b5c4494aef96ee03d085bf83c27453ae3a71d50da6"
 dependencies = [
- "darling",
  "document-features",
- "litrs",
  "proc-macro-crate",
- "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
+ "termcolor",
 ]
 
 [[package]]
-name = "esp-metadata"
-version = "0.7.0"
+name = "esp-metadata-generated"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0154d59933c2419ef25a01938517cc6969f47b6af53ebb34c279393aa20d9654"
-dependencies = [
- "anyhow",
- "basic-toml",
- "serde",
- "strum",
-]
+checksum = "9a93e39c8ad8d390d248dc7b9f4b59a873f313bf535218b8e2351356972399e3"
 
 [[package]]
-name = "esp-println"
-version = "0.14.0"
+name = "esp-phy"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fae8b38d5fdc1d29d823c4737f18edfb0ccf0406985cf893f87c0cfc26a6ab33"
+checksum = "6b1facf348e1e251517278fc0f5dc134e95e518251f5796cfbb532ca226a29bf"
 dependencies = [
- "critical-section",
+ "cfg-if",
  "document-features",
- "esp-build",
- "esp-metadata",
+ "esp-config",
+ "esp-hal",
+ "esp-metadata-generated",
+ "esp-sync",
+ "esp-wifi-sys",
  "log",
- "portable-atomic",
 ]
 
 [[package]]
-name = "esp-riscv-rt"
-version = "0.11.0"
+name = "esp-println"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05c2badd16cbd6307d463090615332b77c17a6766b41ba5fe5bb783310e8af6"
+checksum = "5a30e6c9fbcc01c348d46706fef8131c7775ab84c254a3cd65d0cd3f6414d592"
 dependencies = [
  "document-features",
- "riscv",
- "riscv-rt-macros",
+ "esp-metadata-generated",
+ "esp-sync",
+ "log",
+ "portable-atomic",
 ]
 
 [[package]]
-name = "esp-wifi"
-version = "0.14.1"
+name = "esp-radio"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3700028d3d2ee57e6d2a5c5f60544711052f8d394e73a6f534b538fbfb9d058c"
+checksum = "684c4de2f8907b73c9b891fbda65286a86d34fced4b856f36a7896c211f2f265"
 dependencies = [
  "allocator-api2",
  "cfg-if",
- "critical-section",
  "document-features",
  "embassy-net-driver",
- "embedded-io",
- "embedded-io-async",
+ "embedded-io 0.6.1",
+ "embedded-io 0.7.1",
+ "embedded-io-async 0.6.1",
+ "embedded-io-async 0.7.0",
  "enumset",
  "esp-alloc",
- "esp-build",
  "esp-config",
  "esp-hal",
- "esp-metadata",
+ "esp-hal-procmacros",
+ "esp-metadata-generated",
+ "esp-phy",
+ "esp-radio-rtos-driver",
+ "esp-sync",
  "esp-wifi-sys",
+ "heapless 0.9.2",
+ "instability",
  "log",
  "num-derive",
  "num-traits",
  "portable-atomic",
  "portable_atomic_enum",
- "rand_core 0.9.3",
  "smoltcp",
  "xtensa-lx-rt",
 ]
 
 [[package]]
-name = "esp-wifi-sys"
-version = "0.7.1"
+name = "esp-radio-rtos-driver"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "543bc31d1851afd062357e7810c1a9633f282fd3993583499a841ab497cbca6c"
+
+[[package]]
+name = "esp-riscv-rt"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b5438361891c431970194a733415006fb3d00b6eb70b3dcb66fd58f04d9b39"
+checksum = "502744a5b1e7268d27fd2a4e56ad45efe42ead517d6c517a6961540de949b0ee"
 dependencies = [
- "anyhow",
- "log",
+ "document-features",
+ "riscv",
+ "riscv-rt",
 ]
 
 [[package]]
-name = "esp32"
-version = "0.37.0"
+name = "esp-rom-sys"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83ddfdb413ef0739d84bd3fce771e6e0feb6457ac1bcdd7a1dcd6326061e919d"
+checksum = "cd66cccc6dd2d13e9f33668a57717ab14a6d217180ec112e6be533de93e7ecbf"
 dependencies = [
- "critical-section",
- "vcell",
+ "cfg-if",
+ "document-features",
+ "esp-metadata-generated",
 ]
 
 [[package]]
-name = "esp32-websocketz"
-version = "0.0.0"
+name = "esp-rtos"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ec711c8d06e79c67b75d01595539e86b0aac209643af98ca87a12250428b3"
 dependencies = [
- "critical-section",
+ "allocator-api2",
+ "cfg-if",
+ "document-features",
  "embassy-executor",
- "embassy-net",
- "embassy-time",
- "embedded-io",
- "embedded-io-async",
+ "embassy-sync 0.7.2",
+ "embassy-time-driver",
+ "embassy-time-queue-utils",
  "esp-alloc",
- "esp-bootloader-esp-idf",
+ "esp-config",
  "esp-hal",
- "esp-hal-embassy",
- "esp-println",
- "esp-wifi",
- "httparse",
+ "esp-hal-procmacros",
+ "esp-metadata-generated",
+ "esp-radio-rtos-driver",
+ "esp-sync",
+ "log",
+ "portable-atomic",
+]
+
+[[package]]
+name = "esp-sync"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d44974639b4e88914f83fe60d2832c00276657d7d857628fdfc966cc7302e8a8"
+dependencies = [
+ "cfg-if",
+ "document-features",
+ "embassy-sync 0.6.2",
+ "embassy-sync 0.7.2",
+ "esp-metadata-generated",
+ "riscv",
+ "xtensa-lx",
+]
+
+[[package]]
+name = "esp-wifi-sys"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b6544f6f0cb86169d1f93ba2101a8d50358a040c5043676ed86b793e09b12c"
+dependencies = [
+ "anyhow",
+ "log",
+]
+
+[[package]]
+name = "esp32"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b76170a463d18f888a1ad258031901036fd827a9ef126733053ba5f8739fb0c8"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32-websocketz"
+version = "0.1.0"
+dependencies = [
+ "critical-section",
+ "embassy-executor",
+ "embassy-net",
+ "embassy-time",
+ "embedded-io 0.7.1",
+ "embedded-io-async 0.7.0",
+ "esp-alloc",
+ "esp-backtrace",
+ "esp-bootloader-esp-idf",
+ "esp-hal",
+ "esp-println",
+ "esp-radio",
+ "esp-rtos",
  "log",
+ "rand_core 0.10.0",
+ "rand_core 0.9.5",
  "smoltcp",
  "static_cell",
  "websocketz",
 ]
 
+[[package]]
+name = "esp32c2"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e62cf8932966b8d445b6f1832977b468178f0a84effb2e9fda89f60c24d45aa3"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32c3"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "356af3771d0d6536c735bf71136594f4d1cbb506abf6e0c51a6639e9bf4e7988"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32c6"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f5e511df672d79cd63365c92045135e01ba952b6bddd25b660baff5e1110f6b"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32h2"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed4a50bbd1380931e095e0973b9b12f782a9c481f2edf1f7c42e7eb4ff736d6d"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32s2"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98574d4c577fbe888fe3e6df7fc80d25a05624d9998f7d7de1500ae21fcca78f"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
+[[package]]
+name = "esp32s3"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1810d8ee4845ef87542af981e38eb80ab531d0ef1061e1486014ab7af74c337a"
+dependencies = [
+ "critical-section",
+ "vcell",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -729,28 +914,28 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "framez"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474fb26e41fcc113f86bb8e0818c7e1150dd1d28dd9c47dfdd95f925df5f2947"
+checksum = "ddadef40a5b6d93abf81e40930527a71381e2cbe3fa4084425c7946735af2fdd"
 dependencies = [
- "embedded-io-async",
+ "embedded-io-async 0.7.0",
  "futures",
 ]
 
 [[package]]
 name = "fugit"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17186ad64927d5ac8f02c1e77ccefa08ccd9eaa314d5a4772278aa204a22f7e7"
+checksum = "4e639847d312d9a82d2e75b0edcc1e934efcc64e6cb7aa94f0b1fbec0bc231d6"
 dependencies = [
  "gcd",
 ]
 
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -762,9 +947,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -772,39 +957,38 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-core",
  "futures-sink",
  "futures-task",
  "pin-project-lite",
- "pin-utils",
 ]
 
 [[package]]
@@ -834,9 +1018,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.4"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 
 [[package]]
 name = "heapless"
@@ -848,6 +1032,16 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "heapless"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed"
+dependencies = [
+ "hash32",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -860,30 +1054,6 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
-[[package]]
-name = "iana-time-zone"
-version = "0.1.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "log",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -892,9 +1062,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -902,44 +1072,61 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "instability"
-version = "0.3.7"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf9fed6d91cfb734e7476a06bde8300a1b94e217e1b523b6f0cd1a01998c71d"
+checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971"
 dependencies = [
- "darling",
+ "darling 0.23.0",
  "indoc",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+
+[[package]]
+name = "jiff"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+]
 
 [[package]]
-name = "js-sys"
-version = "0.3.77"
+name = "jiff-static"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
 dependencies = [
- "once_cell",
- "wasm-bindgen",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.174"
+version = "0.2.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
 
 [[package]]
 name = "linked_list_allocator"
@@ -949,18 +1136,15 @@ checksum = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286"
 
 [[package]]
 name = "litrs"
-version = "0.4.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
-dependencies = [
- "proc-macro2",
-]
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "managed"
@@ -968,30 +1152,11 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d"
 
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "cfg-if",
- "digest",
-]
-
 [[package]]
 name = "memchr"
-version = "2.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-
-[[package]]
-name = "minijinja"
-version = "2.10.2"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd72e8b4e42274540edabec853f607c015c73436159b06c39c7af85a20433155"
-dependencies = [
- "serde",
-]
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "nb"
@@ -1016,7 +1181,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1028,12 +1193,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "once_cell"
-version = "1.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
-
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -1042,21 +1201,24 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
-name = "pin-utils"
-version = "0.1.0"
+name = "portable-atomic"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
-name = "portable-atomic"
-version = "1.11.1"
+name = "portable-atomic-util"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "portable_atomic_enum"
@@ -1076,71 +1238,43 @@ checksum = "a33fa6ec7f2047f572d49317cca19c87195de99c6e5b6ee492da701cfe02b053"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
  "toml_edit",
 ]
 
-[[package]]
-name = "proc-macro-error-attr2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "proc-macro-error2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
-dependencies = [
- "proc-macro-error-attr2",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "r0"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211"
-
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
 dependencies = [
- "rand_core 0.9.3",
+ "rand_core 0.10.0",
 ]
 
 [[package]]
@@ -1151,15 +1285,21 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+
+[[package]]
+name = "rand_core"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
 
 [[package]]
 name = "riscv"
-version = "0.12.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea8ff73d3720bdd0a97925f0bf79ad2744b6da8ff36be3840c48ac81191d7a7"
+checksum = "b05cfa3f7b30c84536a9025150d44d26b8e1cc20ddf436448d74cd9591eefb25"
 dependencies = [
  "critical-section",
  "embedded-hal 1.0.0",
@@ -1170,13 +1310,13 @@ dependencies = [
 
 [[package]]
 name = "riscv-macros"
-version = "0.1.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f265be5d634272320a7de94cea15c22a3bfdd4eb42eb43edc528415f066a1f25"
+checksum = "7d323d13972c1b104aa036bc692cd08b822c8bbf23d79a27c526095856499799"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1185,68 +1325,107 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8188909339ccc0c68cfb5a04648313f09621e8b87dc03095454f1a11f6c5d436"
 
+[[package]]
+name = "riscv-rt"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d07b9f3a0eff773fc4df11f44ada4fa302e529bff4b7fe7e6a4b98a65ce9174"
+dependencies = [
+ "riscv",
+ "riscv-pac",
+ "riscv-rt-macros",
+ "riscv-target-parser",
+]
+
 [[package]]
 name = "riscv-rt-macros"
-version = "0.4.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc71814687c45ba4cd1e47a54e03a2dbc62ca3667098fbae9cc6b423956758fa"
+checksum = "def519ddeeb5e43c2b4fc3952c27b3a86782fc05192f322b2309125cd85b1fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "riscv-target-parser"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1376b15f3ff160e9b1e8ea564ce427f2f6fcf77528cc0a8bf405cb476f9cea7"
+
+[[package]]
+name = "rlsf"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1646a59a9734b8b7a0ac51689388a60fe1625d4b956348e9de07591a1478457a"
+dependencies = [
+ "cfg-if",
+ "const-default",
+ "libc",
+ "rustversion",
+ "svgbobdoc",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+
+[[package]]
+name = "semihosting"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "f8e4abf97879f4e80db69a9fba7bd64998e9bdad25f58ef045a778e191172fd4"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.219"
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "serde_derive",
 ]
 
 [[package]]
-name = "serde_json"
-version = "1.0.140"
+name = "serde_derive"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
-name = "serde_spanned"
-version = "0.6.9"
+name = "serde_yaml"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
  "serde",
+ "unsafe-libyaml",
 ]
 
 [[package]]
@@ -1261,10 +1440,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "shlex"
-version = "1.3.0"
+name = "sha2"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
 
 [[package]]
 name = "smoltcp"
@@ -1275,16 +1459,31 @@ dependencies = [
  "bitflags 1.3.2",
  "byteorder",
  "cfg-if",
- "heapless",
+ "heapless 0.8.0",
  "log",
  "managed",
 ]
 
+[[package]]
+name = "somni-expr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed9b7648d5e8b2df6c5e49940c54bcdd2b4dd71eafc6e8f1c714eb4581b0f53"
+dependencies = [
+ "somni-parser",
+]
+
+[[package]]
+name = "somni-parser"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0f368519fc6c85fc1afdb769fb5a51123f6158013e143656e25a3485a0d401c"
+
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "static_cell"
@@ -1303,31 +1502,54 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "strum"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "rustversion",
- "syn",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "svgbobdoc"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2c04b93fc15d79b39c63218f15e3fdffaa4c227830686e3b7c5f41244eb3e50"
+dependencies = [
+ "base64 0.13.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "unicode-width",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1345,70 +1567,59 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "1.0.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.25.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "8ca1a40644a28bce036923f6a431df0b34236949d111cc07cb6dca830c9ef2e1"
 dependencies = [
  "indexmap",
- "serde",
- "serde_spanned",
  "toml_datetime",
- "toml_write",
+ "toml_parser",
  "winnow",
 ]
 
 [[package]]
-name = "toml_write"
-version = "0.1.2"
+name = "toml_parser"
+version = "1.0.10+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420"
+dependencies = [
+ "winnow",
+]
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "ufmt-write"
@@ -1418,9 +1629,21 @@ checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "vcell"
@@ -1440,264 +1663,80 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
-
 [[package]]
 name = "websocketz"
-version = "0.1.3"
+version = "0.2.0"
 dependencies = [
- "base64",
- "embedded-io-async",
+ "base64 0.22.1",
+ "embedded-io-async 0.7.0",
  "framez",
  "httparse",
  "rand",
- "rand_core 0.9.3",
+ "rand_core 0.10.0",
  "sha1",
  "thiserror",
 ]
 
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link",
- "windows-result",
- "windows-strings",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.60.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-result"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.4.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
-dependencies = [
- "windows-link",
-]
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows-link",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
 [[package]]
 name = "winnow"
-version = "0.7.11"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
+checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "xtensa-lx"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68737a6c8f32ddcd97476acf68ddc6d411697fd94f64a601af16854b74967dff"
+checksum = "e012d667b0aa6d2592ace8ef145a98bff3e76cca7a644f4181ecd7a916ed289b"
 dependencies = [
  "critical-section",
- "document-features",
 ]
 
 [[package]]
 name = "xtensa-lx-rt"
-version = "0.19.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235815f34d1bf9c2f9c07917e2b63efbcab5ca5ce9d8faddb97b7105eed1ade3"
+checksum = "8709f037fb123fe7ff146d2bce86f9dc0dfc53045c016bfd9d703317b6502845"
 dependencies = [
- "anyhow",
  "document-features",
- "enum-as-inner",
- "minijinja",
- "r0",
- "serde",
- "strum",
- "toml",
  "xtensa-lx",
  "xtensa-lx-rt-proc-macros",
 ]
 
 [[package]]
 name = "xtensa-lx-rt-proc-macros"
-version = "0.3.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c1ab67b22f0576b953a25c43bdfed0ff84af2e01ced85e95c29e7bac6bf2180"
+checksum = "96fb42cd29c42f8744c74276e9f5bee7b06685bbe5b88df891516d72cb320450"
 dependencies = [
- "darling",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.117",
 ]
diff --git a/examples/esp32/Cargo.toml b/examples/esp32/Cargo.toml
index 457b1eb..7ff7c7b 100644
--- a/examples/esp32/Cargo.toml
+++ b/examples/esp32/Cargo.toml
@@ -1,25 +1,28 @@
 [package]
-edition = "2021"
+edition = "2024"
 name = "esp32-websocketz"
-version = "0.0.0"
+rust-version = "1.88"
+version = "0.1.0"
 
 [[bin]]
 name = "esp32-websocketz"
 path = "./src/bin/main.rs"
 
-[workspace]
-members = ["."]
-
 [dependencies]
-esp-bootloader-esp-idf = "0.1.0"
-esp-hal = { version = "=1.0.0-beta.1", features = [
+esp-hal = { version = "~1.0", features = ["esp32", "log-04", "unstable"] }
+
+esp-rtos = { version = "0.2.0", features = [
+  "embassy",
+  "esp-alloc",
+  "esp-radio",
   "esp32",
   "log-04",
-  "unstable",
 ] }
+
+esp-bootloader-esp-idf = { version = "0.4.0", features = ["esp32", "log-04"] }
 log = "0.4.27"
 
-embassy-net = { version = "0.7.0", features = [
+embassy-net = { version = "0.8.0", features = [
   "dhcpv4",
   "log",
   "medium-ethernet",
@@ -27,23 +30,24 @@ embassy-net = { version = "0.7.0", features = [
   "udp",
   'dns',
 ] }
-embedded-io = "0.6.1"
-embedded-io-async = "0.6.1"
-esp-alloc = "0.8.0"
-esp-println = { version = "0.14.0", features = ["esp32", "log-04"] }
-critical-section = "1.2.0"
-embassy-executor = { version = "0.7.0", features = [
-  "log",
-  "task-arena-size-20480",
+embedded-io = "0.7.1"
+embedded-io-async = "0.7.0"
+esp-alloc = "0.9.0"
+esp-backtrace = { version = "0.18.1", features = [
+  "esp32",
+  "panic-handler",
+  "println",
 ] }
-embassy-time = { version = "0.4.0", features = ["log"] }
-esp-hal-embassy = { version = "0.8.1", features = ["esp32", "log-04"] }
-esp-wifi = { version = "0.14.1", features = [
-  "builtin-scheduler",
+esp-println = { version = "0.16.1", features = ["esp32", "log-04"] }
+# for more networking protocol support see https://crates.io/crates/edge-net
+embassy-executor = { version = "0.9.1", features = ["log"] }
+embassy-time = { version = "0.5.0", features = ["log"] }
+esp-radio = { version = "0.17.0", features = [
   "esp-alloc",
   "esp32",
   "log-04",
   "smoltcp",
+  "unstable",
   "wifi",
 ] }
 smoltcp = { version = "0.12.0", default-features = false, features = [
@@ -59,9 +63,14 @@ smoltcp = { version = "0.12.0", default-features = false, features = [
   "socket-tcp",
   "socket-udp",
 ] }
-static_cell = { version = "2.1.0", features = ["nightly"] }
+
+critical-section = "1.2.0"
+static_cell = "2.1.1"
+
 websocketz = { path = "../../" }
-httparse = { version = "1.10.1", default-features = false }
+rand_core_09 = { package = "rand_core", version = "0.9", default-features = false }
+rand_core_10 = { package = "rand_core", version = "0.10", default-features = false }
+
 
 [profile.dev]
 # Rust debug is too slow.
diff --git a/examples/esp32/build.rs b/examples/esp32/build.rs
index a76b496..2b6a670 100644
--- a/examples/esp32/build.rs
+++ b/examples/esp32/build.rs
@@ -12,9 +12,11 @@ fn linker_be_nice() {
 
         match kind.as_str() {
             "undefined-symbol" => match what.as_str() {
-                "_defmt_timestamp" => {
+                what if what.starts_with("_defmt_") => {
                     eprintln!();
-                    eprintln!("💡 `defmt` not found - make sure `defmt.x` is added as a linker script and you have included `use defmt_rtt as _;`");
+                    eprintln!(
+                        "💡 `defmt` not found - make sure `defmt.x` is added as a linker script and you have included `use defmt_rtt as _;`"
+                    );
                     eprintln!();
                 }
                 "_stack_start" => {
@@ -22,16 +24,32 @@ fn linker_be_nice() {
                     eprintln!("💡 Is the linker script `linkall.x` missing?");
                     eprintln!();
                 }
-                "esp_wifi_preempt_enable"
-                | "esp_wifi_preempt_yield_task"
-                | "esp_wifi_preempt_task_create" => {
+                what if what.starts_with("esp_rtos_") => {
                     eprintln!();
-                    eprintln!("💡 `esp-wifi` has no scheduler enabled. Make sure you have the `builtin-scheduler` feature enabled, or that you provide an external scheduler.");
+                    eprintln!(
+                        "💡 `esp-radio` has no scheduler enabled. Make sure you have initialized `esp-rtos` or provided an external scheduler."
+                    );
                     eprintln!();
                 }
                 "embedded_test_linker_file_not_added_to_rustflags" => {
                     eprintln!();
-                    eprintln!("💡 `embedded-test` not found - make sure `embedded-test.x` is added as a linker script for tests");
+                    eprintln!(
+                        "💡 `embedded-test` not found - make sure `embedded-test.x` is added as a linker script for tests"
+                    );
+                    eprintln!();
+                }
+                "free"
+                | "malloc"
+                | "calloc"
+                | "get_free_internal_heap_size"
+                | "malloc_internal"
+                | "realloc_internal"
+                | "calloc_internal"
+                | "free_internal" => {
+                    eprintln!();
+                    eprintln!(
+                        "💡 Did you forget the `esp-alloc` dependency or didn't enable the `compat` feature on it?"
+                    );
                     eprintln!();
                 }
                 _ => (),
diff --git a/examples/esp32/src/bin/main.rs b/examples/esp32/src/bin/main.rs
index 1d45155..1368820 100644
--- a/examples/esp32/src/bin/main.rs
+++ b/examples/esp32/src/bin/main.rs
@@ -5,24 +5,18 @@
     reason = "mem::forget is generally not safe to do with esp_hal types, especially those \
     holding buffers for the duration of a data transfer."
 )]
+#![deny(clippy::large_stack_frames)]
 
 use embassy_executor::Spawner;
-use embassy_net::{tcp::TcpSocket, Runner, StackResources};
+use embassy_net::Runner;
 use embassy_time::{Duration, Timer};
-use esp_hal::{clock::CpuClock, rng::Trng, timer::timg::TimerGroup};
-use esp_wifi::{
-    wifi::{ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiState},
-    EspWifiController,
+use esp_backtrace as _;
+use esp_hal::clock::CpuClock;
+use esp_hal::timer::timg::TimerGroup;
+use esp_radio::wifi::{
+    ClientConfig, ModeConfig, ScanConfig, WifiController, WifiDevice, WifiEvent, WifiStaState,
 };
-use httparse::Header;
 use log::{error, info};
-use smoltcp::wire::DnsQueryType;
-use websocketz::{next, options::ConnectOptions, Message, WebSocket};
-
-#[panic_handler]
-fn panic(_: &core::panic::PanicInfo) -> ! {
-    loop {}
-}
 
 extern crate alloc;
 
@@ -42,46 +36,59 @@ macro_rules! mk_static {
 const SSID: &str = env!("WIFI_SSID");
 const PASSWORD: &str = env!("WIFI_PASSWORD");
 
-#[esp_hal_embassy::main]
-async fn main(spawner: Spawner) {
-    // generator version: 0.4.0
+#[allow(
+    clippy::large_stack_frames,
+    reason = "it's not unusual to allocate larger buffers etc. in main"
+)]
+#[esp_rtos::main]
+async fn main(spawner: Spawner) -> ! {
+    // generator version: 1.2.0
 
     esp_println::logger::init_logger_from_env();
 
     let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
-    let peripherals = esp_hal::init(config);
+    let mut peripherals = esp_hal::init(config);
 
-    esp_alloc::heap_allocator!(size: 64 * 1024);
+    esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 98768);
 
-    let timer0 = TimerGroup::new(peripherals.TIMG1);
-    esp_hal_embassy::init(timer0.timer0);
+    let timg0 = TimerGroup::new(peripherals.TIMG0);
+    esp_rtos::start(timg0.timer0);
 
     info!("Embassy initialized!");
 
-    let mut trng = Trng::new(peripherals.RNG, peripherals.ADC1);
+    // Initialize the TRNG source
+    let _trng_source = esp_hal::rng::TrngSource::new(peripherals.RNG, peripherals.ADC1.reborrow());
+
+    let mut trng = esp_hal::rng::Trng::try_new().expect("Failed to initialize TRNG");
 
-    let timer1 = TimerGroup::new(peripherals.TIMG0);
-    let wifi_init = &*mk_static!(
-        EspWifiController<'static>,
-        esp_wifi::init(timer1.timer0, trng.rng, peripherals.RADIO_CLK)
-            .expect("Failed to initialize WIFI/BLE controller")
+    let esp_radio_ctrl = &*mk_static!(
+        esp_radio::Controller<'static>,
+        esp_radio::init().expect("Failed to initialize radio controller")
     );
-    let (wifi_controller, interfaces) = esp_wifi::wifi::new(wifi_init, peripherals.WIFI)
-        .expect("Failed to initialize WIFI controller");
+
+    let (controller, interfaces) =
+        esp_radio::wifi::new(esp_radio_ctrl, peripherals.WIFI, Default::default())
+            .expect("Failed to initialize wifi");
 
     let wifi_interface = interfaces.sta;
 
     let config = embassy_net::Config::dhcpv4(Default::default());
+
     let seed = (trng.random() as u64) << 32 | trng.random() as u64;
+
+    // Init network stack
     let (stack, runner) = embassy_net::new(
         wifi_interface,
         config,
-        mk_static!(StackResources<3>, StackResources::<3>::new()),
+        mk_static!(
+            embassy_net::StackResources<3>,
+            embassy_net::StackResources::<3>::new()
+        ),
         seed,
     );
 
     spawner
-        .spawn(connection(wifi_controller))
+        .spawn(connection(controller))
         .expect("Failed to spawn connection task");
     spawner
         .spawn(net_task(runner))
@@ -110,7 +117,7 @@ async fn main(spawner: Spawner) {
 
     let domain = "websockets.chilkat.io";
     let ip = *stack
-        .dns_query(domain, DnsQueryType::A)
+        .dns_query(domain, smoltcp::wire::DnsQueryType::A)
         .await
         .expect("DNS query failed")
         .first()
@@ -121,7 +128,7 @@ async fn main(spawner: Spawner) {
     loop {
         Timer::after(Duration::from_millis(1_000)).await;
 
-        let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer);
+        let mut socket = embassy_net::tcp::TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer);
 
         socket.set_timeout(Some(embassy_time::Duration::from_secs(2)));
 
@@ -141,15 +148,16 @@ async fn main(spawner: Spawner) {
         let mut write_buf = [0u8; 1024];
         let mut fragments_buf = [0u8; 1024];
 
-        let mut websocketz = WebSocket::connect::<16>(
-            ConnectOptions::default()
+        let rng = RngCompat { inner: &mut trng };
+        let mut websocketz = websocketz::WebSocket::connect::<16>(
+            websocketz::options::ConnectOptions::default()
                 .with_path_unchecked("/wsChilkatEcho.ashx")
-                .with_headers(&[Header {
+                .with_headers(&[websocketz::http::Header {
                     name: "Host",
                     value: domain.as_bytes(),
                 }]),
             &mut socket,
-            &mut trng,
+            rng,
             &mut read_buf,
             &mut write_buf,
             &mut fragments_buf,
@@ -162,11 +170,11 @@ async fn main(spawner: Spawner) {
 
         'ws: loop {
             websocketz
-                .send(Message::Text("Hello, WebSocket!"))
+                .send(websocketz::Message::Text("Hello, WebSocket!"))
                 .await
                 .expect("Failed to send message");
 
-            match next!(websocketz) {
+            match websocketz::next!(websocketz) {
                 None => {
                     info!("EOF");
 
@@ -189,47 +197,47 @@ async fn main(spawner: Spawner) {
     }
 }
 
+#[allow(
+    clippy::large_stack_frames,
+    reason = "it's not unusual to allocate larger buffers etc. in wifi connection tasks"
+)]
 #[embassy_executor::task]
 async fn connection(mut controller: WifiController<'static>) {
+    info!("start connection task");
     info!("Device capabilities: {:?}", controller.capabilities());
-
     loop {
-        if esp_wifi::wifi::wifi_state() == WifiState::StaConnected {
+        if esp_radio::wifi::sta_state() == WifiStaState::Connected {
             // wait until we're no longer connected
             controller.wait_for_event(WifiEvent::StaDisconnected).await;
-
             Timer::after(Duration::from_millis(5000)).await
         }
         if !matches!(controller.is_started(), Ok(true)) {
-            let client_config = Configuration::Client(ClientConfiguration {
-                ssid: SSID.into(),
-                password: PASSWORD.into(),
-                ..Default::default()
-            });
-
-            controller.set_configuration(&client_config).unwrap();
-
+            let client_config = ModeConfig::Client(
+                ClientConfig::default()
+                    .with_ssid(SSID.into())
+                    .with_password(PASSWORD.into()),
+            );
+            controller.set_config(&client_config).unwrap();
             info!("Starting wifi");
-
             controller.start_async().await.unwrap();
-
             info!("Wifi started!");
 
             info!("Scan");
-
-            let result = controller.scan_n_async(10).await.unwrap();
-
+            let scan_config = ScanConfig::default().with_max(10);
+            let result = controller
+                .scan_with_config_async(scan_config)
+                .await
+                .unwrap();
             for ap in result {
-                info!("{:?}", ap);
+                info!("Found AP: {:?}", ap);
             }
         }
         info!("About to connect...");
 
         match controller.connect_async().await {
             Ok(_) => info!("Wifi connected!"),
-            Err(err) => {
-                error!("Failed to connect to wifi: {err:?}");
-
+            Err(e) => {
+                info!("Failed to connect to wifi: {e:?}");
                 Timer::after(Duration::from_millis(5000)).await
             }
         }
@@ -240,3 +248,30 @@ async fn connection(mut controller: WifiController<'static>) {
 async fn net_task(mut runner: Runner<'static, WifiDevice<'static>>) {
     runner.run().await
 }
+
+/// Compat for rand_core 0.9 and 0.10
+///
+/// Websocketz uses rand_core 0.10, but esp-hal's TRNG implements the 0.9 traits.
+struct RngCompat<T> {
+    inner: T,
+}
+
+impl<T> rand_core_10::TryRng for RngCompat<T>
+where
+    T: rand_core_09::RngCore,
+{
+    type Error = core::convert::Infallible;
+
+    fn try_next_u32(&mut self) -> Result<u32, Self::Error> {
+        Ok(self.inner.next_u32())
+    }
+
+    fn try_next_u64(&mut self) -> Result<u64, Self::Error> {
+        Ok(self.inner.next_u64())
+    }
+
+    fn try_fill_bytes(&mut self, dst: &mut [u8]) -> Result<(), Self::Error> {
+        self.inner.fill_bytes(dst);
+        Ok(())
+    }
+}
diff --git a/examples/server-callback.rs b/examples/server-callback.rs
index a20a5a4..7bc0969 100644
--- a/examples/server-callback.rs
+++ b/examples/server-callback.rs
@@ -7,7 +7,10 @@
 
 use embedded_io_adapters::tokio_1::FromTokio;
 use httparse::Header;
-use rand::{SeedableRng, rngs::StdRng};
+use rand::{
+    SeedableRng,
+    rngs::{StdRng, SysRng},
+};
 use tokio::net::TcpListener;
 use websocketz::{Message, WebSocket, http::Request, next, options::AcceptOptions};
 
@@ -38,7 +41,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                         value: b"Server-Value",
                     }]),
                 FromTokio::new(stream),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 &mut read_buf,
                 &mut write_buf,
                 &mut fragments_buf,
diff --git a/examples/simple.rs b/examples/simple.rs
index 4f02a31..11c89c3 100644
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -5,7 +5,10 @@
 //! ```
 
 use embedded_io_adapters::tokio_1::FromTokio;
-use rand::{SeedableRng, rngs::StdRng};
+use rand::{
+    SeedableRng,
+    rngs::{StdRng, SysRng},
+};
 use tokio::net::TcpStream;
 use websocketz::{Message, WebSocket, http::Header, next, options::ConnectOptions};
 
@@ -23,7 +26,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let read_buf = &mut [0u8; 8192 * 2];
     let write_buf = &mut [0u8; 8192 * 2];
     let fragments_buf = &mut [0u8; 8192 * 2];
-    let rng = StdRng::from_os_rng();
+    let rng = StdRng::try_from_rng(&mut SysRng).unwrap();
 
     let mut websocketz = WebSocket::connect::<16>(
         ConnectOptions::default()
diff --git a/examples/split.rs b/examples/split.rs
index d54cacd..e198a7b 100644
--- a/examples/split.rs
+++ b/examples/split.rs
@@ -5,7 +5,10 @@
 //! ```
 
 use embedded_io_adapters::tokio_1::FromTokio;
-use rand::{SeedableRng, rngs::StdRng};
+use rand::{
+    SeedableRng,
+    rngs::{StdRng, SysRng},
+};
 use tokio::{
     io::{ReadHalf, WriteHalf},
     net::TcpStream,
@@ -30,7 +33,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let read_buf = &mut [0u8; 8192 * 2];
     let write_buf = &mut [0u8; 8192 * 2];
     let fragments_buf = &mut [0u8; 8192 * 2];
-    let rng = StdRng::from_os_rng();
+    let rng = StdRng::try_from_rng(&mut SysRng).unwrap();
 
     let websocketz = WebSocket::connect::<16>(
         ConnectOptions::default(),
diff --git a/src/codec.rs b/src/codec.rs
index 1edaf98..e1f120e 100644
--- a/src/codec.rs
+++ b/src/codec.rs
@@ -1,6 +1,6 @@
 use framez::{decode::Decoder, encode::Encoder};
-use rand::Rng;
-use rand_core::RngCore;
+use rand::RngExt;
+use rand_core::Rng;
 
 use crate::{
     Frame, FrameMut, Header, Message, OpCode,
@@ -241,7 +241,7 @@ impl<'buf, R> Decoder<'buf> for FramesCodec<R> {
     }
 }
 
-impl<R: RngCore> FramesCodec<R> {
+impl<R: Rng> FramesCodec<R> {
     #[inline(always)]
     fn encode_inner<F>(
         &mut self,
@@ -287,7 +287,7 @@ impl<R: RngCore> FramesCodec<R> {
     }
 }
 
-impl<R: RngCore> Encoder<Message<'_>> for FramesCodec<R> {
+impl<R: Rng> Encoder<Message<'_>> for FramesCodec<R> {
     type Error = FrameEncodeError;
 
     fn encode(&mut self, item: Message, dst: &mut [u8]) -> Result<usize, Self::Error> {
@@ -301,7 +301,7 @@ impl<R: RngCore> Encoder<Message<'_>> for FramesCodec<R> {
     }
 }
 
-impl<R: RngCore> Encoder<Frame<'_>> for FramesCodec<R> {
+impl<R: Rng> Encoder<Frame<'_>> for FramesCodec<R> {
     type Error = FrameEncodeError;
 
     fn encode(&mut self, item: Frame, dst: &mut [u8]) -> Result<usize, Self::Error> {
@@ -434,7 +434,10 @@ mod tests {
     }
 
     mod encode {
-        use rand::{SeedableRng, rngs::StdRng};
+        use rand::{
+            SeedableRng,
+            rngs::{StdRng, SysRng},
+        };
 
         use super::*;
 
@@ -443,7 +446,7 @@ mod tests {
             let dst = &mut [0u8; 16];
             let message = Message::Binary(&[0; 24]);
 
-            let mut codec = FramesCodec::new(StdRng::from_os_rng());
+            let mut codec = FramesCodec::new(StdRng::try_from_rng(&mut SysRng).unwrap());
 
             let error = codec.encode(message, dst).unwrap_err();
 
diff --git a/src/functions.rs b/src/functions.rs
index efe3e05..447ad63 100644
--- a/src/functions.rs
+++ b/src/functions.rs
@@ -1,6 +1,6 @@
 use embedded_io_async::{Read, Write};
 use framez::state::{ReadState, WriteState};
-use rand::RngCore;
+use rand_core::Rng;
 
 use crate::{
     ConnectionState, Frame, Message, OnFrame, WebSocketCore,
@@ -14,10 +14,10 @@ pub struct ReadAutoCaller;
 
 impl ReadAutoCaller {
     #[allow(clippy::too_many_arguments)]
-    pub async fn call<'this, F, RW, Rng>(
+    pub async fn call<'this, F, RW, RNG>(
         &self,
         auto: F,
-        codec: &mut FramesCodec<Rng>,
+        codec: &mut FramesCodec<RNG>,
         inner: &mut RW,
         read_state: &'this mut ReadState<'_>,
         write_state: &mut WriteState<'_>,
@@ -26,7 +26,7 @@ impl ReadAutoCaller {
     ) -> Option<Result<Option<Message<'this>>, Error<RW::Error>>>
     where
         RW: Read + Write,
-        Rng: RngCore,
+        RNG: Rng,
         F: FnOnce(Frame<'_>) -> Result<OnFrame<'_>, ProtocolError> + 'static,
     {
         let frame = match framez::functions::maybe_next(read_state, codec, inner).await {
@@ -54,7 +54,7 @@ impl ReadAutoCaller {
             Err(err) => return Some(Err(Error::Read(ReadError::Protocol(err)))),
         };
 
-        WebSocketCore::<RW, Rng>::on_frame(fragments_state, frame)
+        WebSocketCore::<RW, RNG>::on_frame(fragments_state, frame)
             .map(|result| result.map_err(Error::from))
     }
 }
@@ -64,10 +64,10 @@ pub struct ReadCaller;
 
 impl ReadCaller {
     #[allow(clippy::too_many_arguments)]
-    pub async fn call<'this, RW, Rng>(
+    pub async fn call<'this, RW, RNG>(
         &self,
         _auto: (),
-        codec: &mut FramesCodec<Rng>,
+        codec: &mut FramesCodec<RNG>,
         inner: &mut RW,
         read_state: &'this mut ReadState<'_>,
         _write_state: &mut WriteState<'_>,
@@ -84,13 +84,13 @@ impl ReadCaller {
             None => return None,
         };
 
-        WebSocketCore::<RW, Rng>::on_frame(fragments_state, frame)
+        WebSocketCore::<RW, RNG>::on_frame(fragments_state, frame)
             .map(|result| result.map_err(Error::from))
     }
 }
 
-pub async fn send<RW, Rng>(
-    codec: &mut FramesCodec<Rng>,
+pub async fn send<RW, RNG>(
+    codec: &mut FramesCodec<RNG>,
     inner: &mut RW,
     write_state: &mut WriteState<'_>,
     state: &mut ConnectionState,
@@ -98,7 +98,7 @@ pub async fn send<RW, Rng>(
 ) -> Result<(), Error<RW::Error>>
 where
     RW: Write,
-    Rng: RngCore,
+    RNG: Rng,
 {
     if state.closed {
         return Err(Error::Write(WriteError::ConnectionClosed));
@@ -113,8 +113,8 @@ where
     Ok(())
 }
 
-pub async fn send_fragmented<RW, Rng>(
-    codec: &mut FramesCodec<Rng>,
+pub async fn send_fragmented<RW, RNG>(
+    codec: &mut FramesCodec<RNG>,
     inner: &mut RW,
     write_state: &mut WriteState<'_>,
     state: &mut ConnectionState,
@@ -123,7 +123,7 @@ pub async fn send_fragmented<RW, Rng>(
 ) -> Result<(), Error<RW::Error>>
 where
     RW: Write,
-    Rng: RngCore,
+    RNG: Rng,
 {
     if state.closed {
         return Err(Error::Write(WriteError::ConnectionClosed));
diff --git a/src/lib.rs b/src/lib.rs
index 3f71fbf..df790a1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,10 +2,10 @@
 //!
 //! # Traits
 //!
-//! This library is based on [`embedded_io_async`](https://docs.rs/embedded-io-async/latest/embedded_io_async/)'s
-//! [`Read`](https://docs.rs/embedded-io-async/latest/embedded_io_async/trait.Read.html) and [`Write`](https://docs.rs/embedded-io-async/latest/embedded_io_async/trait.Write.html) and [`rand_core`](https://docs.rs/rand_core/latest/rand_core/)'s [`RngCore`](https://docs.rs/rand_core/latest/rand_core/trait.RngCore.html) traits.
+//! This library is based on [`embedded_io_async`](https://docs.rs/embedded-io-async/0.7/embedded_io_async/)'s
+//! [`Read`](https://docs.rs/embedded-io-async/0.7/embedded_io_async/trait.Read.html) and [`Write`](https://docs.rs/embedded-io-async/0.7/embedded_io_async/trait.Write.html) and [`rand_core`](https://docs.rs/rand_core/0.10/rand_core/)'s [`Rng`](https://docs.rs/rand_core/0.10/rand_core/trait.Rng.html) traits.
 //!
-//! It's recommended to use [`embedded_io_adapters`](https://docs.rs/embedded-io-adapters/0.6.1/embedded_io_adapters/) if you are using other async `Read` and `Write` traits like [`tokio`](https://docs.rs/tokio/latest/tokio/index.html)'s [`AsyncRead`](https://docs.rs/tokio/latest/tokio/io/trait.AsyncRead.html) and [`AsyncWrite`](https://docs.rs/tokio/latest/tokio/io/trait.AsyncWrite.html).
+//! It's recommended to use [`embedded_io_adapters`](https://docs.rs/embedded-io-adapters/0.7/embedded_io_adapters/) if you are using other async `Read` and `Write` traits like [`tokio`](https://docs.rs/tokio/1.0/tokio/index.html)'s [`AsyncRead`](https://docs.rs/tokio/1.0/tokio/io/trait.AsyncRead.html) and [`AsyncWrite`](https://docs.rs/tokio/1.0/tokio/io/trait.AsyncWrite.html).
 //!
 //! See the examples folder for more information.
 //!
@@ -13,7 +13,7 @@
 //!
 //! In the following examples, `Noop` is a mock type that implements the required traits for using a [`WebSocket`].
 //! - A `stream` is anything that implements [`embedded_io_async::Read`] + [`embedded_io_async::Write`].
-//! - An `rng` is anything that implements [`rand_core::RngCore`].
+//! - An `rng` is anything that implements [`rand_core::Rng`].
 //!
 //! ### Client
 //! ```
diff --git a/src/mock.rs b/src/mock.rs
index b593f82..7d8951d 100644
--- a/src/mock.rs
+++ b/src/mock.rs
@@ -3,7 +3,7 @@
 use core::convert::Infallible;
 
 use embedded_io_async::{ErrorType, Read, Write};
-use rand_core::RngCore;
+use rand_core::TryRng;
 
 #[derive(Debug)]
 pub struct Noop;
@@ -22,16 +22,24 @@ impl Write for Noop {
     async fn write(&mut self, buf: &[u8]) -> Result<usize, Self::Error> {
         Ok(buf.len())
     }
+
+    async fn flush(&mut self) -> Result<(), Self::Error> {
+        Ok(())
+    }
 }
 
-impl RngCore for Noop {
-    fn next_u32(&mut self) -> u32 {
-        0
+impl TryRng for Noop {
+    type Error = Infallible;
+
+    fn try_next_u32(&mut self) -> Result<u32, Self::Error> {
+        Ok(0)
     }
 
-    fn next_u64(&mut self) -> u64 {
-        0
+    fn try_next_u64(&mut self) -> Result<u64, Self::Error> {
+        Ok(0)
     }
 
-    fn fill_bytes(&mut self, _dst: &mut [u8]) {}
+    fn try_fill_bytes(&mut self, _dst: &mut [u8]) -> Result<(), Self::Error> {
+        Ok(())
+    }
 }
diff --git a/src/tests.rs b/src/tests.rs
index c223fa2..90872d4 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -1,5 +1,8 @@
 use embedded_io_adapters::tokio_1::FromTokio;
-use rand::{SeedableRng, rngs::StdRng};
+use rand::{
+    SeedableRng,
+    rngs::{StdRng, SysRng},
+};
 
 use crate::{CloseCode, Message, WebSocket, next};
 
@@ -64,7 +67,7 @@ mod macros {
 
         let mut websocketz = WebSocket::client(
             FromTokio::new(stream),
-            StdRng::from_os_rng(),
+            StdRng::try_from_rng(&mut SysRng).unwrap(),
             read_buf,
             write_buf,
             fragments_buf,
@@ -125,7 +128,7 @@ mod client {
         let client = async move {
             let mut websocketz = WebSocket::client(
                 FromTokio::new(client),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -188,7 +191,7 @@ mod client {
         let client = async move {
             let mut websocketz = WebSocket::client(
                 FromTokio::new(client),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -246,7 +249,7 @@ mod client {
         let client = async move {
             let mut websocketz = WebSocket::client(
                 FromTokio::new(client),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -321,7 +324,7 @@ mod client {
                     match WebSocket::connect::<16>(
                         ConnectOptions::default(),
                         FromTokio::new(client),
-                        StdRng::from_os_rng(),
+                        StdRng::try_from_rng(&mut SysRng).unwrap(),
                         read_buf,
                         write_buf,
                         fragments_buf,
@@ -406,7 +409,7 @@ mod client {
                 let _ = WebSocket::accept_with(
                     AcceptOptions::default(),
                     FromTokio::new(server),
-                    StdRng::from_os_rng(),
+                    StdRng::try_from_rng(&mut SysRng).unwrap(),
                     read_buf,
                     write_buf,
                     fragments_buf,
@@ -423,7 +426,7 @@ mod client {
                 match WebSocket::connect::<16>(
                     ConnectOptions::default(),
                     FromTokio::new(client),
-                    StdRng::from_os_rng(),
+                    StdRng::try_from_rng(&mut SysRng).unwrap(),
                     read_buf,
                     write_buf,
                     fragments_buf,
@@ -481,7 +484,7 @@ mod client {
                 let mut websocketz = WebSocket::connect::<16>(
                     ConnectOptions::default(),
                     FromTokio::new(client),
-                    StdRng::from_os_rng(),
+                    StdRng::try_from_rng(&mut SysRng).unwrap(),
                     read_buf,
                     write_buf,
                     fragments_buf,
@@ -547,7 +550,7 @@ mod server {
         let server = async move {
             let mut websocketz = WebSocket::server(
                 FromTokio::new(server),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -609,7 +612,7 @@ mod server {
         let server = async move {
             let mut websocketz = WebSocket::server(
                 FromTokio::new(server),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -695,7 +698,7 @@ mod server {
         let server = async move {
             let mut websocketz = WebSocket::server(
                 FromTokio::new(server),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -738,7 +741,7 @@ mod server {
                     match WebSocket::accept::<16>(
                         AcceptOptions::default(),
                         FromTokio::new(server),
-                        StdRng::from_os_rng(),
+                        StdRng::try_from_rng(&mut SysRng).unwrap(),
                         read_buf,
                         write_buf,
                         fragments_buf,
@@ -822,7 +825,7 @@ mod server {
             match WebSocket::accept::<16>(
                 AcceptOptions::default(),
                 FromTokio::new(server),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -852,7 +855,7 @@ mod server {
                 let mut websocketz = WebSocket::accept::<16>(
                     AcceptOptions::default(),
                     FromTokio::new(server),
-                    StdRng::from_os_rng(),
+                    StdRng::try_from_rng(&mut SysRng).unwrap(),
                     read_buf,
                     write_buf,
                     fragments_buf,
@@ -931,7 +934,7 @@ mod fragmentation {
 
         let mut websocketz = WebSocket::client(
             FromTokio::new(client),
-            StdRng::from_os_rng(),
+            StdRng::try_from_rng(&mut SysRng).unwrap(),
             read_buf,
             write_buf,
             fragments_buf,
@@ -958,7 +961,7 @@ mod fragmentation {
 
         let mut websocketz = WebSocket::client(
             FromTokio::new(client),
-            StdRng::from_os_rng(),
+            StdRng::try_from_rng(&mut SysRng).unwrap(),
             read_buf,
             write_buf,
             fragments_buf,
@@ -1021,7 +1024,7 @@ mod auto {
 
             let mut websocketz = WebSocket::client(
                 FromTokio::new(client),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -1049,7 +1052,7 @@ mod auto {
 
             let mut websocketz = WebSocket::server(
                 FromTokio::new(server),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -1072,7 +1075,7 @@ mod auto {
 
             let mut websocketz = WebSocket::client(
                 FromTokio::new(client),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -1115,7 +1118,7 @@ mod auto {
 
             let mut websocketz = WebSocket::server(
                 FromTokio::new(server),
-                StdRng::from_os_rng(),
+                StdRng::try_from_rng(&mut SysRng).unwrap(),
                 read_buf,
                 write_buf,
                 fragments_buf,
@@ -1154,7 +1157,7 @@ mod protocol {
 
                 let mut websocketz = WebSocket::client(
                     FromTokio::new(client),
-                    StdRng::from_os_rng(),
+                    StdRng::try_from_rng(&mut SysRng).unwrap(),
                     read_buf,
                     write_buf,
                     fragments_buf,
diff --git a/src/websocket.rs b/src/websocket.rs
index fb3b7d6..b378352 100644
--- a/src/websocket.rs
+++ b/src/websocket.rs
@@ -3,7 +3,7 @@ use framez::{
     Framed,
     state::{ReadState, ReadWriteState, WriteState},
 };
-use rand::RngCore;
+use rand_core::Rng;
 
 use crate::{
     FragmentsState, Frame, FramesCodec, Message, OnFrame, WebSocketCore,
@@ -19,16 +19,16 @@ use crate::{
 /// - `auto_pong`: `true`
 /// - `auto_close`: `true`
 #[derive(Debug)]
-pub struct WebSocket<'buf, RW, Rng> {
+pub struct WebSocket<'buf, RW, RNG> {
     #[doc(hidden)]
-    pub core: WebSocketCore<'buf, RW, Rng>,
+    pub core: WebSocketCore<'buf, RW, RNG>,
 }
 
-impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
+impl<'buf, RW, RNG> WebSocket<'buf, RW, RNG> {
     /// Creates a new [`WebSocket`] client after a successful handshake.
     pub const fn client(
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_buffer: &'buf mut [u8],
@@ -47,7 +47,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     /// Creates a new [`WebSocket`] server after a successful handshake.
     pub const fn server(
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_buffer: &'buf mut [u8],
@@ -70,14 +70,14 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     pub async fn connect<const N: usize>(
         options: ConnectOptions<'_, '_>,
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_buffer: &'buf mut [u8],
     ) -> Result<Self, Error<RW::Error>>
     where
         RW: Read + Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         Ok(Self::connect_with::<N, _, _, _>(
             options,
@@ -99,7 +99,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     pub async fn connect_with<const N: usize, F, T, E>(
         options: ConnectOptions<'_, '_>,
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_buffer: &'buf mut [u8],
@@ -108,7 +108,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     where
         F: for<'a> Fn(&Response<'a, N>) -> Result<T, E>,
         RW: Read + Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         Self::client(inner, rng, read_buffer, write_buffer, fragments_buffer)
             .client_handshake::<N, _, _, _>(options, on_response)
@@ -122,7 +122,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     pub async fn accept<const N: usize>(
         options: AcceptOptions<'_, '_>,
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_buffer: &'buf mut [u8],
@@ -150,7 +150,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     pub async fn accept_with<const N: usize, F, T, E>(
         options: AcceptOptions<'_, '_>,
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_buffer: &'buf mut [u8],
@@ -211,7 +211,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     where
         F: for<'a> Fn(&Response<'a, N>) -> Result<T, E>,
         RW: Read + Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         let (core, custom) = self
             .core
@@ -242,7 +242,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     pub async fn send(&mut self, message: Message<'_>) -> Result<(), Error<RW::Error>>
     where
         RW: Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         self.core.send(message).await
     }
@@ -255,7 +255,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     ) -> Result<(), Error<RW::Error>>
     where
         RW: Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         self.core.send_fragmented(message, fragment_size).await
     }
@@ -268,7 +268,7 @@ impl<'buf, RW, Rng> WebSocket<'buf, RW, Rng> {
     pub fn split_with<F, R, W>(
         self,
         split: F,
-    ) -> (WebSocketRead<'buf, R>, WebSocketWrite<'buf, W, Rng>)
+    ) -> (WebSocketRead<'buf, R>, WebSocketWrite<'buf, W, RNG>)
     where
         F: FnOnce(RW) -> (R, W),
     {
@@ -394,27 +394,27 @@ impl<'buf, RW> WebSocketRead<'buf, RW> {
 
 /// Write half of a WebSocket connection.
 #[derive(Debug)]
-pub struct WebSocketWrite<'buf, RW, Rng> {
+pub struct WebSocketWrite<'buf, RW, RNG> {
     #[doc(hidden)]
-    pub core: WebSocketCore<'buf, RW, Rng>,
+    pub core: WebSocketCore<'buf, RW, RNG>,
 }
 
-impl<'buf, RW, Rng> WebSocketWrite<'buf, RW, Rng> {
-    const fn new_from_framed(framed: Framed<'buf, FramesCodec<Rng>, RW>) -> Self {
+impl<'buf, RW, RNG> WebSocketWrite<'buf, RW, RNG> {
+    const fn new_from_framed(framed: Framed<'buf, FramesCodec<RNG>, RW>) -> Self {
         Self {
             core: WebSocketCore::new_from_framed(framed, FragmentsState::empty()),
         }
     }
 
     /// Creates a new [`WebSocketWrite`] client after a successful handshake.
-    pub const fn client(inner: RW, rng: Rng, write_buffer: &'buf mut [u8]) -> Self {
+    pub const fn client(inner: RW, rng: RNG, write_buffer: &'buf mut [u8]) -> Self {
         Self {
             core: WebSocketCore::client(inner, rng, &mut [], write_buffer, FragmentsState::empty()),
         }
     }
 
     /// Creates a new [`WebSocketWrite`] server after a successful handshake.
-    pub const fn server(inner: RW, rng: Rng, write_buffer: &'buf mut [u8]) -> Self {
+    pub const fn server(inner: RW, rng: RNG, write_buffer: &'buf mut [u8]) -> Self {
         Self {
             core: WebSocketCore::server(inner, rng, &mut [], write_buffer, FragmentsState::empty()),
         }
@@ -442,7 +442,7 @@ impl<'buf, RW, Rng> WebSocketWrite<'buf, RW, Rng> {
     pub async fn send(&mut self, message: Message<'_>) -> Result<(), Error<RW::Error>>
     where
         RW: Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         self.core.send(message).await
     }
@@ -455,7 +455,7 @@ impl<'buf, RW, Rng> WebSocketWrite<'buf, RW, Rng> {
     ) -> Result<(), Error<RW::Error>>
     where
         RW: Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         self.core.send_fragmented(message, fragment_size).await
     }
diff --git a/src/websocket_core.rs b/src/websocket_core.rs
index 6376368..539a49f 100644
--- a/src/websocket_core.rs
+++ b/src/websocket_core.rs
@@ -2,7 +2,7 @@ use base64::{Engine as _, engine::general_purpose};
 use embedded_io_async::{Read, Write};
 use framez::Framed;
 use httparse::Header;
-use rand::RngCore;
+use rand_core::Rng;
 
 use sha1::{Digest, Sha1};
 
@@ -87,16 +87,16 @@ impl ConnectionState {
 
 #[derive(Debug)]
 #[doc(hidden)]
-pub struct WebSocketCore<'buf, RW, Rng> {
-    pub framed: Framed<'buf, FramesCodec<Rng>, RW>,
+pub struct WebSocketCore<'buf, RW, RNG> {
+    pub framed: Framed<'buf, FramesCodec<RNG>, RW>,
     pub fragments_state: FragmentsState<'buf>,
     pub state: ConnectionState,
 }
 
-impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
+impl<'buf, RW, RNG> WebSocketCore<'buf, RW, RNG> {
     #[inline]
     const fn from_framed(
-        framed: Framed<'buf, FramesCodec<Rng>, RW>,
+        framed: Framed<'buf, FramesCodec<RNG>, RW>,
         fragments_state: FragmentsState<'buf>,
     ) -> Self {
         Self {
@@ -108,7 +108,7 @@ impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
 
     #[inline]
     pub(crate) const fn new_from_framed(
-        framed: Framed<'buf, FramesCodec<Rng>, RW>,
+        framed: Framed<'buf, FramesCodec<RNG>, RW>,
         fragments_state: FragmentsState<'buf>,
     ) -> Self {
         Self::from_framed(framed, fragments_state)
@@ -117,7 +117,7 @@ impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
     #[inline]
     const fn new(
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_state: FragmentsState<'buf>,
@@ -131,7 +131,7 @@ impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
     #[inline]
     pub(crate) const fn client(
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_state: FragmentsState<'buf>,
@@ -142,7 +142,7 @@ impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
     #[inline]
     pub(crate) const fn server(
         inner: RW,
-        rng: Rng,
+        rng: RNG,
         read_buffer: &'buf mut [u8],
         write_buffer: &'buf mut [u8],
         fragments_state: FragmentsState<'buf>,
@@ -200,7 +200,7 @@ impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
 
     fn generate_sec_key(&mut self) -> [u8; 24]
     where
-        Rng: RngCore,
+        RNG: Rng,
     {
         let mut key: [u8; 16] = [0; 16];
 
@@ -246,7 +246,7 @@ impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
     where
         F: for<'a> Fn(&Response<'a, N>) -> Result<T, E>,
         RW: Read + Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         let sec_key = self.generate_sec_key();
 
@@ -601,7 +601,7 @@ impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
     pub(crate) async fn send(&mut self, message: Message<'_>) -> Result<(), Error<RW::Error>>
     where
         RW: Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         crate::functions::send(
             &mut self.framed.core.codec,
@@ -620,7 +620,7 @@ impl<'buf, RW, Rng> WebSocketCore<'buf, RW, Rng> {
     ) -> Result<(), Error<RW::Error>>
     where
         RW: Write,
-        Rng: RngCore,
+        RNG: Rng,
     {
         crate::functions::send_fragmented(
             &mut self.framed.core.codec,