diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b2f1b9..ab46398 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: # All permutations of {rust, mcu} rust: - - 1.68.2 # MSRV + - 1.70.0 # MSRV - stable logger: - log-rtt diff --git a/Cargo.toml b/Cargo.toml index 6cb26e9..b5d485a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,6 +57,6 @@ opt-level = "s" # optimize for binary size [dev_dependencies] embedded-sdmmc = "0.5.0" -usbd-midi = { git = "https://github.com/btrepp/usbd-midi/" } +usbd-midi = "0.3.0" num_enum = { version = "0.7.3", default-features = false } usb-device = "0.3.0" diff --git a/README.md b/README.md index c14eeef..8e1783d 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ cargo objcopy --example passthru --release -- -O binary passthru.bin [cargo-binutils-url]: https://github.com/rust-embedded/cargo-binutils # Minimum supported Rust version -The Minimum Supported Rust Version (MSRV) at the moment is 1.68.2 +The Minimum Supported Rust Version (MSRV) at the moment is 1.70.0 # Demos [Looper](https://github.com/mtthw-meyer/daisy-looper) - Basic one button looper. diff --git a/examples/sdmmc.rs b/examples/sdmmc.rs index 462de33..0a67ea8 100644 --- a/examples/sdmmc.rs +++ b/examples/sdmmc.rs @@ -9,7 +9,7 @@ mod app { use log::info; - use embedded_sdmmc::{VolumeManager, TimeSource, Timestamp, VolumeIdx}; + use embedded_sdmmc::{TimeSource, Timestamp, VolumeIdx, VolumeManager}; use libdaisy::{ gpio, // Includes a panic handler and optional logging facilities diff --git a/examples/usb_midi.rs b/examples/usb_midi.rs index eb8b9b5..7e6ea81 100644 --- a/examples/usb_midi.rs +++ b/examples/usb_midi.rs @@ -136,7 +136,8 @@ mod app { let midi = MidiClass::new(usb_bus, 1, 1).unwrap(); let usb_dev = UsbDeviceBuilder::new(usb_bus, UsbVidPid(0x16c0, 0x5e4)) - .strings(&[StringDescriptors::default().product("daisy midi")]).unwrap() + .strings(&[StringDescriptors::default().product("daisy midi")]) + .unwrap() .device_class(USB_CLASS_NONE) .build(); diff --git a/src/logger.rs b/src/logger.rs index 38d752d..90cf392 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -71,10 +71,10 @@ cfg_if::cfg_if! { use cortex_m_log::printer::semihosting; use cortex_m_log::printer::semihosting::Semihosting; use cortex_m_log::modes::InterruptOk; - use cortex_m_semihosting::hio::HStdout; + use cortex_m_semihosting::hio::HostStream; lazy_static! { - static ref LOGGER: Logger> = Logger { + static ref LOGGER: Logger> = Logger { level: LevelFilter::Info, inner: semihosting::InterruptOk::<_>::stdout().expect("Get Semihosting stdout"), };