Merge pull request #1 from perlindgren/move_to_rtic

Move to RTIC and update dependencies
btrepp · Nov 19, 2020 · 4e31027 · 4e31027
2 parents 5bf8c45 + 67316aa
commit 4e31027
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,17 +7,17 @@ version = "0.1.0"
 
 [dependencies]
 cortex-m = "0.6.0"
-cortex-m-rt = "0.6.11"
-cortex-m-rtfm = { version= "0.5.1"}
-cortex-m-semihosting = "0.3.3"
+cortex-m-rt = "0.6.13"
+cortex-m-rtic = { version= "0.5.5"}
+cortex-m-semihosting = "0.3.5"
 panic-halt = "0.2.0"
-panic-semihosting = "*"
+panic-semihosting = "0.5.4"
 usb-device = {version = "0.2.3"}  
-stm32f1xx-hal = {version="0.5.2", features = ["rt","stm32f103","stm32-usbd"]}   
-stm32-usbd = { version = "0.5.0", features = ["ram_access_1x16"] }
+stm32f1xx-hal = {version="0.7.0", features = ["rt", "stm32f103", "stm32-usbd"]}   
+stm32-usbd = { version = "0.5.1", features = ["ram_access_1x16"] }
 usbd-midi = { version= "0.2.0" }
-embedded-hal = "0.2.3"
-heapless = "0.5.2"
+embedded-hal = "0.2.4"
+heapless = "0.5.6"
 
 # this lets you use `cargo fix`!
 [[bin]]

diff --git a/src/main.rs b/src/main.rs
@@ -30,7 +30,7 @@ use usbd_midi::{
     midi_device::MidiClass,
 };
 
-#[rtfm::app(device = stm32f1xx_hal::stm32,
+#[rtic::app(device = stm32f1xx_hal::stm32,
             peripherals = true)]
 const APP: () = {
     struct Resources {