diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-04-02 02:35:49 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-02 02:35:49 +0000 |
| commit | 0eea6fd6b5eeda740a1b5cd47ed8e48e0e3d0c61 (patch) | |
| tree | 588c65c93b31b897f53d389f7876dc2703eb0fa8 /examples/nrf/src/bin/uart_split.rs | |
| parent | a9e63167e1ec230ca3d28da771378f5f4936a840 (diff) | |
| parent | 82803bffdab0842bf6c3e4bce21131d437b06669 (diff) | |
Merge #690
690: Use embassy/defmt-timestamp-uptime in all examples. r=Dirbaio a=Dirbaio
bors r+
Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/nrf/src/bin/uart_split.rs')
| -rw-r--r-- | examples/nrf/src/bin/uart_split.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/nrf/src/bin/uart_split.rs b/examples/nrf/src/bin/uart_split.rs index 19d438c40..909429b1a 100644 --- a/examples/nrf/src/bin/uart_split.rs +++ b/examples/nrf/src/bin/uart_split.rs | |||
| @@ -2,10 +2,7 @@ | |||
| 2 | #![no_main] | 2 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | #[path = "../example_common.rs"] | 5 | use defmt::*; |
| 6 | mod example_common; | ||
| 7 | use example_common::*; | ||
| 8 | |||
| 9 | use embassy::blocking_mutex::raw::NoopRawMutex; | 6 | use embassy::blocking_mutex::raw::NoopRawMutex; |
| 10 | use embassy::channel::mpsc::{self, Channel, Sender}; | 7 | use embassy::channel::mpsc::{self, Channel, Sender}; |
| 11 | use embassy::executor::Spawner; | 8 | use embassy::executor::Spawner; |
| @@ -14,6 +11,9 @@ use embassy_nrf::peripherals::UARTE0; | |||
| 14 | use embassy_nrf::uarte::UarteRx; | 11 | use embassy_nrf::uarte::UarteRx; |
| 15 | use embassy_nrf::{interrupt, uarte, Peripherals}; | 12 | use embassy_nrf::{interrupt, uarte, Peripherals}; |
| 16 | 13 | ||
| 14 | use defmt_rtt as _; // global logger | ||
| 15 | use panic_probe as _; | ||
| 16 | |||
| 17 | static CHANNEL: Forever<Channel<NoopRawMutex, [u8; 8], 1>> = Forever::new(); | 17 | static CHANNEL: Forever<Channel<NoopRawMutex, [u8; 8], 1>> = Forever::new(); |
| 18 | 18 | ||
| 19 | #[embassy::main] | 19 | #[embassy::main] |
