chore: update bt-hci version (#4146)

* chore: update bt-hci version

* chore: use released version of trouble-host

* Make sure clippy fails, fix warning

---------

Co-authored-by: Dániel Buga <bugadani@gmail.com>

esp-radio/CHANGELOG.md

@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated radio related drivers to ESP-IDF 5.5.1 (#4113)
 - Event handlers are now passed the event by reference (#4113)
 - Some build-time configuration options have been replaced by runtime options in `WifiConfig` (#4121)
+- Update bt-hci version with flash usage improvements (#4146)
 
 ### Fixed
 

esp-radio/Cargo.toml

@@ -30,8 +30,9 @@ check-configs = [
 ]
 clippy-configs = [
     { features = ["esp-hal/unstable", "esp-hal/rt"] },
-    { features = ["esp-hal/unstable", "esp-hal/rt", "wifi"], if = 'chip_has("wifi")' },
-    { features = ["esp-hal/unstable", "esp-hal/rt", "wifi-eap", "unstable"], if = 'chip_has("wifi")' },
+    { features = ["esp-hal/unstable", "esp-hal/rt", "wifi", "wifi-eap", "unstable"], if = 'chip_has("wifi")', append = [
+        { features = ["ble"], if = 'chip_has("bt")' },
+    ] },
 ]
 
 [lib]
@@ -75,7 +76,7 @@ smoltcp = { version = "0.12.0", default-features = false, features = [
   "socket-raw",
 ], optional = true }
 embassy-net-driver = { version = "0.2.0", optional = true }
-bt-hci = { version = "0.4.0", optional = true }
+bt-hci = { version = "0.5.0", optional = true }
 
 # Logging interfaces, they are mutually exclusive so they need to be behind separate features.
 defmt = { version = "1.0.1", optional = true }

esp-radio/src/ble/controller/mod.rs

@@ -99,6 +99,7 @@ pub(crate) mod asynch {
     use bt_hci::{
         ControllerToHostPacket,
         FromHciBytes,
+        FromHciBytesError,
         HostToControllerPacket,
         WriteHci,
         transport::{Transport, WithIndicator},
@@ -149,6 +150,12 @@ pub(crate) mod asynch {
         }
     }
 
+    impl From<FromHciBytesError> for BleConnectorError {
+        fn from(_e: FromHciBytesError) -> Self {
+            BleConnectorError::Unknown
+        }
+    }
+
     #[must_use = "futures do nothing unless you `.await` or poll them"]
     pub(crate) struct HciReadyEventFuture;
 

examples/ble/bas_peripheral/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 publish = false
 
 [dependencies]
-bt-hci = "0.4.0"
+bt-hci = "0.5.0"
 embassy-executor = "0.9.0"
 embassy-futures = "0.1"
 embassy-sync = "0.7.2"
@@ -27,7 +27,7 @@ esp-radio = { path = "../../../esp-radio", features = [
 ] }
 heapless = "0.9.1"
 log = "0.4.27"
-trouble-host = { git = "https://github.com/embassy-rs/trouble", rev = "39c5c99", features = [
+trouble-host = { version = "0.3.0", features = [
     "default-packet-pool-mtu-255",
     "derive",
     "scan",

examples/ble/scanner/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 publish = false
 
 [dependencies]
-bt-hci = "0.4.0"
+bt-hci = "0.5.0"
 embassy-executor = "0.9.0"
 embassy-futures = "0.1"
 embassy-time = "0.5.0"
@@ -26,7 +26,7 @@ esp-radio = { path = "../../../esp-radio", features = [
 ] }
 heapless = "0.9.1"
 log = "0.4.27"
-trouble-host = { git = "https://github.com/embassy-rs/trouble", rev = "39c5c99", features = [
+trouble-host = { version = "0.3.0", features = [
     "default-packet-pool-mtu-255",
     "derive",
     "scan",