aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRukai <[email protected]>2021-05-17 19:48:58 +1000
committerRukai <[email protected]>2021-05-17 19:48:58 +1000
commit149ddf2f29bf6e7fd15a45e164fafac936197599 (patch)
treea48cd461842e4ea2be55499d270e24f811127910
parent9206d4b33d3f7690cbab7cad03da7b97ef0f8ec9 (diff)
Fix warnings
-rw-r--r--embassy-extras/src/ring_buffer.rs2
-rw-r--r--embassy-nrf-examples/src/bin/blinky.rs3
-rw-r--r--embassy-nrf-examples/src/bin/buffered_uart.rs2
-rw-r--r--embassy-nrf-examples/src/bin/executor_fairness_test.rs2
-rw-r--r--embassy-nrf-examples/src/bin/gpiote_channel.rs2
-rw-r--r--embassy-nrf-examples/src/bin/ppi.rs2
-rw-r--r--embassy-nrf-examples/src/bin/pwm.rs2
-rw-r--r--embassy-nrf-examples/src/bin/qspi.rs2
-rw-r--r--embassy-nrf-examples/src/bin/spim.rs3
-rw-r--r--embassy-nrf-examples/src/bin/timer.rs2
-rw-r--r--embassy-nrf-examples/src/bin/uart.rs3
-rw-r--r--embassy-nrf-examples/src/bin/uart_idle.rs5
-rw-r--r--embassy-nrf/src/gpio.rs1
-rw-r--r--embassy-nrf/src/pwm.rs2
-rw-r--r--embassy-nrf/src/qspi.rs3
-rw-r--r--embassy-nrf/src/spim.rs6
-rw-r--r--embassy-nrf/src/uarte.rs8
17 files changed, 20 insertions, 30 deletions
diff --git a/embassy-extras/src/ring_buffer.rs b/embassy-extras/src/ring_buffer.rs
index 0ef66f00a..dafdd958a 100644
--- a/embassy-extras/src/ring_buffer.rs
+++ b/embassy-extras/src/ring_buffer.rs
@@ -1,4 +1,4 @@
1use crate::fmt::{assert, *}; 1use crate::fmt::assert;
2 2
3pub struct RingBuffer<'a> { 3pub struct RingBuffer<'a> {
4 buf: &'a mut [u8], 4 buf: &'a mut [u8],
diff --git a/embassy-nrf-examples/src/bin/blinky.rs b/embassy-nrf-examples/src/bin/blinky.rs
index e6fc854b5..8f12cfda9 100644
--- a/embassy-nrf-examples/src/bin/blinky.rs
+++ b/embassy-nrf-examples/src/bin/blinky.rs
@@ -7,7 +7,6 @@
7 7
8#[path = "../example_common.rs"] 8#[path = "../example_common.rs"]
9mod example_common; 9mod example_common;
10use example_common::*;
11 10
12use defmt::panic; 11use defmt::panic;
13use embassy::executor::Spawner; 12use embassy::executor::Spawner;
@@ -17,7 +16,7 @@ use embassy_nrf::Peripherals;
17use embedded_hal::digital::v2::OutputPin; 16use embedded_hal::digital::v2::OutputPin;
18 17
19#[embassy::main] 18#[embassy::main]
20async fn main(spawner: Spawner, p: Peripherals) { 19async fn main(_spawner: Spawner, p: Peripherals) {
21 let mut led = Output::new(p.P0_13, Level::Low, OutputDrive::Standard); 20 let mut led = Output::new(p.P0_13, Level::Low, OutputDrive::Standard);
22 21
23 loop { 22 loop {
diff --git a/embassy-nrf-examples/src/bin/buffered_uart.rs b/embassy-nrf-examples/src/bin/buffered_uart.rs
index b3a621c6b..c800e64fc 100644
--- a/embassy-nrf-examples/src/bin/buffered_uart.rs
+++ b/embassy-nrf-examples/src/bin/buffered_uart.rs
@@ -17,7 +17,7 @@ use example_common::*;
17use futures::pin_mut; 17use futures::pin_mut;
18 18
19#[embassy::main] 19#[embassy::main]
20async fn main(spawner: Spawner, p: Peripherals) { 20async fn main(_spawner: Spawner, p: Peripherals) {
21 let mut config = uarte::Config::default(); 21 let mut config = uarte::Config::default();
22 config.parity = uarte::Parity::EXCLUDED; 22 config.parity = uarte::Parity::EXCLUDED;
23 config.baudrate = uarte::Baudrate::BAUD115200; 23 config.baudrate = uarte::Baudrate::BAUD115200;
diff --git a/embassy-nrf-examples/src/bin/executor_fairness_test.rs b/embassy-nrf-examples/src/bin/executor_fairness_test.rs
index ca9bcc1e6..797be4335 100644
--- a/embassy-nrf-examples/src/bin/executor_fairness_test.rs
+++ b/embassy-nrf-examples/src/bin/executor_fairness_test.rs
@@ -40,7 +40,7 @@ async fn run3() {
40} 40}
41 41
42#[embassy::main] 42#[embassy::main]
43async fn main(spawner: Spawner, p: Peripherals) { 43async fn main(spawner: Spawner, _p: Peripherals) {
44 unwrap!(spawner.spawn(run1())); 44 unwrap!(spawner.spawn(run1()));
45 unwrap!(spawner.spawn(run2())); 45 unwrap!(spawner.spawn(run2()));
46 unwrap!(spawner.spawn(run3())); 46 unwrap!(spawner.spawn(run3()));
diff --git a/embassy-nrf-examples/src/bin/gpiote_channel.rs b/embassy-nrf-examples/src/bin/gpiote_channel.rs
index d52ed7767..9800aed98 100644
--- a/embassy-nrf-examples/src/bin/gpiote_channel.rs
+++ b/embassy-nrf-examples/src/bin/gpiote_channel.rs
@@ -16,7 +16,7 @@ use embassy_nrf::gpiote::{InputChannel, InputChannelPolarity};
16use embassy_nrf::{interrupt, Peripherals}; 16use embassy_nrf::{interrupt, Peripherals};
17 17
18#[embassy::main] 18#[embassy::main]
19async fn main(spawner: Spawner, p: Peripherals) { 19async fn main(_spawner: Spawner, p: Peripherals) {
20 info!("Starting!"); 20 info!("Starting!");
21 21
22 let ch1 = InputChannel::new( 22 let ch1 = InputChannel::new(
diff --git a/embassy-nrf-examples/src/bin/ppi.rs b/embassy-nrf-examples/src/bin/ppi.rs
index 47782ed29..717604b9e 100644
--- a/embassy-nrf-examples/src/bin/ppi.rs
+++ b/embassy-nrf-examples/src/bin/ppi.rs
@@ -19,7 +19,7 @@ use embassy_nrf::{interrupt, Peripherals};
19use gpiote::{OutputChannel, OutputChannelPolarity}; 19use gpiote::{OutputChannel, OutputChannelPolarity};
20 20
21#[embassy::main] 21#[embassy::main]
22async fn main(spawner: Spawner, p: Peripherals) { 22async fn main(_spawner: Spawner, p: Peripherals) {
23 info!("Starting!"); 23 info!("Starting!");
24 24
25 let button1 = InputChannel::new( 25 let button1 = InputChannel::new(
diff --git a/embassy-nrf-examples/src/bin/pwm.rs b/embassy-nrf-examples/src/bin/pwm.rs
index 6efcf22d2..d2874a29b 100644
--- a/embassy-nrf-examples/src/bin/pwm.rs
+++ b/embassy-nrf-examples/src/bin/pwm.rs
@@ -87,7 +87,7 @@ static DUTY: [u16; 1024] = [
87]; 87];
88 88
89#[embassy::main] 89#[embassy::main]
90async fn main(spawner: Spawner, p: Peripherals) { 90async fn main(_spawner: Spawner, p: Peripherals) {
91 let pwm = Pwm::new(p.PWM0, p.P0_13, p.P0_14, p.P0_16, p.P0_15); 91 let pwm = Pwm::new(p.PWM0, p.P0_13, p.P0_14, p.P0_16, p.P0_15);
92 pwm.set_prescaler(Prescaler::Div1); 92 pwm.set_prescaler(Prescaler::Div1);
93 info!("pwm initialized!"); 93 info!("pwm initialized!");
diff --git a/embassy-nrf-examples/src/bin/qspi.rs b/embassy-nrf-examples/src/bin/qspi.rs
index 3dc027f6f..14f215187 100644
--- a/embassy-nrf-examples/src/bin/qspi.rs
+++ b/embassy-nrf-examples/src/bin/qspi.rs
@@ -23,7 +23,7 @@ const PAGE_SIZE: usize = 4096;
23struct AlignedBuf([u8; 4096]); 23struct AlignedBuf([u8; 4096]);
24 24
25#[embassy::main] 25#[embassy::main]
26async fn main(spawner: Spawner, p: Peripherals) { 26async fn main(_spawner: Spawner, p: Peripherals) {
27 let csn = p.P0_17; 27 let csn = p.P0_17;
28 let sck = p.P0_19; 28 let sck = p.P0_19;
29 let io0 = p.P0_20; 29 let io0 = p.P0_20;
diff --git a/embassy-nrf-examples/src/bin/spim.rs b/embassy-nrf-examples/src/bin/spim.rs
index df921fc86..c42cc6015 100644
--- a/embassy-nrf-examples/src/bin/spim.rs
+++ b/embassy-nrf-examples/src/bin/spim.rs
@@ -10,7 +10,6 @@ mod example_common;
10 10
11use defmt::panic; 11use defmt::panic;
12use embassy::executor::Spawner; 12use embassy::executor::Spawner;
13use embassy::util::Steal;
14use embassy_nrf::gpio::{Level, Output, OutputDrive}; 13use embassy_nrf::gpio::{Level, Output, OutputDrive};
15use embassy_nrf::Peripherals; 14use embassy_nrf::Peripherals;
16use embassy_nrf::{interrupt, spim}; 15use embassy_nrf::{interrupt, spim};
@@ -19,7 +18,7 @@ use embedded_hal::digital::v2::*;
19use example_common::*; 18use example_common::*;
20 19
21#[embassy::main] 20#[embassy::main]
22async fn main(spawner: Spawner, p: Peripherals) { 21async fn main(_spawner: Spawner, p: Peripherals) {
23 info!("running!"); 22 info!("running!");
24 23
25 let mut config = spim::Config::default(); 24 let mut config = spim::Config::default();
diff --git a/embassy-nrf-examples/src/bin/timer.rs b/embassy-nrf-examples/src/bin/timer.rs
index ffbbb7841..43f6d76ce 100644
--- a/embassy-nrf-examples/src/bin/timer.rs
+++ b/embassy-nrf-examples/src/bin/timer.rs
@@ -31,7 +31,7 @@ async fn run2() {
31} 31}
32 32
33#[embassy::main] 33#[embassy::main]
34async fn main(spawner: Spawner, p: Peripherals) { 34async fn main(spawner: Spawner, _p: Peripherals) {
35 unwrap!(spawner.spawn(run1())); 35 unwrap!(spawner.spawn(run1()));
36 unwrap!(spawner.spawn(run2())); 36 unwrap!(spawner.spawn(run2()));
37} 37}
diff --git a/embassy-nrf-examples/src/bin/uart.rs b/embassy-nrf-examples/src/bin/uart.rs
index 9a0e65d3e..e65e2fe51 100644
--- a/embassy-nrf-examples/src/bin/uart.rs
+++ b/embassy-nrf-examples/src/bin/uart.rs
@@ -12,12 +12,11 @@ use example_common::*;
12use defmt::panic; 12use defmt::panic;
13use embassy::executor::Spawner; 13use embassy::executor::Spawner;
14use embassy::traits::uart::{Read, Write}; 14use embassy::traits::uart::{Read, Write};
15use embassy::util::Steal;
16use embassy_nrf::gpio::NoPin; 15use embassy_nrf::gpio::NoPin;
17use embassy_nrf::{interrupt, uarte, Peripherals}; 16use embassy_nrf::{interrupt, uarte, Peripherals};
18 17
19#[embassy::main] 18#[embassy::main]
20async fn main(spawner: Spawner, p: Peripherals) { 19async fn main(_spawner: Spawner, p: Peripherals) {
21 let mut config = uarte::Config::default(); 20 let mut config = uarte::Config::default();
22 config.parity = uarte::Parity::EXCLUDED; 21 config.parity = uarte::Parity::EXCLUDED;
23 config.baudrate = uarte::Baudrate::BAUD115200; 22 config.baudrate = uarte::Baudrate::BAUD115200;
diff --git a/embassy-nrf-examples/src/bin/uart_idle.rs b/embassy-nrf-examples/src/bin/uart_idle.rs
index a97c65933..dc2c73433 100644
--- a/embassy-nrf-examples/src/bin/uart_idle.rs
+++ b/embassy-nrf-examples/src/bin/uart_idle.rs
@@ -12,13 +12,12 @@ use example_common::*;
12 12
13use defmt::panic; 13use defmt::panic;
14use embassy::executor::Spawner; 14use embassy::executor::Spawner;
15use embassy::traits::uart::{Read, Write}; 15use embassy::traits::uart::Write;
16use embassy::util::Steal;
17use embassy_nrf::gpio::NoPin; 16use embassy_nrf::gpio::NoPin;
18use embassy_nrf::{interrupt, uarte, Peripherals}; 17use embassy_nrf::{interrupt, uarte, Peripherals};
19 18
20#[embassy::main] 19#[embassy::main]
21async fn main(spawner: Spawner, p: Peripherals) { 20async fn main(_spawner: Spawner, p: Peripherals) {
22 let mut config = uarte::Config::default(); 21 let mut config = uarte::Config::default();
23 config.parity = uarte::Parity::EXCLUDED; 22 config.parity = uarte::Parity::EXCLUDED;
24 config.baudrate = uarte::Baudrate::BAUD115200; 23 config.baudrate = uarte::Baudrate::BAUD115200;
diff --git a/embassy-nrf/src/gpio.rs b/embassy-nrf/src/gpio.rs
index fed1ae049..223247d60 100644
--- a/embassy-nrf/src/gpio.rs
+++ b/embassy-nrf/src/gpio.rs
@@ -11,7 +11,6 @@ use gpio::pin_cnf::DRIVE_A;
11 11
12use crate::pac; 12use crate::pac;
13use crate::pac::p0 as gpio; 13use crate::pac::p0 as gpio;
14use crate::peripherals;
15 14
16/// A GPIO port with up to 32 pins. 15/// A GPIO port with up to 32 pins.
17#[derive(Debug, Eq, PartialEq)] 16#[derive(Debug, Eq, PartialEq)]
diff --git a/embassy-nrf/src/pwm.rs b/embassy-nrf/src/pwm.rs
index 34c31e3bb..da933cc80 100644
--- a/embassy-nrf/src/pwm.rs
+++ b/embassy-nrf/src/pwm.rs
@@ -6,7 +6,7 @@ use core::sync::atomic::{compiler_fence, Ordering};
6use embassy::util::Unborrow; 6use embassy::util::Unborrow;
7use embassy_extras::unborrow; 7use embassy_extras::unborrow;
8 8
9use crate::fmt::{assert, panic, unreachable, *}; 9use crate::fmt::{unreachable, *};
10use crate::gpio::sealed::Pin as _; 10use crate::gpio::sealed::Pin as _;
11use crate::gpio::OptionalPin as GpioOptionalPin; 11use crate::gpio::OptionalPin as GpioOptionalPin;
12use crate::interrupt::Interrupt; 12use crate::interrupt::Interrupt;
diff --git a/embassy-nrf/src/qspi.rs b/embassy-nrf/src/qspi.rs
index db6b653e7..ea19ccf51 100644
--- a/embassy-nrf/src/qspi.rs
+++ b/embassy-nrf/src/qspi.rs
@@ -11,8 +11,7 @@ use futures::future::poll_fn;
11 11
12use crate::fmt::{assert, assert_eq, *}; 12use crate::fmt::{assert, assert_eq, *};
13use crate::gpio::Pin as GpioPin; 13use crate::gpio::Pin as GpioPin;
14use crate::interrupt::{self}; 14use crate::pac;
15use crate::{pac, peripherals};
16 15
17pub use crate::pac::qspi::ifconfig0::ADDRMODE_A as AddressMode; 16pub use crate::pac::qspi::ifconfig0::ADDRMODE_A as AddressMode;
18pub use crate::pac::qspi::ifconfig0::PPSIZE_A as WritePageSize; 17pub use crate::pac::qspi::ifconfig0::PPSIZE_A as WritePageSize;
diff --git a/embassy-nrf/src/spim.rs b/embassy-nrf/src/spim.rs
index 0703836b9..e5d077306 100644
--- a/embassy-nrf/src/spim.rs
+++ b/embassy-nrf/src/spim.rs
@@ -13,8 +13,8 @@ use traits::spi::FullDuplex;
13 13
14use crate::gpio::sealed::Pin as _; 14use crate::gpio::sealed::Pin as _;
15use crate::gpio::{OptionalPin, Pin as GpioPin}; 15use crate::gpio::{OptionalPin, Pin as GpioPin};
16use crate::interrupt::{self, Interrupt}; 16use crate::interrupt::Interrupt;
17use crate::{pac, peripherals, util::slice_in_ram_or}; 17use crate::{pac, util::slice_in_ram_or};
18 18
19pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; 19pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
20pub use pac::spim0::frequency::FREQUENCY_A as Frequency; 20pub 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> {
285 285
286 fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> { 286 fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> {
287 slice_in_ram_or(words, Error::DMABufferNotInDataMemory)?; 287 slice_in_ram_or(words, Error::DMABufferNotInDataMemory)?;
288 let mut recv: &mut [u8] = &mut []; 288 let recv: &mut [u8] = &mut [];
289 289
290 // Conservative compiler fence to prevent optimizations that do not 290 // Conservative compiler fence to prevent optimizations that do not
291 // take in to account actions by DMA. The fence has been placed here, 291 // take in to account actions by DMA. The fence has been placed here,
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs
index 494110bee..3ad7a787d 100644
--- a/embassy-nrf/src/uarte.rs
+++ b/embassy-nrf/src/uarte.rs
@@ -16,10 +16,8 @@ use crate::chip::EASY_DMA_SIZE;
16use crate::fmt::{assert, panic, *}; 16use crate::fmt::{assert, panic, *};
17use crate::gpio::sealed::Pin as _; 17use crate::gpio::sealed::Pin as _;
18use crate::gpio::{OptionalPin as GpioOptionalPin, Pin as GpioPin}; 18use crate::gpio::{OptionalPin as GpioOptionalPin, Pin as GpioPin};
19use crate::interrupt;
20use crate::interrupt::Interrupt; 19use crate::interrupt::Interrupt;
21use crate::pac; 20use crate::pac;
22use crate::peripherals;
23use crate::ppi::{AnyConfigurableChannel, ConfigurableChannel, Event, Ppi, Task}; 21use crate::ppi::{AnyConfigurableChannel, ConfigurableChannel, Event, Ppi, Task};
24use crate::timer::Instance as TimerInstance; 22use crate::timer::Instance as TimerInstance;
25 23
@@ -43,7 +41,6 @@ impl Default for Config {
43 41
44/// Interface to the UARTE peripheral 42/// Interface to the UARTE peripheral
45pub struct Uarte<'d, T: Instance> { 43pub struct Uarte<'d, T: Instance> {
46 peri: T,
47 phantom: PhantomData<&'d mut T>, 44 phantom: PhantomData<&'d mut T>,
48} 45}
49 46
@@ -58,7 +55,7 @@ impl<'d, T: Instance> Uarte<'d, T> {
58 /// or [`receive`](Uarte::receive). 55 /// or [`receive`](Uarte::receive).
59 #[allow(unused_unsafe)] 56 #[allow(unused_unsafe)]
60 pub unsafe fn new( 57 pub unsafe fn new(
61 uarte: impl Unborrow<Target = T> + 'd, 58 _uarte: impl Unborrow<Target = T> + 'd,
62 irq: impl Unborrow<Target = T::Interrupt> + 'd, 59 irq: impl Unborrow<Target = T::Interrupt> + 'd,
63 rxd: impl Unborrow<Target = impl GpioPin> + 'd, 60 rxd: impl Unborrow<Target = impl GpioPin> + 'd,
64 txd: impl Unborrow<Target = impl GpioPin> + 'd, 61 txd: impl Unborrow<Target = impl GpioPin> + 'd,
@@ -66,7 +63,7 @@ impl<'d, T: Instance> Uarte<'d, T> {
66 rts: impl Unborrow<Target = impl GpioOptionalPin> + 'd, 63 rts: impl Unborrow<Target = impl GpioOptionalPin> + 'd,
67 config: Config, 64 config: Config,
68 ) -> Self { 65 ) -> Self {
69 unborrow!(uarte, irq, rxd, txd, cts, rts); 66 unborrow!(irq, rxd, txd, cts, rts);
70 67
71 let r = T::regs(); 68 let r = T::regs();
72 69
@@ -119,7 +116,6 @@ impl<'d, T: Instance> Uarte<'d, T> {
119 r.enable.write(|w| w.enable().enabled()); 116 r.enable.write(|w| w.enable().enabled());
120 117
121 Self { 118 Self {
122 peri: uarte,
123 phantom: PhantomData, 119 phantom: PhantomData,
124 } 120 }
125 } 121 }