aboutsummaryrefslogtreecommitdiff
path: root/examples/nrf/src
diff options
context:
space:
mode:
authorhuntc <[email protected]>2022-06-12 15:16:56 +1000
committerhuntc <[email protected]>2022-06-12 15:16:56 +1000
commit99d19c7dcf077cdd06113bf013d6a458289b1ecb (patch)
tree21344af53a0823f4949b25dbd2d9011ffe316f8a /examples/nrf/src
parentdb344c2bda55bd0352a43720788185cc4d3a420e (diff)
Rename channel to mpmc
I've renamed the channel module for the MPMC as mpmc. There was a previous debate about this, but I feel that the strategy here avoids importing `channel::channel`. The change leaves `signal::Signal`, but I think that's ok. It is all a bit subjective of course. The bottom line for me is that I really like the term mpmc - it means something to me and aligns with broader naming e.g. in Tokio.
Diffstat (limited to 'examples/nrf/src')
-rw-r--r--examples/nrf/src/bin/channel.rs2
-rw-r--r--examples/nrf/src/bin/channel_sender_receiver.rs2
-rw-r--r--examples/nrf/src/bin/uart_split.rs2
-rw-r--r--examples/nrf/src/bin/usb_ethernet.rs2
-rw-r--r--examples/nrf/src/bin/usb_hid_keyboard.rs2
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/nrf/src/bin/channel.rs b/examples/nrf/src/bin/channel.rs
index 476ec09a1..12b463581 100644
--- a/examples/nrf/src/bin/channel.rs
+++ b/examples/nrf/src/bin/channel.rs
@@ -4,7 +4,7 @@
4 4
5use defmt::unwrap; 5use defmt::unwrap;
6use embassy::blocking_mutex::raw::ThreadModeRawMutex; 6use embassy::blocking_mutex::raw::ThreadModeRawMutex;
7use embassy::channel::channel::Channel; 7use embassy::channel::mpmc::Channel;
8use embassy::executor::Spawner; 8use embassy::executor::Spawner;
9use embassy::time::{Duration, Timer}; 9use embassy::time::{Duration, Timer};
10use embassy_nrf::gpio::{Level, Output, OutputDrive}; 10use embassy_nrf::gpio::{Level, Output, OutputDrive};
diff --git a/examples/nrf/src/bin/channel_sender_receiver.rs b/examples/nrf/src/bin/channel_sender_receiver.rs
index c79f2fd6b..1742dcc9e 100644
--- a/examples/nrf/src/bin/channel_sender_receiver.rs
+++ b/examples/nrf/src/bin/channel_sender_receiver.rs
@@ -4,7 +4,7 @@
4 4
5use defmt::unwrap; 5use defmt::unwrap;
6use embassy::blocking_mutex::raw::NoopRawMutex; 6use embassy::blocking_mutex::raw::NoopRawMutex;
7use embassy::channel::channel::{Channel, Receiver, Sender}; 7use embassy::channel::mpmc::{Channel, Receiver, Sender};
8use embassy::executor::Spawner; 8use embassy::executor::Spawner;
9use embassy::time::{Duration, Timer}; 9use embassy::time::{Duration, Timer};
10use embassy::util::Forever; 10use embassy::util::Forever;
diff --git a/examples/nrf/src/bin/uart_split.rs b/examples/nrf/src/bin/uart_split.rs
index 3fde2f0d8..958cfeba0 100644
--- a/examples/nrf/src/bin/uart_split.rs
+++ b/examples/nrf/src/bin/uart_split.rs
@@ -4,7 +4,7 @@
4 4
5use defmt::*; 5use defmt::*;
6use embassy::blocking_mutex::raw::ThreadModeRawMutex; 6use embassy::blocking_mutex::raw::ThreadModeRawMutex;
7use embassy::channel::channel::Channel; 7use embassy::channel::mpmc::Channel;
8use embassy::executor::Spawner; 8use embassy::executor::Spawner;
9use embassy_nrf::peripherals::UARTE0; 9use embassy_nrf::peripherals::UARTE0;
10use embassy_nrf::uarte::UarteRx; 10use embassy_nrf::uarte::UarteRx;
diff --git a/examples/nrf/src/bin/usb_ethernet.rs b/examples/nrf/src/bin/usb_ethernet.rs
index 49f2fb89a..3d85d22bb 100644
--- a/examples/nrf/src/bin/usb_ethernet.rs
+++ b/examples/nrf/src/bin/usb_ethernet.rs
@@ -8,7 +8,7 @@ use core::sync::atomic::{AtomicBool, Ordering};
8use core::task::Waker; 8use core::task::Waker;
9use defmt::*; 9use defmt::*;
10use embassy::blocking_mutex::raw::ThreadModeRawMutex; 10use embassy::blocking_mutex::raw::ThreadModeRawMutex;
11use embassy::channel::Channel; 11use embassy::channel::mpmc::Channel;
12use embassy::executor::Spawner; 12use embassy::executor::Spawner;
13use embassy::util::Forever; 13use embassy::util::Forever;
14use embassy_net::tcp::TcpSocket; 14use embassy_net::tcp::TcpSocket;
diff --git a/examples/nrf/src/bin/usb_hid_keyboard.rs b/examples/nrf/src/bin/usb_hid_keyboard.rs
index d855a3a57..d7affae11 100644
--- a/examples/nrf/src/bin/usb_hid_keyboard.rs
+++ b/examples/nrf/src/bin/usb_hid_keyboard.rs
@@ -6,7 +6,7 @@
6use core::mem; 6use core::mem;
7use core::sync::atomic::{AtomicBool, Ordering}; 7use core::sync::atomic::{AtomicBool, Ordering};
8use defmt::*; 8use defmt::*;
9use embassy::channel::Signal; 9use embassy::channel::signal::Signal;
10use embassy::executor::Spawner; 10use embassy::executor::Spawner;
11use embassy::interrupt::InterruptExt; 11use embassy::interrupt::InterruptExt;
12use embassy::time::Duration; 12use embassy::time::Duration;