Remove redundant example, update esp-now examples

.github/workflows/ci.yml

@@ -69,10 +69,8 @@ jobs:
         run: cd examples-${{ matrix.chip }} && cargo build --release --example=esp_now --features=esp-now
       - name: check (embassy_esp_now)
         run: cd examples-${{ matrix.chip }} && cargo build --release --example=embassy_esp_now --features=async,esp-now
-      - name: check (esp_now_duplex)
-        run: cd examples-${{ matrix.chip }} && cargo build --release --example=esp_now_duplex --features=async,esp-now
-      - name: check (esp_now_async_duplex)
-        run: cd examples-${{ matrix.chip }} && cargo build --release --example=esp_now_async_duplex --features=async,esp-now
+      - name: check (embassy_esp_now_duplex)
+        run: cd examples-${{ matrix.chip }} && cargo build --release --example=embassy_esp_now_duplex --features=async,esp-now
       - name: check (embassy_dhcp)
         run: cd examples-${{ matrix.chip }} && cargo build --release --example=embassy_dhcp --features=async,wifi,embassy-net
       - name: check (embassy_access_point)
@@ -123,10 +121,8 @@ jobs:
         run: cd examples-${{ matrix.chip }} && cargo +nightly-2023-05-16 build --release --example=esp_now --features=esp-now
       - name: check (embassy_esp_now)
         run: cd examples-${{ matrix.chip }} && cargo +nightly-2023-05-16 build --release --example=embassy_esp_now --features=async,esp-now
-      - name: check (esp_now_duplex)
-        run: cd examples-${{ matrix.chip }} && cargo +nightly-2023-05-16 build --release --example=esp_now_duplex --features=async,esp-now
-      - name: check (esp_now_async_duplex)
-        run: cd examples-${{ matrix.chip }} && cargo +nightly-2023-05-16 build --release --example=esp_now_async_duplex --features=async,esp-now
+      - name: check (embassy_esp_now_duplex)
+        run: cd examples-${{ matrix.chip }} && cargo +nightly-2023-05-16 build --release --example=embassy_esp_now_duplex --features=async,esp-now
       - name: check (embassy_dhcp)
         run: cd examples-${{ matrix.chip }} && cargo +nightly-2023-05-16 build --release --example=embassy_dhcp --features=async,wifi,embassy-net
       - name: check (embassy_access_point)

README.md

@@ -207,17 +207,11 @@ To build these ensure you are in the `examples-esp32XXX` directory matching your
 
 `cargo run --example embassy_esp_now --release --features "async,esp-now"`        
 
-### esp_now_duplex
-
-- broadcasts, sends and asynchronously receives messages via esp-now in multiple embassy tasks
-
-`cargo run --example esp_now_duplex --release --features "async,esp-now"` 
-
-### esp_now_async_duplex
+### embassy_esp_now_duplex
 
 - asynchronously broadcasts, receives and sends messages via esp-now in multiple embassy tasks
 
-`cargo run --example esp_now_async_duplex --release --features "async,esp-now"` 
+`cargo run --example embassy_esp_now_duplex --release --features "async,esp-now"` 
 
 ### embassy_dhcp
 

examples-esp32/examples/embassy_dhcp.rs

@@ -20,9 +20,6 @@ use hal::clock::ClockControl;
 use hal::Rng;
 use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup};
 
-#[cfg(any(feature = "esp32c3", feature = "esp32c2", feature = "esp32c6"))]
-use hal::system::SystemExt;
-
 const SSID: &str = env!("SSID");
 const PASSWORD: &str = env!("PASSWORD");
 

examples-esp32/examples/embassy_esp_now.rs

@@ -18,9 +18,6 @@ use hal::clock::ClockControl;
 use hal::Rng;
 use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup};
 
-#[cfg(any(feature = "esp32c3", feature = "esp32c2", feature = "esp32c6"))]
-use hal::system::SystemExt;
-
 #[embassy_executor::task]
 async fn run(mut esp_now: EspNow<'static>) {
     let mut ticker = Ticker::every(Duration::from_secs(5));

examples-esp32/examples/esp_now_async_duplex.rs → examples-esp32/examples/embassy_esp_now_duplex.rs

@@ -5,6 +5,8 @@
 use embassy_executor::_export::StaticCell;
 use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_sync::mutex::Mutex;
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;
@@ -14,12 +16,9 @@ use esp_backtrace as _;
 use esp_println::println;
 use esp_wifi::esp_now::{EspNowManager, EspNowReceiver, EspNowSender, PeerInfo, BROADCAST_ADDRESS};
 use esp_wifi::{initialize, EspWifiInitFor};
-use hal::clock::{ClockControl, CpuClock};
+use hal::clock::ClockControl;
 use hal::Rng;
-use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc};
-
-#[cfg(any(feature = "esp32c3", feature = "esp32c2", feature = "esp32c6"))]
-use hal::system::SystemExt;
+use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup};
 
 #[embassy_executor::task]
 async fn broadcaster(sender: &'static Mutex<NoopRawMutex, EspNowSender<'static>>) {
@@ -92,12 +91,15 @@ fn main() -> ! {
 
     let peripherals = Peripherals::take();
 
-    let system = examples_util::system!(peripherals);
-    let mut peripheral_clock_control = system.peripheral_clock_control;
-    let clocks = examples_util::clocks!(system);
-    examples_util::rtc!(peripherals);
+    let mut system = peripherals.DPORT.split();
+    let clocks = ClockControl::max(system.clock_control).freeze();
 
-    let timer = examples_util::timer!(peripherals, clocks, peripheral_clock_control);
+    let timer = hal::timer::TimerGroup::new(
+        peripherals.TIMG1,
+        &clocks,
+        &mut system.peripheral_clock_control,
+    )
+    .timer0;
     let init = initialize(
         EspWifiInitFor::Wifi,
         timer,
@@ -107,11 +109,15 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let esp_now = esp_wifi::esp_now::EspNow::new(&init, wifi).unwrap();
     println!("esp-now version {}", esp_now.get_version().unwrap());
 
-    let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks, &mut peripheral_clock_control);
+    let timer_group0 = TimerGroup::new(
+        peripherals.TIMG0,
+        &clocks,
+        &mut system.peripheral_clock_control,
+    );
     embassy::init(&clocks, timer_group0.timer0);
     let executor = EXECUTOR.init(Executor::new());
 

examples-esp32c2/examples/embassy_dhcp.rs

@@ -21,9 +21,6 @@ use hal::clock::ClockControl;
 use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup};
 use hal::{systimer::SystemTimer, Rng};
 
-#[cfg(any(feature = "esp32c3", feature = "esp32c2", feature = "esp32c6"))]
-use hal::system::SystemExt;
-
 const SSID: &str = env!("SSID");
 const PASSWORD: &str = env!("PASSWORD");
 

examples-esp32c2/examples/embassy_esp_now.rs

@@ -19,9 +19,6 @@ use hal::clock::ClockControl;
 use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup};
 use hal::{systimer::SystemTimer, Rng};
 
-#[cfg(any(feature = "esp32c3", feature = "esp32c2", feature = "esp32c6"))]
-use hal::system::SystemExt;
-
 #[embassy_executor::task]
 async fn run(mut esp_now: EspNow<'static>) {
     let mut ticker = Ticker::every(Duration::from_secs(5));

examples-esp32c6/examples/esp_now_async_duplex.rs → examples-esp32c2/examples/embassy_esp_now_duplex.rs

@@ -5,6 +5,8 @@
 use embassy_executor::_export::StaticCell;
 use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_sync::mutex::Mutex;
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;
@@ -14,12 +16,11 @@ use esp_backtrace as _;
 use esp_println::println;
 use esp_wifi::esp_now::{EspNowManager, EspNowReceiver, EspNowSender, PeerInfo, BROADCAST_ADDRESS};
 use esp_wifi::{initialize, EspWifiInitFor};
-use hal::clock::{ClockControl, CpuClock};
+use hal::clock::ClockControl;
 use hal::Rng;
-use hal::{embassy, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc};
-
-#[cfg(any(feature = "esp32c3", feature = "esp32c2", feature = "esp32c6"))]
-use hal::system::SystemExt;
+use hal::{
+    embassy, peripherals::Peripherals, prelude::*, systimer::SystemTimer, timer::TimerGroup,
+};
 
 #[embassy_executor::task]
 async fn broadcaster(sender: &'static Mutex<NoopRawMutex, EspNowSender<'static>>) {
@@ -92,12 +93,10 @@ fn main() -> ! {
 
     let peripherals = Peripherals::take();
 
-    let system = examples_util::system!(peripherals);
-    let mut peripheral_clock_control = system.peripheral_clock_control;
-    let clocks = examples_util::clocks!(system);
-    examples_util::rtc!(peripherals);
+    let mut system = peripherals.SYSTEM.split();
+    let clocks = ClockControl::max(system.clock_control).freeze();
 
-    let timer = examples_util::timer!(peripherals, clocks, peripheral_clock_control);
+    let timer = SystemTimer::new(peripherals.SYSTIMER).alarm0;
     let init = initialize(
         EspWifiInitFor::Wifi,
         timer,
@@ -107,11 +106,15 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let esp_now = esp_wifi::esp_now::EspNow::new(&init, wifi).unwrap();
     println!("esp-now version {}", esp_now.get_version().unwrap());
 
-    let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks, &mut peripheral_clock_control);
+    let timer_group0 = TimerGroup::new(
+        peripherals.TIMG0,
+        &clocks,
+        &mut system.peripheral_clock_control,
+    );
     embassy::init(&clocks, timer_group0.timer0);
     let executor = EXECUTOR.init(Executor::new());