Merge pull request #183 from chocol4te/master

Upgrade rtfm-demo to RTIC and bump dependencies

Author: jonas-schievink

Cargo.toml

@@ -5,7 +5,7 @@ members = [
   "nrf52833-hal",
   "nrf52840-hal",
   "nrf9160-hal",
-  "examples/rtfm-demo",
+  "examples/rtic-demo",
   "examples/spi-demo",
   "examples/twi-ssd1306",
   "examples/ecb-demo",

examples/rtfm-demo/.cargo/config examples/rtic-demo/.cargo/configexamples/rtfm-demo/.cargo/config renamed to examples/rtic-demo/.cargo/config

@@ -1,14 +1,14 @@
 [package]
-name = "rtfm-demo"
+name = "rtic-demo"
 version = "0.1.0"
 authors = ["James Munns <[email protected]>"]
 edition = "2018"
 publish = false
 
 [dependencies]
-cortex-m-rtfm = "0.4.3"
-panic-semihosting = "0.5.1"
-cortex-m-semihosting = "0.3.3"
+cortex-m-rtic = "0.5.3"
+panic-semihosting = "0.5.3"
+cortex-m-semihosting = "0.3.5"
 
 [dependencies.nrf51-hal]
 path = "../../nrf51-hal"

examples/rtfm-demo/.gdbinit examples/rtic-demo/.gdbinitexamples/rtfm-demo/.gdbinit renamed to examples/rtic-demo/.gdbinit

@@ -5,7 +5,7 @@
 use panic_semihosting;
 
 use cortex_m_semihosting::{debug, hprintln};
-use rtfm::app;
+use rtic::app;
 
 #[cfg(feature = "51")]
 use nrf51_hal as hal;
@@ -22,16 +22,18 @@ use nrf52840_hal as hal;
 #[app(device = crate::hal::pac)]
 const APP: () = {
     #[init]
-    fn init() {
+    fn init(_: init::Context) {
         hprintln!("init").unwrap();
     }
 
     #[idle]
-    fn idle() -> ! {
+    fn idle(_: idle::Context) -> ! {
         hprintln!("idle").unwrap();
 
         debug::exit(debug::EXIT_SUCCESS);
 
-        loop {}
+        loop {
+            continue;
+        }
     }
 };

examples/rtfm-demo/Cargo.toml examples/rtic-demo/Cargo.tomlexamples/rtfm-demo/Cargo.toml renamed to examples/rtic-demo/Cargo.toml

@@ -18,14 +18,14 @@ cargo build --manifest-path nrf52833-hal/Cargo.toml
 echo Building nrf52840-hal...
 cargo build --manifest-path nrf52840-hal/Cargo.toml
 
-echo Building examples/rtfm-demo...
-cargo build --manifest-path examples/rtfm-demo/Cargo.toml
-echo Building examples/rtfm-demo...
-cargo build --manifest-path examples/rtfm-demo/Cargo.toml --no-default-features --features="51" --target thumbv6m-none-eabi
-echo Building examples/rtfm-demo...
-cargo build --manifest-path examples/rtfm-demo/Cargo.toml --no-default-features --features="52810" --target thumbv7em-none-eabi
-echo Building examples/rtfm-demo...
-cargo build --manifest-path examples/rtfm-demo/Cargo.toml --no-default-features --features="52840"
+echo Building examples/rtic-demo...
+cargo build --manifest-path examples/rtic-demo/Cargo.toml
+echo Building examples/rtic-demo...
+cargo build --manifest-path examples/rtic-demo/Cargo.toml --no-default-features --features="51" --target thumbv6m-none-eabi
+echo Building examples/rtic-demo...
+cargo build --manifest-path examples/rtic-demo/Cargo.toml --no-default-features --features="52810" --target thumbv7em-none-eabi
+echo Building examples/rtic-demo...
+cargo build --manifest-path examples/rtic-demo/Cargo.toml --no-default-features --features="52840"
 echo Building examples/spi-demo...
 cargo build --manifest-path examples/spi-demo/Cargo.toml
 echo Building examples/twi-ssd1306...