Merge #551

551: Rtic examples r=burrbull a=alexxy



Co-authored-by: Alexey Shvetsov <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - Bump `embedded-hal` to `1.0.0-alpha.8` [#510]
  - Update `bxcan`, `rtic` and other dependencies [#519]
  - Bump `synopsys-usb-otg` to `0.3.1` [#535]
+ - Renamed and updated rtic-button example (was rtic) [#551]
 
 ### Removed
  - `i2s-audio-out-dma.rs` example, too difficult to fix.
@@ -34,17 +35,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-- Serial Tx, Rx containing pins [#514] [#515] [#540]
-- example of using ft6x06 touchscreen driver for stm32f412 and stm32f413 [#527]
-- Serial Tx, Rx containing pins [#514] [#515]
-- Implementation of From trait for Pin-to-PartiallyErasedPin [#507]
-- Implementation of From trait for Pin-to-ErasedPin [#507]
-- Implementation of From trait for PartiallyErasedPin-to-ErasedPin [#507]
-- `SysMonoTimerExt` helper trait, `Pwm::(get/set)_duty_time` [#497]
-- example of using i2s in out with rtic and interrupt.
-- example of using USB CDC with interrupts.
-- Added non-blocking I2C based on DMA [#534]
-- Added Transactional I2C API [#542]
+ - Serial Tx, Rx containing pins [#514] [#515] [#540]
+ - example of using ft6x06 touchscreen driver for stm32f412 and stm32f413 [#527]
+ - Serial Tx, Rx containing pins [#514] [#515]
+ - Implementation of From trait for Pin-to-PartiallyErasedPin [#507]
+ - Implementation of From trait for Pin-to-ErasedPin [#507]
+ - Implementation of From trait for PartiallyErasedPin-to-ErasedPin [#507]
+ - `SysMonoTimerExt` helper trait, `Pwm::(get/set)_duty_time` [#497]
+ - example of using i2s in out with rtic and interrupt.
+ - example of using USB CDC with interrupts.
+ - Added non-blocking I2C based on DMA [#534]
+ - Added Transactional I2C API [#542]
+ - Added rtic-usart-shell example [#551]
+ - Added rtic-usart-shell-ssd1306 example [#551]
+
 
 [#481]: https://github.com/stm32-rs/stm32f4xx-hal/pull/481
 [#489]: https://github.com/stm32-rs/stm32f4xx-hal/pull/489
@@ -64,6 +68,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#540]: https://github.com/stm32-rs/stm32f4xx-hal/pull/540
 [#542]: https://github.com/stm32-rs/stm32f4xx-hal/pull/542
 [#527]: https://github.com/stm32-rs/stm32f4xx-hal/pull/527
+[#551]: https://github.com/stm32-rs/stm32f4xx-hal/pull/551
 
 ## [v0.13.2] - 2022-05-16
 

Cargo.toml

@@ -83,6 +83,7 @@ ws2812-spi = { version = "0.4.0", features = [] }
 hd44780-driver = "0.4.0"
 display-interface = "0.4"
 ft6x06 = "0.1.2"
+ushell = "0.3.5"
 
 [dev-dependencies.time]
 version = "0.3"
@@ -438,13 +439,21 @@ name = "i2s-rtic-audio-in-out"
 required-features = ["stm32f411", "i2s", "rtic"]
 
 [[example]]
-name = "rtic"
-required-features = ["gpiod", "rtic"] # stm32f407
+name = "rtic-button"
+required-features = ["stm32f411", "rtic"] # stm32f411
 
 [[example]]
 name = "rtic-tick"
 required-features = ["tim2", "rtic"]
 
+[[example]]
+name = "rtic-usart-shell"
+required-features = ["stm32f411", "rtic"] # stm32f411
+
+[[example]]
+name = "rtic-usart-shell-ssd1306"
+required-features = ["stm32f411", "rtic"] # stm32f411
+
 [[example]]
 name = "adc_dma_rtic"
 required-features = ["device-selected", "rtic"] # stm32f401

examples/rtic.rs renamed to examples/rtic-button.rs

@@ -1,20 +1,22 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![no_std]
 #![no_main]
+#![no_std]
 
 use panic_halt as _;
 
-#[rtic::app(device = stm32f4xx_hal::pac)]
+#[rtic::app(device = stm32f4xx_hal::pac, peripherals = true)]
 mod app {
     use stm32f4xx_hal::{
-        gpio::{Edge, Input, Output, PushPull, PA0, PC13},
+        gpio::{gpioa::PA0, gpioc::PC13, Edge, Input, Output, PushPull},
         prelude::*,
     };
-
+    const SYSFREQ: u32 = 100_000_000;
+    // Shared resources go here
     #[shared]
     struct Shared {}
 
+    // Local resources go here
     #[local]
     struct Local {
         button: PA0<Input>,
@@ -23,18 +25,41 @@ mod app {
 
     #[init]
     fn init(mut ctx: init::Context) -> (Shared, Local, init::Monotonics) {
+        // syscfg
         let mut syscfg = ctx.device.SYSCFG.constrain();
-
-        let gpioc = ctx.device.GPIOC.split();
-        let led = gpioc.pc13.into_push_pull_output();
-
+        // clocks
+        let rcc = ctx.device.RCC.constrain();
+        let _clocks = rcc.cfgr.sysclk(SYSFREQ.Hz()).use_hse(25.MHz()).freeze();
+        // gpio ports A and C
         let gpioa = ctx.device.GPIOA.split();
+        let gpioc = ctx.device.GPIOC.split();
+        // button
         let mut button = gpioa.pa0.into_pull_up_input();
         button.make_interrupt_source(&mut syscfg);
         button.enable_interrupt(&mut ctx.device.EXTI);
         button.trigger_on_edge(&mut ctx.device.EXTI, Edge::Falling);
+        // led
+        let led = gpioc.pc13.into_push_pull_output();
+
+        (
+            Shared {
+               // Initialization of shared resources go here
+            },
+            Local {
+                // Initialization of local resources go here
+                button,
+                led,
+            },
+            init::Monotonics(),
+        )
+    }
 
-        (Shared {}, Local { button, led }, init::Monotonics())
+    // Optional idle, can be removed if not needed.
+    #[idle]
+    fn idle(_: idle::Context) -> ! {
+        loop {
+            continue;
+        }
     }
 
     #[task(binds = EXTI0, local = [button, led])]