remove the radio macros

esp-rs · Sep 7, 2023 · 2cd80a4 · 2cd80a4
1 parent 208857d
commit 2cd80a4
Show file tree

Hide file tree

Showing 56 changed files with 61 additions and 113 deletions.
diff --git a/examples-esp32/examples/access_point.rs b/examples-esp32/examples/access_point.rs
@@ -47,7 +47,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Ap, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32/examples/async_ble.rs b/examples-esp32/examples/async_ble.rs
@@ -156,7 +156,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let bluetooth = examples_util::get_bluetooth!(peripherals);
+    let (_, bluetooth, ..) = peripherals.RADIO.split();
 
     let timer_group0 = TimerGroup::new(
         peripherals.TIMG0,

diff --git a/examples-esp32/examples/ble.rs b/examples-esp32/examples/ble.rs
@@ -43,7 +43,7 @@ fn main() -> ! {
 
     let mut debounce_cnt = 500;
 
-    let mut bluetooth = examples_util::get_bluetooth!(peripherals);
+    let (_, mut bluetooth, ..) = peripherals.RADIO.split();
 
     loop {
         let connector = BleConnector::new(&init, &mut bluetooth);

diff --git a/examples-esp32/examples/coex.rs b/examples-esp32/examples/coex.rs
@@ -56,7 +56,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let (wifi, bluetooth) = examples_util::get_wifi_bluetooth!(peripherals);
+    let (wifi, bluetooth, ..) = peripherals.RADIO.split();
 
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =

diff --git a/examples-esp32/examples/dhcp.rs b/examples-esp32/examples/dhcp.rs
@@ -48,7 +48,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32/examples/embassy_access_point.rs b/examples-esp32/examples/embassy_access_point.rs
@@ -59,7 +59,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Ap).unwrap();
 

diff --git a/examples-esp32/examples/embassy_dhcp.rs b/examples-esp32/examples/embassy_dhcp.rs
@@ -60,7 +60,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Sta).unwrap();
 

diff --git a/examples-esp32/examples/embassy_esp_now.rs b/examples-esp32/examples/embassy_esp_now.rs
@@ -81,7 +81,7 @@ 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());
 

diff --git a/examples-esp32/examples/esp_now.rs b/examples-esp32/examples/esp_now.rs
@@ -35,8 +35,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
-    let mut esp_now = esp_wifi::esp_now::EspNow::new(&init, wifi).unwrap();
+    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());
 

diff --git a/examples-esp32/examples/static_ip.rs b/examples-esp32/examples/static_ip.rs
@@ -50,7 +50,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c2/examples/access_point.rs b/examples-esp32c2/examples/access_point.rs
@@ -42,7 +42,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Ap, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c2/examples/async_ble.rs b/examples-esp32c2/examples/async_ble.rs
@@ -151,7 +151,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let bluetooth = examples_util::get_bluetooth!(peripherals);
+    let (_, bluetooth, ..) = peripherals.RADIO.split();
 
     let timer_group0 = TimerGroup::new(
         peripherals.TIMG0,

diff --git a/examples-esp32c2/examples/ble.rs b/examples-esp32c2/examples/ble.rs
@@ -38,7 +38,7 @@ fn main() -> ! {
 
     let mut debounce_cnt = 500;
 
-    let mut bluetooth = examples_util::get_bluetooth!(peripherals);
+    let (_, mut bluetooth, ..) = peripherals.RADIO.split();
 
     loop {
         let connector = BleConnector::new(&init, &mut bluetooth);

diff --git a/examples-esp32c2/examples/dhcp.rs b/examples-esp32c2/examples/dhcp.rs
@@ -44,7 +44,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c2/examples/embassy_access_point.rs b/examples-esp32c2/examples/embassy_access_point.rs
@@ -55,7 +55,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Ap).unwrap();
 

diff --git a/examples-esp32c2/examples/embassy_dhcp.rs b/examples-esp32c2/examples/embassy_dhcp.rs
@@ -56,7 +56,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Sta).unwrap();
 

diff --git a/examples-esp32c2/examples/embassy_esp_now.rs b/examples-esp32c2/examples/embassy_esp_now.rs
@@ -77,7 +77,7 @@ 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());
 

diff --git a/examples-esp32c2/examples/esp_now.rs b/examples-esp32c2/examples/esp_now.rs
@@ -31,8 +31,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
-    let mut esp_now = esp_wifi::esp_now::EspNow::new(&init, wifi).unwrap();
+    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());
 

diff --git a/examples-esp32c2/examples/static_ip.rs b/examples-esp32c2/examples/static_ip.rs
@@ -46,7 +46,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c3/examples/access_point.rs b/examples-esp32c3/examples/access_point.rs
@@ -43,7 +43,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Ap, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c3/examples/async_ble.rs b/examples-esp32c3/examples/async_ble.rs
@@ -151,7 +151,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let bluetooth = examples_util::get_bluetooth!(peripherals);
+    let (_, bluetooth, ..) = peripherals.RADIO.split();
 
     let timer_group0 = TimerGroup::new(
         peripherals.TIMG0,

diff --git a/examples-esp32c3/examples/ble.rs b/examples-esp32c3/examples/ble.rs
@@ -38,7 +38,7 @@ fn main() -> ! {
 
     let mut debounce_cnt = 500;
 
-    let mut bluetooth = examples_util::get_bluetooth!(peripherals);
+    let (_, mut bluetooth, ..) = peripherals.RADIO.split();
 
     loop {
         let connector = BleConnector::new(&init, &mut bluetooth);

diff --git a/examples-esp32c3/examples/coex.rs b/examples-esp32c3/examples/coex.rs
@@ -51,7 +51,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let (wifi, bluetooth) = examples_util::get_wifi_bluetooth!(peripherals);
+    let (wifi, bluetooth, ..) = peripherals.RADIO.split();
 
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =

diff --git a/examples-esp32c3/examples/dhcp.rs b/examples-esp32c3/examples/dhcp.rs
@@ -44,7 +44,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c3/examples/embassy_access_point.rs b/examples-esp32c3/examples/embassy_access_point.rs
@@ -55,7 +55,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Ap).unwrap();
 

diff --git a/examples-esp32c3/examples/embassy_dhcp.rs b/examples-esp32c3/examples/embassy_dhcp.rs
@@ -56,7 +56,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Sta).unwrap();
 

diff --git a/examples-esp32c3/examples/embassy_esp_now.rs b/examples-esp32c3/examples/embassy_esp_now.rs
@@ -77,7 +77,7 @@ 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());
 

diff --git a/examples-esp32c3/examples/esp_now.rs b/examples-esp32c3/examples/esp_now.rs
@@ -31,8 +31,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
-    let mut esp_now = esp_wifi::esp_now::EspNow::new(&init, wifi).unwrap();
+    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());
 

diff --git a/examples-esp32c3/examples/static_ip.rs b/examples-esp32c3/examples/static_ip.rs
@@ -46,7 +46,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c6/examples/access_point.rs b/examples-esp32c6/examples/access_point.rs
@@ -43,7 +43,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Ap, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c6/examples/async_ble.rs b/examples-esp32c6/examples/async_ble.rs
@@ -151,7 +151,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let bluetooth = examples_util::get_bluetooth!(peripherals);
+    let (_, bluetooth, ..) = peripherals.RADIO.split();
 
     let timer_group0 = TimerGroup::new(
         peripherals.TIMG0,

diff --git a/examples-esp32c6/examples/ble.rs b/examples-esp32c6/examples/ble.rs
@@ -38,7 +38,7 @@ fn main() -> ! {
 
     let mut debounce_cnt = 500;
 
-    let mut bluetooth = examples_util::get_bluetooth!(peripherals);
+    let (_, mut bluetooth, ..) = peripherals.RADIO.split();
 
     loop {
         let connector = BleConnector::new(&init, &mut bluetooth);

diff --git a/examples-esp32c6/examples/dhcp.rs b/examples-esp32c6/examples/dhcp.rs
@@ -44,7 +44,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32c6/examples/embassy_access_point.rs b/examples-esp32c6/examples/embassy_access_point.rs
@@ -55,7 +55,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Ap).unwrap();
 

diff --git a/examples-esp32c6/examples/embassy_dhcp.rs b/examples-esp32c6/examples/embassy_dhcp.rs
@@ -56,7 +56,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Sta).unwrap();
 

diff --git a/examples-esp32c6/examples/embassy_esp_now.rs b/examples-esp32c6/examples/embassy_esp_now.rs
@@ -77,7 +77,7 @@ 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());
 

diff --git a/examples-esp32c6/examples/esp_now.rs b/examples-esp32c6/examples/esp_now.rs
@@ -31,8 +31,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
-    let mut esp_now = esp_wifi::esp_now::EspNow::new(&init, wifi).unwrap();
+    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());
 

diff --git a/examples-esp32c6/examples/static_ip.rs b/examples-esp32c6/examples/static_ip.rs
@@ -46,7 +46,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let (wifi, ..) = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32s2/examples/access_point.rs b/examples-esp32s2/examples/access_point.rs
@@ -48,7 +48,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let wifi = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Ap, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32s2/examples/dhcp.rs b/examples-esp32s2/examples/dhcp.rs
@@ -49,7 +49,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let wifi = peripherals.RADIO.split();
     let mut socket_set_entries: [SocketStorage; 3] = Default::default();
     let (iface, device, mut controller, sockets) =
         create_network_interface(&init, wifi, WifiMode::Sta, &mut socket_set_entries).unwrap();

diff --git a/examples-esp32s2/examples/embassy_access_point.rs b/examples-esp32s2/examples/embassy_access_point.rs
@@ -60,7 +60,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let wifi = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Ap).unwrap();
 

diff --git a/examples-esp32s2/examples/embassy_dhcp.rs b/examples-esp32s2/examples/embassy_dhcp.rs
@@ -61,7 +61,7 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let wifi = examples_util::get_wifi!(peripherals);
+    let wifi = peripherals.RADIO.split();
     let (wifi_interface, controller) =
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiMode::Sta).unwrap();
 

diff --git a/examples-esp32s2/examples/embassy_esp_now.rs b/examples-esp32s2/examples/embassy_esp_now.rs
@@ -82,7 +82,7 @@ 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());