use shared midi-types and midi-convert

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Changed
+
+- Swapped out bespoke MIDI types for shared [midi-types](https://crates.io/crates/midi-types).
+  * And in turn [midi-convert](https://crates.io/crates/midi-convert) for parsing/rendering.
+  * **NOTE**: `midi-types` uses C3 as middle C, whereas `usbd-midi` previously
+    used C4 as middle C. If you use the note constants from `usbd-midi`, you
+    will need to lower them by an octave when upgrading to preserve the pitch.

Cargo.toml

@@ -12,6 +12,8 @@ license = "MIT"
 embedded-hal = "0.2.2"
 nb = "1.0.0"
 usb-device = "0.2.3"
+midi-convert = "0.1.1"
+midi-types = "0.1.4"
 
 [dependencies.num_enum]
 version = "0.5.1"

README.md

@@ -43,6 +43,8 @@ fn main() -> ! {
         .device_sub_class(USB_MIDISTREAMING_SUBCLASS)
         .build();
 
+    const CHANNEL1: Channel = Channel::new(0);
+
     loop {
         if !usb_dev.poll(&mut [&mut midi]) {
             continue;
@@ -55,10 +57,10 @@ fn main() -> ! {
             for packet in buffer_reader.into_iter() {
                 if let Ok(packet) = packet {
                     match packet.message {
-                        Message::NoteOn(Channel1, Note::C2, ..) => {
+                        MidiMessage::NoteOn(CHANNEL1, Note::C2, ..) => {
                             led.set_low().unwrap();
                         },
-                        Message::NoteOff(Channel1, Note::C2, ..) => {
+                        MidiMessage::NoteOff(CHANNEL1, Note::C2, ..) => {
                             led.set_high().unwrap();
                         },
                         _ => {}

src/data/byte/mod.rs

@@ -1,3 +1 @@
-pub mod u7;
 pub mod u4;
-pub mod from_traits;