diff --git a/Cargo.lock b/Cargo.lock index e8da8b1..fc0f579 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -678,6 +678,8 @@ dependencies = [ "defmt 1.0.1", "document-features", "embassy-embedded-hal", + "embassy-executor", + "embassy-executor-macros", "embassy-futures", "embassy-hal-internal 0.5.0", "embassy-sync", diff --git a/Cargo.toml b/Cargo.toml index 79cac9b..946246d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,11 +59,7 @@ embassy-strike-driver = { git = "https://tangled.org/sachy.dev/strike-sensor", p ] } embassy-embedded-hal = { version = "0.6.0" } embassy-sync = { version = "0.8" } -embassy-executor = { version = "0.10.0", features = [ - "platform-cortex-m", - "executor-thread", - "executor-interrupt", -] } +embassy-executor = { version = "0.10.0", features = ["platform-cortex-m"] } embassy-time = { version = "0.5.1" } embassy-rp = { version = "0.10.0", features = [ "unstable-pac", @@ -73,6 +69,8 @@ embassy-rp = { version = "0.10.0", features = [ "rom-func-cache", "intrinsics", "rom-v2-intrinsics", + "executor-thread", + "executor-interrupt", ] } embassy-futures = { version = "0.1.2" } embassy-net = { version = "0.9", features = [ diff --git a/src/main.rs b/src/main.rs index 53eb9ec..dd39062 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,11 +19,11 @@ mod wifi; use crate::{allocator::PicoHeap, rtc::GlobalRtc}; use cyw43_pio::{DEFAULT_CLOCK_DIVIDER, PioSpi}; -use embassy_executor::Executor; use embassy_rp::{ adc as rp_adc, bind_interrupts, clocks::RoscRng, dma, + executor::Executor, gpio::{Level, Output}, multicore::{Stack, spawn_core1}, peripherals::{DMA_CH0, DMA_CH1, PIO0},