Merge pull request #138 from korken89/fmt_clippy_fix

CI, fmt and clippy fixes

Author: MabezDev

.github/workflows/ci.yml

@@ -31,8 +31,8 @@ jobs:
         with:
           use-cross: true
           command: build
-          args: --verbose --release --examples --target thumbv7em-none-eabihf --features rt,${{ matrix.mcu }}
+          args: --verbose --release --examples --target thumbv7em-none-eabihf --features rt,unproven,${{ matrix.mcu }}
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --lib --target x86_64-unknown-linux-gnu --features rt,${{ matrix.mcu }}
+          args: --lib --target x86_64-unknown-linux-gnu --features rt,unproven,${{ matrix.mcu }}

.github/workflows/clippy.yml

@@ -19,4 +19,4 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --examples --features=stm32l4x5,rt
+          args: --examples --target thumbv7em-none-eabihf --features=stm32l4x2,rt,unproven

Cargo.toml

@@ -68,7 +68,7 @@ cortex-m-rt = "0.6.12"
 usb-device = "0.2.3"
 usbd-serial = "0.1.0"
 heapless = "0.5"
-cortex-m-rtfm = "0.5"
+cortex-m-rtic = "0.5.5"
 
 [profile.dev]
 incremental = false
@@ -86,3 +86,9 @@ required-features = ["rt", "stm32l4x2", "stm32-usbd"]
 [[example]]
 name = "qspi"
 required-features = ["rt", "stm32l4x5"]
+
+
+[[example]]
+name = "rtic_frame_serial_dma"
+required-features = ["rt", "stm32l4x2"]
+

examples/blinky.rs

@@ -54,10 +54,10 @@ fn main() -> ! {
     loop {
         // block!(timer.wait()).unwrap();
         timer.delay_ms(1000 as u32);
-        led.set_high();
+        led.set_high().ok();
         // block!(timer.wait()).unwrap();
         timer.delay_ms(1000 as u32);
-        led.set_low();
+        led.set_low().ok();
     }
 }
 

examples/i2c_write.rs

@@ -60,17 +60,17 @@ fn main() -> ! {
     const MAX17048_ADDR: u8 = 0x6C;
     i2c.write_read(MAX17048_ADDR, &[0x08], &mut buffer).unwrap();
     let version: u16 = (buffer[0] as u16) << 8 | buffer[1] as u16;
-    writeln!(hstdout, "Silicon Version: {}", version);
+    writeln!(hstdout, "Silicon Version: {}", version).ok();
 
     // let soc: u16 = (buffer[0] as u16) + (buffer[1] as u16 / 256);  //& 0xFF00
     // let soc: u16 = (buffer[0] as u16) << 8 & 0xFF00 | (buffer[1] as u16) & 0x00FF;
     i2c.write_read(MAX17048_ADDR, &[0x04], &mut buffer).unwrap();
     let soc: u16 = (buffer[0] as u16) << 8 | buffer[1] as u16;
-    writeln!(hstdout, "Batt SoC: {}%", soc / 256);
+    writeln!(hstdout, "Batt SoC: {}%", soc / 256).ok();
 
     i2c.write_read(MAX17048_ADDR, &[0x02], &mut buffer).unwrap();
     let vlt: u16 = (buffer[0] as u16) << 8 | buffer[1] as u16;
-    writeln!(hstdout, "Volt: {}", vlt as f32 * 0.000078125);
+    writeln!(hstdout, "Volt: {}", vlt as f32 * 0.000078125).ok();
 
     loop {}
 }

examples/irq_button.rs

@@ -12,12 +12,12 @@ use crate::hal::{
     prelude::*,
     stm32,
 };
+use core::cell::RefCell;
+use core::ops::DerefMut;
 use cortex_m::{
     interrupt::{free, Mutex},
-    peripheral::NVIC
+    peripheral::NVIC,
 };
-use core::cell::RefCell;
-use core::ops::DerefMut;
 use rt::entry;
 
 // Set up global state. It's all mutexed up for concurrency safety.
@@ -44,12 +44,14 @@ fn main() -> ! {
         let mut board_btn = gpioc
             .pc13
             .into_pull_up_input(&mut gpioc.moder, &mut gpioc.pupdr);
-        board_btn.make_interrupt_source(&mut dp.SYSCFG);
+        board_btn.make_interrupt_source(&mut dp.SYSCFG, &mut rcc.apb2);
         board_btn.enable_interrupt(&mut dp.EXTI);
         board_btn.trigger_on_edge(&mut dp.EXTI, Edge::FALLING);
 
         // Enable interrupts
-        unsafe { NVIC::unmask(stm32::Interrupt::EXTI15_10); }
+        unsafe {
+            NVIC::unmask(stm32::Interrupt::EXTI15_10);
+        }
 
         free(|cs| {
             BUTTON.borrow(cs).replace(Some(board_btn));

examples/pll_config.rs

@@ -18,7 +18,6 @@ extern crate stm32l4xx_hal as hal;
 // extern crate nb;
 
 use crate::hal::prelude::*;
-use crate::hal::rcc::{PllConfig, PllDivider};
 use crate::hal::serial::{Config, Serial};
 use crate::rt::ExceptionFrame;
 use cortex_m::asm;
@@ -31,24 +30,16 @@ fn main() -> ! {
     let mut rcc = p.RCC.constrain();
     let mut pwr = p.PWR.constrain(&mut rcc.apb1r1);
     let mut gpioa = p.GPIOA.split(&mut rcc.ahb2);
-    let mut pwr = p.PWR.constrain(&mut rcc.apb1r1);
     // let mut gpiob = p.GPIOB.split(&mut rcc.ahb2);
 
     // clock configuration using the default settings (all clocks run at 8 MHz)
     // let clocks = rcc.cfgr.freeze(&mut flash.acr);
     // TRY this alternate clock configuration (clocks run at nearly the maximum frequency)
-    // let clocks = rcc.cfgr.sysclk(80.mhz()).pclk1(80.mhz()).pclk2(80.mhz()).freeze(&mut flash.acr);
-    let plls = PllConfig {
-        m: 0b001,  // / 2
-        n: 0b1000, // * 8
-        r: PllDivider::Div8,   // /8
-    };
-    // NOTE: it is up to the user to make sure the pll config matches the given sysclk
     let clocks = rcc
         .cfgr
-        .sysclk_with_pll(8.mhz(), plls)
-        .pclk1(8.mhz())
-        .pclk2(8.mhz())
+        .sysclk(80.mhz())
+        .pclk1(80.mhz())
+        .pclk2(80.mhz())
         .freeze(&mut flash.acr, &mut pwr);
 
     // The Serial API is highly generic

examples/qspi.rs

@@ -32,7 +32,7 @@ fn main() -> ! {
     let mut pwr = p.PWR.constrain(&mut rcc.apb1r1);
 
     // clock configuration (clocks run at nearly the maximum frequency)
-    let clocks = rcc
+    let _clocks = rcc
         .cfgr
         .sysclk(80.mhz())
         .pclk1(80.mhz())

examples/rng.rs

@@ -11,6 +11,7 @@ use crate::hal::delay::Delay;
 use crate::hal::prelude::*;
 use crate::hal::serial::{Config, Serial};
 use crate::hal::stm32;
+use hal::hal::blocking::rng::Read;
 
 macro_rules! uprint {
     ($serial:expr, $($arg:tt)*) => {

examples/rtc.rs

@@ -17,7 +17,7 @@ extern crate stm32l4xx_hal as hal;
 use crate::hal::datetime::{Date, Time};
 use crate::hal::delay::Delay;
 use crate::hal::prelude::*;
-use crate::hal::rcc::{CrystalBypass, ClockSecuritySystem};
+use crate::hal::rcc::{ClockSecuritySystem, CrystalBypass};
 use crate::hal::rtc::{Rtc, RtcClockSource, RtcConfig};
 use crate::rt::ExceptionFrame;
 
@@ -50,7 +50,7 @@ fn main() -> ! {
         &mut rcc.apb1r1,
         &mut rcc.bdcr,
         &mut pwr.cr1,
-        RtcConfig::default().clock_config(RtcClockSource::LSE)
+        RtcConfig::default().clock_config(RtcClockSource::LSE),
     );
 
     let time = Time::new(21.hours(), 57.minutes(), 32.seconds(), 0.micros(), false);