diff options
| author | xoviat <[email protected]> | 2025-12-15 17:14:48 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-12-15 17:14:48 +0000 |
| commit | c33a86190c3602ba23a6d5757caaa86b9bcea626 (patch) | |
| tree | 6c7373c719ed74aeebd59e343947f0c6ba3b5e1f | |
| parent | c56f56fdffeaeee98bb4ae50fc464f311c689bed (diff) | |
| parent | 4a1dfb8a249741c13dbe30d1fbca7b7dab4f6e12 (diff) | |
Merge pull request #5074 from xoviat/wpa
wpan: update stm32wb-hci
| -rw-r--r-- | embassy-nrf/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-stm32-wpan/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-stm32-wpan/src/wb55/sub/ble.rs | 8 | ||||
| -rw-r--r-- | embassy-stm32/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-usb-dfu/Cargo.toml | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml index c60aac8b8..9a5fdc809 100644 --- a/embassy-nrf/Cargo.toml +++ b/embassy-nrf/Cargo.toml | |||
| @@ -226,7 +226,7 @@ rand-core-09 = { package = "rand_core", version = "0.9" } | |||
| 226 | nrf-pac = { version = "0.2.0" } | 226 | nrf-pac = { version = "0.2.0" } |
| 227 | 227 | ||
| 228 | defmt = { version = "1.0.1", optional = true } | 228 | defmt = { version = "1.0.1", optional = true } |
| 229 | bitflags = "2.4.2" | 229 | bitflags = "2.10.0" |
| 230 | log = { version = "0.4.14", optional = true } | 230 | log = { version = "0.4.14", optional = true } |
| 231 | cortex-m-rt = ">=0.6.15,<0.8" | 231 | cortex-m-rt = ">=0.6.15,<0.8" |
| 232 | cortex-m = "0.7.6" | 232 | cortex-m = "0.7.6" |
diff --git a/embassy-stm32-wpan/Cargo.toml b/embassy-stm32-wpan/Cargo.toml index 9624c7932..1be48e893 100644 --- a/embassy-stm32-wpan/Cargo.toml +++ b/embassy-stm32-wpan/Cargo.toml | |||
| @@ -46,7 +46,7 @@ critical-section = "1.2" | |||
| 46 | 46 | ||
| 47 | bit_field = "0.10.2" | 47 | bit_field = "0.10.2" |
| 48 | stm32-device-signature = { version = "0.3.3", features = ["stm32wb5x"] } | 48 | stm32-device-signature = { version = "0.3.3", features = ["stm32wb5x"] } |
| 49 | stm32wb-hci = { version = "0.17.0", optional = true } | 49 | stm32wb-hci = { version = "0.17.3", optional = true } |
| 50 | futures-util = { version = "0.3.30", default-features = false } | 50 | futures-util = { version = "0.3.30", default-features = false } |
| 51 | bitflags = { version = "2.3.3", optional = true } | 51 | bitflags = { version = "2.3.3", optional = true } |
| 52 | 52 | ||
diff --git a/embassy-stm32-wpan/src/wb55/sub/ble.rs b/embassy-stm32-wpan/src/wb55/sub/ble.rs index a2558d735..a822d6530 100644 --- a/embassy-stm32-wpan/src/wb55/sub/ble.rs +++ b/embassy-stm32-wpan/src/wb55/sub/ble.rs | |||
| @@ -130,12 +130,8 @@ impl<'a> hci::Controller for Ble<'a> { | |||
| 130 | self.tl_write(opcode.0, payload).await; | 130 | self.tl_write(opcode.0, payload).await; |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | #[allow(invalid_reference_casting)] | 133 | async fn controller_read_into(&mut self, buf: &mut [u8]) { |
| 134 | async fn controller_read_into(&self, buf: &mut [u8]) { | 134 | let evt_box = self.tl_read().await; |
| 135 | // A complete hack since I cannot update the trait | ||
| 136 | let s = unsafe { &mut *(self as *const _ as *mut Ble) }; | ||
| 137 | |||
| 138 | let evt_box = s.tl_read().await; | ||
| 139 | let evt_serial = evt_box.serial(); | 135 | let evt_serial = evt_box.serial(); |
| 140 | 136 | ||
| 141 | buf[..evt_serial.len()].copy_from_slice(evt_serial); | 137 | buf[..evt_serial.len()].copy_from_slice(evt_serial); |
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 7989fc5d7..0de8552c7 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -193,7 +193,7 @@ document-features = "0.2.7" | |||
| 193 | 193 | ||
| 194 | static_assertions = { version = "1.1" } | 194 | static_assertions = { version = "1.1" } |
| 195 | volatile-register = { version = "0.2.1" } | 195 | volatile-register = { version = "0.2.1" } |
| 196 | bitflags = "2.4.2" | 196 | bitflags = "2.10.0" |
| 197 | 197 | ||
| 198 | block-device-driver = { version = "0.2" } | 198 | block-device-driver = { version = "0.2" } |
| 199 | aligned = "0.4.1" | 199 | aligned = "0.4.1" |
diff --git a/embassy-usb-dfu/Cargo.toml b/embassy-usb-dfu/Cargo.toml index 8b32582c0..4f952a047 100644 --- a/embassy-usb-dfu/Cargo.toml +++ b/embassy-usb-dfu/Cargo.toml | |||
| @@ -35,7 +35,7 @@ features = ["defmt", "cortex-m", "dfu"] | |||
| 35 | defmt = { version = "1.0.1", optional = true } | 35 | defmt = { version = "1.0.1", optional = true } |
| 36 | log = { version = "0.4.17", optional = true } | 36 | log = { version = "0.4.17", optional = true } |
| 37 | 37 | ||
| 38 | bitflags = "2.4.1" | 38 | bitflags = "2.10.0" |
| 39 | cortex-m = { version = "0.7.7", features = ["inline-asm"], optional = true } | 39 | cortex-m = { version = "0.7.7", features = ["inline-asm"], optional = true } |
| 40 | embassy-boot = { version = "0.6.1", path = "../embassy-boot" } | 40 | embassy-boot = { version = "0.6.1", path = "../embassy-boot" } |
| 41 | embassy-futures = { version = "0.1.2", path = "../embassy-futures" } | 41 | embassy-futures = { version = "0.1.2", path = "../embassy-futures" } |
