From 82f9242df23d36caaa49d8b003be8076736e4651 Mon Sep 17 00:00:00 2001 From: Lucas Kent Date: Thu, 20 May 2021 18:54:10 +1000 Subject: [PATCH] Fix warnings for embassy-stm32 and embassy-stm32-examples --- embassy-nrf-examples/.cargo/config.toml | 1 + embassy-stm32-examples/.cargo/config.toml | 21 +++++++++++++++++++ embassy-stm32-examples/memory.x | 7 +++++++ embassy-stm32-examples/src/bin/blinky.rs | 1 + embassy-stm32-examples/src/bin/button.rs | 1 + embassy-stm32-examples/src/bin/button_exti.rs | 3 ++- embassy-stm32-examples/src/bin/spi.rs | 17 +++++++-------- embassy-stm32-examples/src/bin/usart.rs | 2 +- embassy-stm32-examples/src/bin/usart_dma.rs | 1 + embassy-stm32/src/dma/mod.rs | 1 + embassy-stm32/src/dma/v2.rs | 2 +- embassy-stm32/src/exti.rs | 1 - embassy-stm32/src/lib.rs | 2 -- embassy-stm32/src/pac/regs.rs | 1 - embassy-stm32/src/rng.rs | 1 - embassy-stm32/src/spi/mod.rs | 1 + embassy-stm32/src/spi/v1.rs | 6 ++---- embassy-stm32/src/usart/v1.rs | 3 +-- 18 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 embassy-stm32-examples/.cargo/config.toml create mode 100644 embassy-stm32-examples/memory.x diff --git a/embassy-nrf-examples/.cargo/config.toml b/embassy-nrf-examples/.cargo/config.toml index 1dbeb002..58ac3deb 100644 --- a/embassy-nrf-examples/.cargo/config.toml +++ b/embassy-nrf-examples/.cargo/config.toml @@ -2,6 +2,7 @@ build-std = ["core"] [target.'cfg(all(target_arch = "arm", target_os = "none"))'] +# replace nRF82840_xxAA with your chip as listed in `probe-run --list-chips` runner = "probe-run --chip nRF52840_xxAA" rustflags = [ diff --git a/embassy-stm32-examples/.cargo/config.toml b/embassy-stm32-examples/.cargo/config.toml new file mode 100644 index 00000000..8704a9ba --- /dev/null +++ b/embassy-stm32-examples/.cargo/config.toml @@ -0,0 +1,21 @@ +[unstable] +build-std = ["core"] + +[target.'cfg(all(target_arch = "arm", target_os = "none"))'] +# replace STM32F429ZITx with your chip as listed in `probe-run --list-chips` +runner = "probe-run --chip STM32F429ZITx" + +rustflags = [ + # LLD (shipped with the Rust toolchain) is used as the default linker + "-C", "link-arg=--nmagic", + "-C", "link-arg=-Tlink.x", + "-C", "link-arg=-Tdefmt.x", + + # Code-size optimizations. + "-Z", "trap-unreachable=no", + "-C", "inline-threshold=5", + "-C", "no-vectorize-loops", +] + +[build] +target = "thumbv7em-none-eabi" diff --git a/embassy-stm32-examples/memory.x b/embassy-stm32-examples/memory.x new file mode 100644 index 00000000..b359d3d7 --- /dev/null +++ b/embassy-stm32-examples/memory.x @@ -0,0 +1,7 @@ +MEMORY +{ + /* NOTE 1 K = 1 KiBi = 1024 bytes */ + /* These values correspond to the STM32F429ZI */ + FLASH : ORIGIN = 0x08000000, LENGTH = 1024K + RAM : ORIGIN = 0x20000000, LENGTH = 256K +} diff --git a/embassy-stm32-examples/src/bin/blinky.rs b/embassy-stm32-examples/src/bin/blinky.rs index 9ccd6c01..7590764d 100644 --- a/embassy-stm32-examples/src/bin/blinky.rs +++ b/embassy-stm32-examples/src/bin/blinky.rs @@ -4,6 +4,7 @@ #![feature(min_type_alias_impl_trait)] #![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] +#![allow(incomplete_features)] #[path = "../example_common.rs"] mod example_common; diff --git a/embassy-stm32-examples/src/bin/button.rs b/embassy-stm32-examples/src/bin/button.rs index c3421852..1ee99f52 100644 --- a/embassy-stm32-examples/src/bin/button.rs +++ b/embassy-stm32-examples/src/bin/button.rs @@ -4,6 +4,7 @@ #![feature(min_type_alias_impl_trait)] #![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] +#![allow(incomplete_features)] #[path = "../example_common.rs"] mod example_common; diff --git a/embassy-stm32-examples/src/bin/button_exti.rs b/embassy-stm32-examples/src/bin/button_exti.rs index d6f545fa..8fc889da 100644 --- a/embassy-stm32-examples/src/bin/button_exti.rs +++ b/embassy-stm32-examples/src/bin/button_exti.rs @@ -4,13 +4,14 @@ #![feature(min_type_alias_impl_trait)] #![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] +#![allow(incomplete_features)] #[path = "../example_common.rs"] mod example_common; use embassy::executor::Executor; use embassy::time::Clock; use embassy::util::Forever; -use embassy_stm32::exti::{self, ExtiInput}; +use embassy_stm32::exti::ExtiInput; use embassy_stm32::gpio::{Input, Pull}; use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge}; use example_common::*; diff --git a/embassy-stm32-examples/src/bin/spi.rs b/embassy-stm32-examples/src/bin/spi.rs index 59ba0958..af0d5741 100644 --- a/embassy-stm32-examples/src/bin/spi.rs +++ b/embassy-stm32-examples/src/bin/spi.rs @@ -4,20 +4,20 @@ #![feature(min_type_alias_impl_trait)] #![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] +#![allow(incomplete_features)] #[path = "../example_common.rs"] mod example_common; -use embassy_stm32::gpio::{Input, Level, Output, Pull}; -use embedded_hal::digital::v2::{InputPin, OutputPin}; +use embassy_stm32::gpio::{Level, Output}; +use embedded_hal::digital::v2::OutputPin; use example_common::*; use cortex_m_rt::entry; -use stm32f4::stm32f429 as pac; -//use stm32l4::stm32l4x5 as pac; -use embassy_stm32::spi::{ByteOrder, Config, Spi, MODE_0}; +use embassy_stm32::spi::{Config, Spi}; use embassy_stm32::time::Hertz; use embedded_hal::blocking::spi::Transfer; +use stm32f4::stm32f429 as pac; #[entry] fn main() -> ! { @@ -47,7 +47,6 @@ fn main() -> ! { w }); - let rc = pp.RCC.cfgr.read().sws().bits(); let p = embassy_stm32::init(Default::default()); let mut spi = Spi::new( @@ -64,9 +63,9 @@ fn main() -> ! { loop { let mut buf = [0x0A; 4]; - cs.set_low(); - spi.transfer(&mut buf); - cs.set_high(); + unwrap!(cs.set_low()); + unwrap!(spi.transfer(&mut buf)); + unwrap!(cs.set_high()); info!("xfer {=[u8]:x}", buf); } } diff --git a/embassy-stm32-examples/src/bin/usart.rs b/embassy-stm32-examples/src/bin/usart.rs index d35fbf9f..f7b66f86 100644 --- a/embassy-stm32-examples/src/bin/usart.rs +++ b/embassy-stm32-examples/src/bin/usart.rs @@ -4,6 +4,7 @@ #![feature(min_type_alias_impl_trait)] #![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] +#![allow(incomplete_features)] #[path = "../example_common.rs"] mod example_common; @@ -11,7 +12,6 @@ use cortex_m::prelude::_embedded_hal_blocking_serial_Write; use embassy::executor::Executor; use embassy::time::Clock; use embassy::util::Forever; -use embassy_stm32::gpio::NoPin; use embassy_stm32::usart::{Config, Uart}; use example_common::*; diff --git a/embassy-stm32-examples/src/bin/usart_dma.rs b/embassy-stm32-examples/src/bin/usart_dma.rs index c8b7d645..dc065e04 100644 --- a/embassy-stm32-examples/src/bin/usart_dma.rs +++ b/embassy-stm32-examples/src/bin/usart_dma.rs @@ -4,6 +4,7 @@ #![feature(min_type_alias_impl_trait)] #![feature(impl_trait_in_bindings)] #![feature(type_alias_impl_trait)] +#![allow(incomplete_features)] #[path = "../example_common.rs"] mod example_common; diff --git a/embassy-stm32/src/dma/mod.rs b/embassy-stm32/src/dma/mod.rs index feec4a91..974b95f2 100644 --- a/embassy-stm32/src/dma/mod.rs +++ b/embassy-stm32/src/dma/mod.rs @@ -3,6 +3,7 @@ #[cfg_attr(feature = "_dma_v1", path = "v1.rs")] #[cfg_attr(feature = "_dma_v2", path = "v2.rs")] mod _version; +#[allow(unused)] pub use _version::*; use crate::pac; diff --git a/embassy-stm32/src/dma/v2.rs b/embassy-stm32/src/dma/v2.rs index 0dfa01dc..e3653d3e 100644 --- a/embassy-stm32/src/dma/v2.rs +++ b/embassy-stm32/src/dma/v2.rs @@ -5,7 +5,7 @@ use embassy::util::AtomicWaker; use futures::future::poll_fn; use super::*; -use crate::fmt::{assert, *}; +use crate::fmt::assert; use crate::interrupt; use crate::pac; use crate::pac::dma::{regs, vals}; diff --git a/embassy-stm32/src/exti.rs b/embassy-stm32/src/exti.rs index 418e56fc..0ae121ce 100644 --- a/embassy-stm32/src/exti.rs +++ b/embassy-stm32/src/exti.rs @@ -11,7 +11,6 @@ use embassy_extras::unsafe_impl_unborrow; use embedded_hal::digital::v2::InputPin; use pac::exti::{regs, vals}; -use crate::fmt::*; use crate::gpio::{AnyPin, Input, Pin as GpioPin}; use crate::interrupt; use crate::pac; diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs index 8f11c2f8..edb90d77 100644 --- a/embassy-stm32/src/lib.rs +++ b/embassy-stm32/src/lib.rs @@ -9,8 +9,6 @@ // This must go FIRST so that all the other modules see its macros. pub mod fmt; -use embassy::interrupt::{Interrupt, InterruptExt}; - #[cfg(feature = "_dma")] pub mod dma; pub mod exti; diff --git a/embassy-stm32/src/pac/regs.rs b/embassy-stm32/src/pac/regs.rs index 42af348d..53e1104b 100644 --- a/embassy-stm32/src/pac/regs.rs +++ b/embassy-stm32/src/pac/regs.rs @@ -1,4 +1,3 @@ -#![no_std] #![doc = "Peripheral access API (generated using svd2rust v0.17.0 (22741fa 2021-04-20))"] pub mod syscfg_h7 { use crate::generic::*; diff --git a/embassy-stm32/src/rng.rs b/embassy-stm32/src/rng.rs index d1924d13..701039b0 100644 --- a/embassy-stm32/src/rng.rs +++ b/embassy-stm32/src/rng.rs @@ -8,7 +8,6 @@ use embassy_extras::unborrow; use futures::future::poll_fn; use rand_core::{CryptoRng, RngCore}; -use crate::fmt::*; use crate::pac; pub(crate) static RNG_WAKER: AtomicWaker = AtomicWaker::new(); diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index 9f62a5ec..1dd3f41d 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -7,6 +7,7 @@ pub use _version::*; use crate::gpio::Pin; +#[cfg_attr(feature = "defmt", derive(defmt::Format))] pub enum Error { Framing, Crc, diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index a464c427..5d874acf 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -19,7 +19,6 @@ impl WordSize { } pub struct Spi<'d, T: Instance> { - //peri: T, sck: AnyPin, mosi: AnyPin, miso: AnyPin, @@ -30,7 +29,7 @@ pub struct Spi<'d, T: Instance> { impl<'d, T: Instance> Spi<'d, T> { pub fn new( pclk: Hertz, - peri: impl Unborrow + 'd, + _peri: impl Unborrow + 'd, sck: impl Unborrow>, mosi: impl Unborrow>, miso: impl Unborrow>, @@ -40,7 +39,7 @@ impl<'d, T: Instance> Spi<'d, T> { where F: Into, { - unborrow!(peri, sck, mosi, miso); + unborrow!(sck, mosi, miso); unsafe { sck.set_as_af(sck.af_num()); @@ -89,7 +88,6 @@ impl<'d, T: Instance> Spi<'d, T> { } Self { - //peri, sck, mosi, miso, diff --git a/embassy-stm32/src/usart/v1.rs b/embassy-stm32/src/usart/v1.rs index 5fbe1438..9cd54790 100644 --- a/embassy-stm32/src/usart/v1.rs +++ b/embassy-stm32/src/usart/v1.rs @@ -3,8 +3,7 @@ use core::marker::PhantomData; use embassy::util::Unborrow; use embassy_extras::unborrow; -use crate::gpio::{NoPin, Pin}; -use crate::pac::usart::{regs, vals, Usart}; +use crate::pac::usart::{regs, vals}; use super::*;