Skip to content

Commit

Permalink
Fix CI Issues (#42)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mtthw-meyer authored Jan 22, 2025
1 parent 330988c commit 7d1b873
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion 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::{VolumeManager, TimeSource, Timestamp, VolumeIdx};
use embedded_sdmmc::{TimeSource, Timestamp, VolumeIdx, VolumeManager};
use libdaisy::{
gpio,
// Includes a panic handler and optional logging facilities
Expand Down
3 changes: 2 additions & 1 deletion examples/usb_midi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions src/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
};
Expand Down

0 comments on commit 7d1b873

Please sign in to comment.