Merge branch 'master' of https://github.com/embassy-rs/embassy into rtos-trace

This commit is contained in:
Quentin Smith
2022-08-19 00:53:06 -04:00
315 changed files with 2533 additions and 1344 deletions

View File

@ -4,9 +4,8 @@
use core::task::Poll;
use embassy_executor::executor::Spawner;
use embassy_executor::time::{Duration, Instant, Timer};
use embassy_nrf::Peripherals;
use embassy_executor::Spawner;
use embassy_time::{Duration, Instant, Timer};
#[cfg(feature = "log")]
use log::*;
use panic_probe as _;
@ -55,7 +54,8 @@ async fn run3() {
}
#[embassy_executor::main]
async fn main(spawner: Spawner, _p: Peripherals) {
async fn main(spawner: Spawner) {
let _p = embassy_nrf::init(Default::default());
LOGGER.init();
#[cfg(feature = "log")]
{