Fix CI Issues

.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

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"

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.

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
@@ -102,7 +102,7 @@
             gpio.daisy6.take().unwrap(),
             device.SDMMC1,
             ccdr.peripheral.SDMMC1,
             &mut ccdr.clocks,
         );
 
         gpio.led.set_low();

examples/usb_midi.rs

@@ -68,7 +68,7 @@
         let mut timer2 = device.TIM2.timer(
             MilliSeconds::from_ticks(200).into_rate(),
             ccdr.peripheral.TIM2,
             &mut ccdr.clocks,
         );
         timer2.listen(Event::TimeOut);
 
@@ -129,14 +129,15 @@
 
         let usb_bus = cortex_m::singleton!(
             : usb_device::class_prelude::UsbBusAllocator<UsbBus<USB2>> =
                 UsbBus::new(usb, unsafe { &mut EP_MEMORY })
         )
         .unwrap();
 
         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();
 
@@ -203,19 +204,19 @@
             let mut buffer = [0; 64];
             if let Ok(size) = midi.read(&mut buffer) {
                 let buffer_reader = MidiPacketBufferReader::new(&buffer, size);
                 for packet in buffer_reader.into_iter() {
                     if let Ok(packet) = packet {
                         match packet.message {
                             Message::NoteOn(_, _, U7::MIN) | Message::NoteOff(..) => {
                                 led.set_low();
                             }
                             Message::NoteOn(..) => {
                                 led.set_high();
                             }
                             _ => {}
                         }
                     }
                 }
             }
         });
     }

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<Semihosting<InterruptOk, HStdout>> = Logger {
+            static ref LOGGER: Logger<Semihosting<InterruptOk, HostStream>> = Logger {
                 level: LevelFilter::Info,
                 inner: semihosting::InterruptOk::<_>::stdout().expect("Get Semihosting stdout"),
             };