diff --git a/Cargo.lock b/Cargo.lock index 37c974ed..747c575a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,12 +44,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - [[package]] name = "bitvec" version = "1.0.1" @@ -140,7 +134,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8a2d011b2fee29fb7d659b83c43fce9a2cb4df453e16d441a51448e448f3f98" dependencies = [ - "bitflags 1.3.2", + "bitflags", "defmt-macros", ] @@ -814,12 +808,11 @@ dependencies = [ [[package]] name = "stm32h7xx-hal" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe4a709ccbccd9994d2363e27104933561ef170f892c950ffe939546c2ece1d" +checksum = "e08bcfbdbe4458133f2fd55994a5c4f1b4bf28084f0218e93cdbc19d7c70219f" dependencies = [ "bare-metal 1.0.0", - "bitflags 2.4.0", "cast", "cortex-m", "embedded-dma", diff --git a/boards/stm32h7/Cargo.toml b/boards/stm32h7/Cargo.toml index dc279bd5..52e257e9 100644 --- a/boards/stm32h7/Cargo.toml +++ b/boards/stm32h7/Cargo.toml @@ -18,7 +18,7 @@ rmk = { version = "0.0.5", path = "../../rmk", features = [ "eeprom", "col2row", ] } -stm32h7xx-hal = { version = "0.14.0", features = [ +stm32h7xx-hal = { version = "0.15.1", features = [ "stm32h7b0", "rt", "log-rtt", diff --git a/boards/stm32h7/src/main.rs b/boards/stm32h7/src/main.rs index 1416ef55..f29cbdd1 100644 --- a/boards/stm32h7/src/main.rs +++ b/boards/stm32h7/src/main.rs @@ -94,8 +94,8 @@ mod app { let gpiob = dp.GPIOB.split(ccdr.peripheral.GPIOB); // USB config - let usb_dm = gpioa.pa11.into_alternate(); - let usb_dp = gpioa.pa12.into_alternate(); + let usb_dm = gpioa.pa11.into_analog(); + let usb_dp = gpioa.pa12.into_analog(); let usb: USB1 = USB1::new( dp.OTG1_HS_GLOBAL, dp.OTG1_HS_DEVICE,