Skip to content

Commit 7d1b873

Browse files
authored
Fix CI Issues (#42)
* Updated MSRV to 1.70.0 * Set usbd-midi to 0.3.0 to match when it was added * Updated logger to use HostStream for semihosting
1 parent 330988c commit 7d1b873

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed
File renamed without changes.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix: # All permutations of {rust, mcu}
1616
rust:
17-
- 1.68.2 # MSRV
17+
- 1.70.0 # MSRV
1818
- stable
1919
logger:
2020
- log-rtt

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ opt-level = "s" # optimize for binary size
5757

5858
[dev_dependencies]
5959
embedded-sdmmc = "0.5.0"
60-
usbd-midi = { git = "https://github.com/btrepp/usbd-midi/" }
60+
usbd-midi = "0.3.0"
6161
num_enum = { version = "0.7.3", default-features = false }
6262
usb-device = "0.3.0"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ cargo objcopy --example passthru --release -- -O binary passthru.bin
3838
[cargo-binutils-url]: https://github.com/rust-embedded/cargo-binutils
3939

4040
# Minimum supported Rust version
41-
The Minimum Supported Rust Version (MSRV) at the moment is 1.68.2
41+
The Minimum Supported Rust Version (MSRV) at the moment is 1.70.0
4242
# Demos
4343

4444
[Looper](https://github.com/mtthw-meyer/daisy-looper) - Basic one button looper.

examples/sdmmc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
mod app {
1010
use log::info;
1111

12-
use embedded_sdmmc::{VolumeManager, TimeSource, Timestamp, VolumeIdx};
12+
use embedded_sdmmc::{TimeSource, Timestamp, VolumeIdx, VolumeManager};
1313
use libdaisy::{
1414
gpio,
1515
// Includes a panic handler and optional logging facilities

examples/usb_midi.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ mod app {
136136
let midi = MidiClass::new(usb_bus, 1, 1).unwrap();
137137

138138
let usb_dev = UsbDeviceBuilder::new(usb_bus, UsbVidPid(0x16c0, 0x5e4))
139-
.strings(&[StringDescriptors::default().product("daisy midi")]).unwrap()
139+
.strings(&[StringDescriptors::default().product("daisy midi")])
140+
.unwrap()
140141
.device_class(USB_CLASS_NONE)
141142
.build();
142143

src/logger.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ cfg_if::cfg_if! {
7171
use cortex_m_log::printer::semihosting;
7272
use cortex_m_log::printer::semihosting::Semihosting;
7373
use cortex_m_log::modes::InterruptOk;
74-
use cortex_m_semihosting::hio::HStdout;
74+
use cortex_m_semihosting::hio::HostStream;
7575

7676
lazy_static! {
77-
static ref LOGGER: Logger<Semihosting<InterruptOk, HStdout>> = Logger {
77+
static ref LOGGER: Logger<Semihosting<InterruptOk, HostStream>> = Logger {
7878
level: LevelFilter::Info,
7979
inner: semihosting::InterruptOk::<_>::stdout().expect("Get Semihosting stdout"),
8080
};

0 commit comments

Comments
 (0)