From 2611ca0854b516e00e5b547a7470c766bb3e7f0d Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Tue, 28 Mar 2023 15:02:14 +0100 Subject: [PATCH] fix examples --- esp-wifi/examples/esp_now.rs | 100 ------------------ .../examples/embassy_access_point.rs | 6 +- examples-esp32/examples/embassy_dhcp.rs | 6 +- examples-esp32/examples/embassy_esp_now.rs | 2 +- .../examples/embassy_access_point.rs | 6 +- examples-esp32c2/examples/embassy_dhcp.rs | 6 +- examples-esp32c2/examples/embassy_esp_now.rs | 2 +- .../examples/embassy_access_point.rs | 6 +- examples-esp32c3/examples/embassy_dhcp.rs | 6 +- examples-esp32c3/examples/embassy_esp_now.rs | 2 +- examples-esp32c3/examples/esp_now.rs | 2 +- .../examples/embassy_access_point.rs | 6 +- examples-esp32c6/examples/embassy_dhcp.rs | 6 +- examples-esp32c6/examples/embassy_esp_now.rs | 2 +- .../examples/embassy_access_point.rs | 6 +- examples-esp32s2/examples/embassy_dhcp.rs | 6 +- examples-esp32s2/examples/embassy_esp_now.rs | 2 +- examples-esp32s3/examples/ble.rs | 2 - 18 files changed, 36 insertions(+), 138 deletions(-) delete mode 100644 esp-wifi/examples/esp_now.rs diff --git a/esp-wifi/examples/esp_now.rs b/esp-wifi/examples/esp_now.rs deleted file mode 100644 index 123a2a27..00000000 --- a/esp-wifi/examples/esp_now.rs +++ /dev/null @@ -1,100 +0,0 @@ -#![no_std] -#![no_main] - -#[cfg(feature = "esp32")] -use esp32_hal as hal; -#[cfg(feature = "esp32c2")] -use esp32c2_hal as hal; -#[cfg(feature = "esp32c3")] -use esp32c3_hal as hal; -#[cfg(feature = "esp32s2")] -use esp32s2_hal as hal; -#[cfg(feature = "esp32s3")] -use esp32s3_hal as hal; - -use esp_backtrace as _; -use esp_println::logger::init_logger; -use esp_println::println; -use esp_wifi::esp_now::{EspNow, PeerInfo, BROADCAST_ADDRESS}; -use esp_wifi::{current_millis, initialize}; -use hal::clock::{ClockControl, CpuClock}; -use hal::Rng; -use hal::{peripherals::Peripherals, prelude::*, Rtc}; - -#[cfg(any(feature = "esp32c3", feature = "esp32c2"))] -use hal::system::SystemExt; - -#[entry] -fn main() -> ! { - init_logger(log::LevelFilter::Info); - esp_wifi::init_heap(); - - let peripherals = Peripherals::take(); - - #[cfg(not(feature = "esp32"))] - let system = peripherals.SYSTEM.split(); - #[cfg(feature = "esp32")] - let system = peripherals.DPORT.split(); - - #[cfg(feature = "esp32c3")] - let clocks = ClockControl::configure(system.clock_control, CpuClock::Clock160MHz).freeze(); - #[cfg(feature = "esp32c2")] - let clocks = ClockControl::configure(system.clock_control, CpuClock::Clock120MHz).freeze(); - #[cfg(any(feature = "esp32", feature = "esp32s3", feature = "esp32s2"))] - let clocks = ClockControl::configure(system.clock_control, CpuClock::Clock240MHz).freeze(); - - let mut rtc = Rtc::new(peripherals.RTC_CNTL); - - // Disable watchdog timers - #[cfg(not(any(feature = "esp32", feature = "esp32s2")))] - rtc.swd.disable(); - - rtc.rwdt.disable(); - - #[cfg(any(feature = "esp32c3", feature = "esp32c2"))] - { - use hal::systimer::SystemTimer; - let syst = SystemTimer::new(peripherals.SYSTIMER); - initialize(syst.alarm0, Rng::new(peripherals.RNG), &clocks).unwrap(); - } - #[cfg(any(feature = "esp32", feature = "esp32s3", feature = "esp32s2"))] - { - use hal::timer::TimerGroup; - let timg1 = TimerGroup::new(peripherals.TIMG1, &clocks); - initialize(timg1.timer0, Rng::new(peripherals.RNG), &clocks).unwrap(); - } - - let radio = peripherals.RADIO.split(); - - let mut esp_now = EspNow::new(radio.0).unwrap(); - - println!("esp-now version {}", esp_now.get_version().unwrap()); - - let mut next_send_time = current_millis() + 5 * 1000; - loop { - let r = esp_now.receive(); - if let Some(r) = r { - println!("Received {:x?}", r); - - if r.info.dst_address == BROADCAST_ADDRESS { - if !esp_now.peer_exists(&r.info.src_address).unwrap() { - esp_now - .add_peer(PeerInfo { - peer_address: r.info.src_address, - lmk: None, - channel: None, - encrypt: false, - }) - .unwrap(); - } - esp_now.send(&r.info.src_address, b"Hello Peer").unwrap(); - } - } - - if current_millis() >= next_send_time { - next_send_time = current_millis() + 5 * 1000; - println!("Send"); - esp_now.send(&BROADCAST_ADDRESS, b"0123456789").unwrap(); - } - } -} diff --git a/examples-esp32/examples/embassy_access_point.rs b/examples-esp32/examples/embassy_access_point.rs index 675be947..629fd4de 100644 --- a/examples-esp32/examples/embassy_access_point.rs +++ b/examples-esp32/examples/embassy_access_point.rs @@ -85,7 +85,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -111,12 +111,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32/examples/embassy_dhcp.rs b/examples-esp32/examples/embassy_dhcp.rs index 36574613..8c32337f 100644 --- a/examples-esp32/examples/embassy_dhcp.rs +++ b/examples-esp32/examples/embassy_dhcp.rs @@ -83,7 +83,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -119,12 +119,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32/examples/embassy_esp_now.rs b/examples-esp32/examples/embassy_esp_now.rs index 27e41665..803b7c0e 100644 --- a/examples-esp32/examples/embassy_esp_now.rs +++ b/examples-esp32/examples/embassy_esp_now.rs @@ -22,7 +22,7 @@ use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc} use hal::system::SystemExt; #[embassy_executor::task] -async fn run(mut esp_now: EspNow) { +async fn run(mut esp_now: EspNow<'static>) { let mut ticker = Ticker::every(Duration::from_secs(5)); loop { let res = select(ticker.next(), async { diff --git a/examples-esp32c2/examples/embassy_access_point.rs b/examples-esp32c2/examples/embassy_access_point.rs index 675be947..629fd4de 100644 --- a/examples-esp32c2/examples/embassy_access_point.rs +++ b/examples-esp32c2/examples/embassy_access_point.rs @@ -85,7 +85,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -111,12 +111,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32c2/examples/embassy_dhcp.rs b/examples-esp32c2/examples/embassy_dhcp.rs index 36574613..8c32337f 100644 --- a/examples-esp32c2/examples/embassy_dhcp.rs +++ b/examples-esp32c2/examples/embassy_dhcp.rs @@ -83,7 +83,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -119,12 +119,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32c2/examples/embassy_esp_now.rs b/examples-esp32c2/examples/embassy_esp_now.rs index 27e41665..803b7c0e 100644 --- a/examples-esp32c2/examples/embassy_esp_now.rs +++ b/examples-esp32c2/examples/embassy_esp_now.rs @@ -22,7 +22,7 @@ use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc} use hal::system::SystemExt; #[embassy_executor::task] -async fn run(mut esp_now: EspNow) { +async fn run(mut esp_now: EspNow<'static>) { let mut ticker = Ticker::every(Duration::from_secs(5)); loop { let res = select(ticker.next(), async { diff --git a/examples-esp32c3/examples/embassy_access_point.rs b/examples-esp32c3/examples/embassy_access_point.rs index 675be947..629fd4de 100644 --- a/examples-esp32c3/examples/embassy_access_point.rs +++ b/examples-esp32c3/examples/embassy_access_point.rs @@ -85,7 +85,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -111,12 +111,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32c3/examples/embassy_dhcp.rs b/examples-esp32c3/examples/embassy_dhcp.rs index 36574613..8c32337f 100644 --- a/examples-esp32c3/examples/embassy_dhcp.rs +++ b/examples-esp32c3/examples/embassy_dhcp.rs @@ -83,7 +83,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -119,12 +119,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32c3/examples/embassy_esp_now.rs b/examples-esp32c3/examples/embassy_esp_now.rs index 27e41665..803b7c0e 100644 --- a/examples-esp32c3/examples/embassy_esp_now.rs +++ b/examples-esp32c3/examples/embassy_esp_now.rs @@ -22,7 +22,7 @@ use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc} use hal::system::SystemExt; #[embassy_executor::task] -async fn run(mut esp_now: EspNow) { +async fn run(mut esp_now: EspNow<'static>) { let mut ticker = Ticker::every(Duration::from_secs(5)); loop { let res = select(ticker.next(), async { diff --git a/examples-esp32c3/examples/esp_now.rs b/examples-esp32c3/examples/esp_now.rs index a20545b1..97f63cda 100644 --- a/examples-esp32c3/examples/esp_now.rs +++ b/examples-esp32c3/examples/esp_now.rs @@ -32,7 +32,7 @@ fn main() -> ! { .unwrap(); let (wifi, _) = peripherals.RADIO.split(); - let esp_now = esp_wifi::esp_now::EspNow::new(wifi).unwrap(); + let mut esp_now = esp_wifi::esp_now::EspNow::new(wifi).unwrap(); println!("esp-now version {}", esp_now.get_version().unwrap()); diff --git a/examples-esp32c6/examples/embassy_access_point.rs b/examples-esp32c6/examples/embassy_access_point.rs index 05b9ab19..572e3e08 100644 --- a/examples-esp32c6/examples/embassy_access_point.rs +++ b/examples-esp32c6/examples/embassy_access_point.rs @@ -85,7 +85,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -111,12 +111,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32c6/examples/embassy_dhcp.rs b/examples-esp32c6/examples/embassy_dhcp.rs index 1abb8704..bdda84bb 100644 --- a/examples-esp32c6/examples/embassy_dhcp.rs +++ b/examples-esp32c6/examples/embassy_dhcp.rs @@ -83,7 +83,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -119,12 +119,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32c6/examples/embassy_esp_now.rs b/examples-esp32c6/examples/embassy_esp_now.rs index 9e090e8b..26ce1560 100644 --- a/examples-esp32c6/examples/embassy_esp_now.rs +++ b/examples-esp32c6/examples/embassy_esp_now.rs @@ -22,7 +22,7 @@ use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc} use hal::system::SystemExt; #[embassy_executor::task] -async fn run(mut esp_now: EspNow) { +async fn run(mut esp_now: EspNow<'static>) { let mut ticker = Ticker::every(Duration::from_secs(5)); loop { let res = select(ticker.next(), async { diff --git a/examples-esp32s2/examples/embassy_access_point.rs b/examples-esp32s2/examples/embassy_access_point.rs index 1f8d35d8..51aaefb8 100644 --- a/examples-esp32s2/examples/embassy_access_point.rs +++ b/examples-esp32s2/examples/embassy_access_point.rs @@ -85,7 +85,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -111,12 +111,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32s2/examples/embassy_dhcp.rs b/examples-esp32s2/examples/embassy_dhcp.rs index 27747468..2808aed6 100644 --- a/examples-esp32s2/examples/embassy_dhcp.rs +++ b/examples-esp32s2/examples/embassy_dhcp.rs @@ -83,7 +83,7 @@ fn main() -> ! { } #[embassy_executor::task] -async fn connection(mut controller: WifiController) { +async fn connection(mut controller: WifiController<'static>) { println!("start connection task"); println!("Device capabilities: {:?}", controller.get_capabilities()); loop { @@ -119,12 +119,12 @@ async fn connection(mut controller: WifiController) { } #[embassy_executor::task] -async fn net_task(stack: &'static Stack) { +async fn net_task(stack: &'static Stack>) { stack.run().await } #[embassy_executor::task] -async fn task(stack: &'static Stack) { +async fn task(stack: &'static Stack>) { let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/examples-esp32s2/examples/embassy_esp_now.rs b/examples-esp32s2/examples/embassy_esp_now.rs index b0ec91cd..5197d2b7 100644 --- a/examples-esp32s2/examples/embassy_esp_now.rs +++ b/examples-esp32s2/examples/embassy_esp_now.rs @@ -22,7 +22,7 @@ use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc} use hal::system::SystemExt; #[embassy_executor::task] -async fn run(mut esp_now: EspNow) { +async fn run(mut esp_now: EspNow<'static>) { let mut ticker = Ticker::every(Duration::from_secs(5)); loop { let res = select(ticker.next(), async { diff --git a/examples-esp32s3/examples/ble.rs b/examples-esp32s3/examples/ble.rs index 8986ecef..50810491 100644 --- a/examples-esp32s3/examples/ble.rs +++ b/examples-esp32s3/examples/ble.rs @@ -46,8 +46,6 @@ fn main() -> ! { let mut debounce_cnt = 500; - let mut radio = peripherals.RADIO.split(); - loop { let connector = BleConnector::new(&mut bluetooth); let hci = HciConnector::new(connector, esp_wifi::current_millis);