Skip to content

Commit

Permalink
Merge pull request #40 from ErikNatanael/upgrade_deps1
Browse files Browse the repository at this point in the history
Upgrade dependency versions
  • Loading branch information
mtthw-meyer authored Dec 5, 2024
2 parents 5a8520e + 891f307 commit 330988c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ documentation = "https://docs.rs/libdaisy"
exclude = [".gitignore"]

[dependencies]
cfg-if = "0.1.10"
cfg-if = "1.0"
cortex-m-rtic = "1.0.0"
cortex-m = "^0.7"
debouncr = "0.2.2"
log = "0.4.11"
micromath = "1.1.1"
micromath = "2.1.0"
panic-halt = "0.2.0"
stm32h7xx-hal = { version = "0.14.0", features = ["stm32h750v","rt","fmc", "xspi", "sdmmc", "sdmmc-fatfs", "usb_hs"] }
stm32h7xx-hal = { version = "0.16.0", features = ["stm32h750v","rt","fmc", "xspi", "sdmmc", "sdmmc-fatfs", "usb_hs"] }
stm32-fmc = "0.3.0"
rtt-target = { version = "0.4.0", optional = true }
panic-rtt-target = { version = "0.1.2", features = ["cortex-m"], optional = true }
rtt-target = { version = "0.5.0", optional = true }
panic-rtt-target = { version = "0.1.3", optional = true }
lazy_static = { version = "1.4.0", features = ["spin_no_std"], optional = true }
cortex-m-log = { version = "~0.7", features = ["itm", "semihosting", "log-integration"], optional = true }
cortex-m-log = { version = "~0.8", features = ["itm", "semihosting", "log-integration"], optional = true }
panic-itm = { version = "~0.4.2", optional = true }
panic-semihosting = { version = "0.5.6", optional = true }
cortex-m-semihosting = { version = "0.3.7", optional = true }
panic-semihosting = { version = "0.6.0", optional = true }
cortex-m-semihosting = { version = "0.5.0", optional = true }

[features]
default = []
Expand Down Expand Up @@ -56,7 +56,7 @@ lto = true # better optimizations
opt-level = "s" # optimize for binary size

[dev_dependencies]
embedded-sdmmc = "0.4.0"
embedded-sdmmc = "0.5.0"
usbd-midi = { git = "https://github.com/btrepp/usbd-midi/" }
num_enum = { version = "0.5.1", default-features = false }
usb-device = "0.2.8"
num_enum = { version = "0.7.3", default-features = false }
usb-device = "0.3.0"
4 changes: 2 additions & 2 deletions examples/sdmmc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
mod app {
use log::info;

use embedded_sdmmc::{Controller, TimeSource, Timestamp, VolumeIdx};
use embedded_sdmmc::{VolumeManager, TimeSource, Timestamp, VolumeIdx};
use libdaisy::{
gpio,
// Includes a panic handler and optional logging facilities
Expand Down Expand Up @@ -108,7 +108,7 @@ mod app {
gpio.led.set_low();
if let Ok(_) = <Sdmmc<SDMMC1, SdCard>>::init(&mut sd, 50.MHz()) {

Check warning on line 109 in examples/sdmmc.rs

View workflow job for this annotation

GitHub Actions / clippy

redundant pattern matching, consider using `is_ok()`

warning: redundant pattern matching, consider using `is_ok()` --> examples/sdmmc.rs:109:16 | 109 | if let Ok(_) = <Sdmmc<SDMMC1, SdCard>>::init(&mut sd, 50.MHz()) { | -------^^^^^--------------------------------------------------- help: try: `if <Sdmmc<SDMMC1, SdCard>>::init(&mut sd, 50.MHz()).is_ok()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pattern_matching = note: `#[warn(clippy::redundant_pattern_matching)]` on by default
info!("Got SD Card!");
let mut sd_fatfs = Controller::new(sd.sdmmc_block_device(), FakeTime);
let mut sd_fatfs = VolumeManager::new(sd.sdmmc_block_device(), FakeTime);
if let Ok(sd_fatfs_volume) = sd_fatfs.get_volume(VolumeIdx(0)) {
if let Ok(sd_fatfs_root_dir) = sd_fatfs.open_root_dir(&sd_fatfs_volume) {
sd_fatfs
Expand Down
2 changes: 1 addition & 1 deletion examples/usb_midi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ mod app {
let midi = MidiClass::new(usb_bus, 1, 1).unwrap();

let usb_dev = UsbDeviceBuilder::new(usb_bus, UsbVidPid(0x16c0, 0x5e4))
.product("daisy midi")
.strings(&[StringDescriptors::default().product("daisy midi")]).unwrap()
.device_class(USB_CLASS_NONE)
.build();

Expand Down

0 comments on commit 330988c

Please sign in to comment.