Fix warnings

This commit is contained in:
Rukai 2021-05-17 19:48:58 +10:00
parent 9206d4b33d
commit 149ddf2f29
17 changed files with 20 additions and 30 deletions

View File

@ -1,4 +1,4 @@
use crate::fmt::{assert, *}; use crate::fmt::assert;
pub struct RingBuffer<'a> { pub struct RingBuffer<'a> {
buf: &'a mut [u8], buf: &'a mut [u8],

View File

@ -7,7 +7,6 @@
#[path = "../example_common.rs"] #[path = "../example_common.rs"]
mod example_common; mod example_common;
use example_common::*;
use defmt::panic; use defmt::panic;
use embassy::executor::Spawner; use embassy::executor::Spawner;
@ -17,7 +16,7 @@ use embassy_nrf::Peripherals;
use embedded_hal::digital::v2::OutputPin; use embedded_hal::digital::v2::OutputPin;
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
let mut led = Output::new(p.P0_13, Level::Low, OutputDrive::Standard); let mut led = Output::new(p.P0_13, Level::Low, OutputDrive::Standard);
loop { loop {

View File

@ -17,7 +17,7 @@ use example_common::*;
use futures::pin_mut; use futures::pin_mut;
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
let mut config = uarte::Config::default(); let mut config = uarte::Config::default();
config.parity = uarte::Parity::EXCLUDED; config.parity = uarte::Parity::EXCLUDED;
config.baudrate = uarte::Baudrate::BAUD115200; config.baudrate = uarte::Baudrate::BAUD115200;

View File

@ -40,7 +40,7 @@ async fn run3() {
} }
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(spawner: Spawner, _p: Peripherals) {
unwrap!(spawner.spawn(run1())); unwrap!(spawner.spawn(run1()));
unwrap!(spawner.spawn(run2())); unwrap!(spawner.spawn(run2()));
unwrap!(spawner.spawn(run3())); unwrap!(spawner.spawn(run3()));

View File

@ -16,7 +16,7 @@ use embassy_nrf::gpiote::{InputChannel, InputChannelPolarity};
use embassy_nrf::{interrupt, Peripherals}; use embassy_nrf::{interrupt, Peripherals};
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
info!("Starting!"); info!("Starting!");
let ch1 = InputChannel::new( let ch1 = InputChannel::new(

View File

@ -19,7 +19,7 @@ use embassy_nrf::{interrupt, Peripherals};
use gpiote::{OutputChannel, OutputChannelPolarity}; use gpiote::{OutputChannel, OutputChannelPolarity};
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
info!("Starting!"); info!("Starting!");
let button1 = InputChannel::new( let button1 = InputChannel::new(

View File

@ -87,7 +87,7 @@ static DUTY: [u16; 1024] = [
]; ];
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
let pwm = Pwm::new(p.PWM0, p.P0_13, p.P0_14, p.P0_16, p.P0_15); let pwm = Pwm::new(p.PWM0, p.P0_13, p.P0_14, p.P0_16, p.P0_15);
pwm.set_prescaler(Prescaler::Div1); pwm.set_prescaler(Prescaler::Div1);
info!("pwm initialized!"); info!("pwm initialized!");

View File

@ -23,7 +23,7 @@ const PAGE_SIZE: usize = 4096;
struct AlignedBuf([u8; 4096]); struct AlignedBuf([u8; 4096]);
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
let csn = p.P0_17; let csn = p.P0_17;
let sck = p.P0_19; let sck = p.P0_19;
let io0 = p.P0_20; let io0 = p.P0_20;

View File

@ -10,7 +10,6 @@ mod example_common;
use defmt::panic; use defmt::panic;
use embassy::executor::Spawner; use embassy::executor::Spawner;
use embassy::util::Steal;
use embassy_nrf::gpio::{Level, Output, OutputDrive}; use embassy_nrf::gpio::{Level, Output, OutputDrive};
use embassy_nrf::Peripherals; use embassy_nrf::Peripherals;
use embassy_nrf::{interrupt, spim}; use embassy_nrf::{interrupt, spim};
@ -19,7 +18,7 @@ use embedded_hal::digital::v2::*;
use example_common::*; use example_common::*;
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
info!("running!"); info!("running!");
let mut config = spim::Config::default(); let mut config = spim::Config::default();

View File

@ -31,7 +31,7 @@ async fn run2() {
} }
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(spawner: Spawner, _p: Peripherals) {
unwrap!(spawner.spawn(run1())); unwrap!(spawner.spawn(run1()));
unwrap!(spawner.spawn(run2())); unwrap!(spawner.spawn(run2()));
} }

View File

@ -12,12 +12,11 @@ use example_common::*;
use defmt::panic; use defmt::panic;
use embassy::executor::Spawner; use embassy::executor::Spawner;
use embassy::traits::uart::{Read, Write}; use embassy::traits::uart::{Read, Write};
use embassy::util::Steal;
use embassy_nrf::gpio::NoPin; use embassy_nrf::gpio::NoPin;
use embassy_nrf::{interrupt, uarte, Peripherals}; use embassy_nrf::{interrupt, uarte, Peripherals};
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
let mut config = uarte::Config::default(); let mut config = uarte::Config::default();
config.parity = uarte::Parity::EXCLUDED; config.parity = uarte::Parity::EXCLUDED;
config.baudrate = uarte::Baudrate::BAUD115200; config.baudrate = uarte::Baudrate::BAUD115200;

View File

@ -12,13 +12,12 @@ use example_common::*;
use defmt::panic; use defmt::panic;
use embassy::executor::Spawner; use embassy::executor::Spawner;
use embassy::traits::uart::{Read, Write}; use embassy::traits::uart::Write;
use embassy::util::Steal;
use embassy_nrf::gpio::NoPin; use embassy_nrf::gpio::NoPin;
use embassy_nrf::{interrupt, uarte, Peripherals}; use embassy_nrf::{interrupt, uarte, Peripherals};
#[embassy::main] #[embassy::main]
async fn main(spawner: Spawner, p: Peripherals) { async fn main(_spawner: Spawner, p: Peripherals) {
let mut config = uarte::Config::default(); let mut config = uarte::Config::default();
config.parity = uarte::Parity::EXCLUDED; config.parity = uarte::Parity::EXCLUDED;
config.baudrate = uarte::Baudrate::BAUD115200; config.baudrate = uarte::Baudrate::BAUD115200;

View File

@ -11,7 +11,6 @@ use gpio::pin_cnf::DRIVE_A;
use crate::pac; use crate::pac;
use crate::pac::p0 as gpio; use crate::pac::p0 as gpio;
use crate::peripherals;
/// A GPIO port with up to 32 pins. /// A GPIO port with up to 32 pins.
#[derive(Debug, Eq, PartialEq)] #[derive(Debug, Eq, PartialEq)]

View File

@ -6,7 +6,7 @@ use core::sync::atomic::{compiler_fence, Ordering};
use embassy::util::Unborrow; use embassy::util::Unborrow;
use embassy_extras::unborrow; use embassy_extras::unborrow;
use crate::fmt::{assert, panic, unreachable, *}; use crate::fmt::{unreachable, *};
use crate::gpio::sealed::Pin as _; use crate::gpio::sealed::Pin as _;
use crate::gpio::OptionalPin as GpioOptionalPin; use crate::gpio::OptionalPin as GpioOptionalPin;
use crate::interrupt::Interrupt; use crate::interrupt::Interrupt;

View File

@ -11,8 +11,7 @@ use futures::future::poll_fn;
use crate::fmt::{assert, assert_eq, *}; use crate::fmt::{assert, assert_eq, *};
use crate::gpio::Pin as GpioPin; use crate::gpio::Pin as GpioPin;
use crate::interrupt::{self}; use crate::pac;
use crate::{pac, peripherals};
pub use crate::pac::qspi::ifconfig0::ADDRMODE_A as AddressMode; pub use crate::pac::qspi::ifconfig0::ADDRMODE_A as AddressMode;
pub use crate::pac::qspi::ifconfig0::PPSIZE_A as WritePageSize; pub use crate::pac::qspi::ifconfig0::PPSIZE_A as WritePageSize;

View File

@ -13,8 +13,8 @@ use traits::spi::FullDuplex;
use crate::gpio::sealed::Pin as _; use crate::gpio::sealed::Pin as _;
use crate::gpio::{OptionalPin, Pin as GpioPin}; use crate::gpio::{OptionalPin, Pin as GpioPin};
use crate::interrupt::{self, Interrupt}; use crate::interrupt::Interrupt;
use crate::{pac, peripherals, util::slice_in_ram_or}; use crate::{pac, util::slice_in_ram_or};
pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
pub use pac::spim0::frequency::FREQUENCY_A as Frequency; pub use pac::spim0::frequency::FREQUENCY_A as Frequency;
@ -285,7 +285,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write<u8> for Spim<'d, T> {
fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> { fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> {
slice_in_ram_or(words, Error::DMABufferNotInDataMemory)?; slice_in_ram_or(words, Error::DMABufferNotInDataMemory)?;
let mut recv: &mut [u8] = &mut []; let recv: &mut [u8] = &mut [];
// Conservative compiler fence to prevent optimizations that do not // Conservative compiler fence to prevent optimizations that do not
// take in to account actions by DMA. The fence has been placed here, // take in to account actions by DMA. The fence has been placed here,

View File

@ -16,10 +16,8 @@ use crate::chip::EASY_DMA_SIZE;
use crate::fmt::{assert, panic, *}; use crate::fmt::{assert, panic, *};
use crate::gpio::sealed::Pin as _; use crate::gpio::sealed::Pin as _;
use crate::gpio::{OptionalPin as GpioOptionalPin, Pin as GpioPin}; use crate::gpio::{OptionalPin as GpioOptionalPin, Pin as GpioPin};
use crate::interrupt;
use crate::interrupt::Interrupt; use crate::interrupt::Interrupt;
use crate::pac; use crate::pac;
use crate::peripherals;
use crate::ppi::{AnyConfigurableChannel, ConfigurableChannel, Event, Ppi, Task}; use crate::ppi::{AnyConfigurableChannel, ConfigurableChannel, Event, Ppi, Task};
use crate::timer::Instance as TimerInstance; use crate::timer::Instance as TimerInstance;
@ -43,7 +41,6 @@ impl Default for Config {
/// Interface to the UARTE peripheral /// Interface to the UARTE peripheral
pub struct Uarte<'d, T: Instance> { pub struct Uarte<'d, T: Instance> {
peri: T,
phantom: PhantomData<&'d mut T>, phantom: PhantomData<&'d mut T>,
} }
@ -58,7 +55,7 @@ impl<'d, T: Instance> Uarte<'d, T> {
/// or [`receive`](Uarte::receive). /// or [`receive`](Uarte::receive).
#[allow(unused_unsafe)] #[allow(unused_unsafe)]
pub unsafe fn new( pub unsafe fn new(
uarte: impl Unborrow<Target = T> + 'd, _uarte: impl Unborrow<Target = T> + 'd,
irq: impl Unborrow<Target = T::Interrupt> + 'd, irq: impl Unborrow<Target = T::Interrupt> + 'd,
rxd: impl Unborrow<Target = impl GpioPin> + 'd, rxd: impl Unborrow<Target = impl GpioPin> + 'd,
txd: impl Unborrow<Target = impl GpioPin> + 'd, txd: impl Unborrow<Target = impl GpioPin> + 'd,
@ -66,7 +63,7 @@ impl<'d, T: Instance> Uarte<'d, T> {
rts: impl Unborrow<Target = impl GpioOptionalPin> + 'd, rts: impl Unborrow<Target = impl GpioOptionalPin> + 'd,
config: Config, config: Config,
) -> Self { ) -> Self {
unborrow!(uarte, irq, rxd, txd, cts, rts); unborrow!(irq, rxd, txd, cts, rts);
let r = T::regs(); let r = T::regs();
@ -119,7 +116,6 @@ impl<'d, T: Instance> Uarte<'d, T> {
r.enable.write(|w| w.enable().enabled()); r.enable.write(|w| w.enable().enabled());
Self { Self {
peri: uarte,
phantom: PhantomData, phantom: PhantomData,
} }
} }