update rtic examples

Author: dotcypress

.cargo/config.toml

@@ -1,9 +1,10 @@
 [target.thumbv6m-none-eabi]
-# runner = "probe-run --chip STM32G071RBT"
-runner = "arm-none-eabi-gdb -q"
+runner = "probe-rs run --chip STM32G071GBUx"
+# runner = "arm-none-eabi-gdb -q"
 
 rustflags = [
   "-C", "linker=arm-none-eabi-ld",
+  "-C", "link-arg=-Tdefmt.x",
   "-C", "link-arg=-Tlink.x"
 ]
 

Cargo.toml

@@ -22,6 +22,7 @@ fugit = "0.3.7"
 embedded-hal = "1.0.0"
 bare-metal = "1.0.0"
 
+
 [dependencies.stm32g0]
 package = "stm32g0-staging"
 version = "0.16.0"
@@ -32,10 +33,14 @@ version = "1.0.2"
 
 [dev-dependencies]
 cortex-m-rt = "0.7.5"
-cortex-m-rtic = "1.1.4"
 cortex-m-semihosting = "0.5.0"
+defmt = "0.3.8"
+defmt-rtt = "0.4.0"
 panic-halt = "1.0.0"
 panic-semihosting = "0.6.0"
+portable-atomic = {version = "1.7.0", features = ["critical-section"]}
+rtic = { version = "2.1.1", features = ["thumbv6-backend"] }
+panic-probe = "0.3.2"
 
 [features]
 default = ["i2c-blocking"]

examples/rtic.rs

@@ -2,13 +2,10 @@
 #![no_main]
 #![deny(warnings)]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
-extern crate rtic;
+extern crate panic_probe;
 extern crate stm32g0xx_hal as hal;
 
-use cortex_m_semihosting::hprintln;
+use defmt_rtt as _;
 use hal::exti::Event;
 use hal::gpio::*;
 use hal::prelude::*;
@@ -28,22 +25,21 @@ mod app {
     struct Local {
         exti: stm32::EXTI,
         timer: Timer<stm32::TIM17>,
-        led: PA5<Output<PushPull>>,
+        led: PA15<Output<PushPull>>,
         rtc: Rtc,
     }
 
     #[init]
-    fn init(ctx: init::Context) -> (Shared, Local, init::Monotonics) {
+    fn init(ctx: init::Context) -> (Shared, Local) {
         let mut rcc = ctx.device.RCC.constrain();
         let gpioa = ctx.device.GPIOA.split(&mut rcc);
-        let gpioc = ctx.device.GPIOC.split(&mut rcc);
 
         let mut timer = ctx.device.TIM17.timer(&mut rcc);
         timer.start(Hertz::Hz(3).into_duration());
         timer.listen();
 
         let mut exti = ctx.device.EXTI;
-        gpioc.pc13.listen(SignalEdge::Falling, &mut exti);
+        gpioa.pa2.into_pull_up_input().listen(SignalEdge::Falling, &mut exti);
 
         let mut rtc = ctx.device.RTC.constrain(&mut rcc);
         rtc.set_date(&Date::new(2019.year(), 11.month(), 24.day()));
@@ -55,9 +51,8 @@ mod app {
                 timer,
                 rtc,
                 exti,
-                led: gpioa.pa5.into_push_pull_output(),
+                led: gpioa.pa15.into_push_pull_output(),
             },
-            init::Monotonics(),
         )
     }
 
@@ -67,18 +62,15 @@ mod app {
         ctx.local.timer.clear_irq();
     }
 
-    #[task(binds = EXTI4_15, local = [exti, rtc])]
+    #[task(binds = EXTI2_3, local = [exti, rtc])]
     fn button_click(ctx: button_click::Context) {
         let date = ctx.local.rtc.get_date();
         let time = ctx.local.rtc.get_time();
-        hprintln!("Button pressed @ {:?} {:?}", date, time);
-        ctx.local.exti.unpend(Event::GPIO13);
-    }
-
-    #[idle]
-    fn idle(_: idle::Context) -> ! {
-        loop {
-            cortex_m::asm::wfi();
-        }
+        defmt::info!(
+            "Button pressed @ {:?} {:?}",
+            defmt::Debug2Format(&date),
+            defmt::Debug2Format(&time)
+        );
+        ctx.local.exti.unpend(Event::GPIO2);
     }
 }

examples/rtic_low_power.rs

@@ -2,12 +2,11 @@
 #![no_main]
 #![deny(warnings)]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
+extern crate panic_probe;
 extern crate rtic;
 extern crate stm32g0xx_hal as hal;
 
+use defmt_rtt as _;
 use hal::exti::Event;
 use hal::gpio::*;
 use hal::power::{LowPowerMode, PowerMode};
@@ -25,19 +24,17 @@ mod app {
     #[local]
     struct Local {
         exti: stm32::EXTI,
-        led: PA5<Output<PushPull>>,
+        led: PA15<Output<PushPull>>,
     }
 
     #[init]
-    fn init(ctx: init::Context) -> (Shared, Local, init::Monotonics) {
+    fn init(ctx: init::Context) -> (Shared, Local) {
         let mut rcc = ctx.device.RCC.freeze(rcc::Config::hsi(Prescaler::Div16));
         let mut exti = ctx.device.EXTI;
 
         let gpioa = ctx.device.GPIOA.split(&mut rcc);
-        let gpioc = ctx.device.GPIOC.split(&mut rcc);
-
-        let led = gpioa.pa5.into_push_pull_output();
-        let mut button = gpioc.pc13.listen(SignalEdge::Falling, &mut exti);
+        let led = gpioa.pa15.into_push_pull_output();
+        let mut button = gpioa.pa2.into_pull_up_input().listen(SignalEdge::Falling, &mut exti);
 
         let mut power = ctx.device.PWR.constrain(&mut rcc);
         power.set_mode(PowerMode::UltraLowPower(LowPowerMode::StopMode2));
@@ -47,13 +44,13 @@ mod app {
             scb.set_sleepdeep();
         }
 
-        (Shared {}, Local { exti, led }, init::Monotonics())
+        (Shared {}, Local { exti, led })
     }
 
-    #[task(binds = EXTI4_15, local = [exti, led])]
+    #[task(binds = EXTI2, local = [exti, led])]
     fn button_click(ctx: button_click::Context) {
         ctx.local.led.toggle().unwrap();
-        ctx.local.exti.unpend(Event::GPIO13);
+        ctx.local.exti.unpend(Event::GPIO2);
     }
 
     #[idle]