Make utils a single file module for remaining util items

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

Hide file tree

Showing 64 changed files with 131 additions and 50 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,6 @@ members = [
     "esp-wifi",
     "esp-wifi-sys",
     "xtask",
-    "examples-util",
     "examples-esp32c2",
     "examples-esp32c3",
     "examples-esp32c6",

diff --git a/examples-esp32/Cargo.toml b/examples-esp32/Cargo.toml
@@ -20,7 +20,6 @@ embassy-net = { workspace = true, optional = true }
 embassy-sync.workspace = true
 
 esp32-hal.workspace = true
-examples-util = { path = "../examples-util", features = ["esp32"] }
 esp-backtrace = { workspace = true, features = ["esp32"] }
 esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32", "utils"] }
 embedded-hal-async = { workspace = true, optional = true }

diff --git a/examples-esp32/examples/access_point.rs b/examples-esp32/examples/access_point.rs
@@ -3,6 +3,8 @@
 #![feature(c_variadic)]
 #![feature(const_mut_refs)]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32/examples/async_ble.rs b/examples-esp32/examples/async_ble.rs
@@ -22,6 +22,8 @@ use esp_println::println;
 use esp_wifi::{
     ble::controller::asynch::BleConnector, initialize, EspWifiInitFor, EspWifiInitialization,
 };
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use examples_util::BootButton;
 use hal::{
@@ -147,7 +149,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let button = examples_util::boot_button!(peripherals);
+    let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
+    let button = io.pins.gpio0.into_pull_down_input();
 
     // Async requires the GPIO interrupt to wake futures
     hal::interrupt::enable(

diff --git a/examples-esp32/examples/ble.rs b/examples-esp32/examples/ble.rs
@@ -11,6 +11,8 @@ use bleps::{
 use esp_backtrace as _;
 use esp_println::println;
 use esp_wifi::{ble::controller::BleConnector, initialize, EspWifiInitFor};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use hal::{clock::ClockControl, peripherals::*, prelude::*, Rng, IO};
 
@@ -39,7 +41,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let button = examples_util::boot_button!(peripherals);
+    let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
+    let button = io.pins.gpio0.into_pull_down_input();
 
     let mut debounce_cnt = 500;
 

diff --git a/examples-esp32/examples/coex.rs b/examples-esp32/examples/coex.rs
@@ -1,6 +1,8 @@
 #![no_std]
 #![no_main]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use bleps::{

diff --git a/examples-esp32/examples/dhcp.rs b/examples-esp32/examples/dhcp.rs
@@ -1,6 +1,8 @@
 #![no_std]
 #![no_main]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32/examples/embassy_access_point.rs b/examples-esp32/examples/embassy_access_point.rs
@@ -10,6 +10,8 @@ use embassy_net::ConfigV4;
 use embassy_net::{
     Config, IpListenEndpoint, Ipv4Address, Ipv4Cidr, Stack, StackResources, StaticConfigV4,
 };
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32/examples/embassy_dhcp.rs b/examples-esp32/examples/embassy_dhcp.rs
@@ -5,6 +5,8 @@
 use embassy_executor::_export::StaticCell;
 use embassy_net::tcp::TcpSocket;
 use embassy_net::{Config, Ipv4Address, Stack, StackResources};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32/examples/embassy_esp_now.rs b/examples-esp32/examples/embassy_esp_now.rs
@@ -4,6 +4,8 @@
 
 use embassy_executor::_export::StaticCell;
 use embassy_futures::select::{select, Either};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32/examples/esp_now.rs b/examples-esp32/examples/esp_now.rs
@@ -5,6 +5,8 @@ use esp_backtrace as _;
 use esp_println::println;
 use esp_wifi::esp_now::{PeerInfo, BROADCAST_ADDRESS};
 use esp_wifi::{current_millis, initialize, EspWifiInitFor};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use hal::clock::ClockControl;
 use hal::Rng;

diff --git a/examples-esp32/examples/static_ip.rs b/examples-esp32/examples/static_ip.rs
@@ -1,6 +1,8 @@
 #![no_std]
 #![no_main]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32c2/Cargo.toml b/examples-esp32c2/Cargo.toml
@@ -20,7 +20,6 @@ embassy-net = { workspace = true, optional = true }
 embassy-sync.workspace = true
 
 esp32c2-hal.workspace = true
-examples-util = { path = "../examples-util", features = ["esp32c2"] }
 esp-backtrace = { workspace = true, features = ["esp32c2"] }
 esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32c2", "utils"] }
 embedded-hal-async = { workspace = true, optional = true }

diff --git a/examples-esp32c2/examples/access_point.rs b/examples-esp32c2/examples/access_point.rs
@@ -3,6 +3,8 @@
 #![feature(c_variadic)]
 #![feature(const_mut_refs)]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32c2/examples/async_ble.rs b/examples-esp32c2/examples/async_ble.rs
@@ -22,6 +22,8 @@ use esp_println::println;
 use esp_wifi::{
     ble::controller::asynch::BleConnector, initialize, EspWifiInitFor, EspWifiInitialization,
 };
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use examples_util::BootButton;
 use hal::{
@@ -142,7 +144,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let button = examples_util::boot_button!(peripherals);
+    let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
+    let button = io.pins.gpio9.into_pull_down_input();
 
     // Async requires the GPIO interrupt to wake futures
     hal::interrupt::enable(

diff --git a/examples-esp32c2/examples/ble.rs b/examples-esp32c2/examples/ble.rs
@@ -11,6 +11,8 @@ use bleps::{
 use esp_backtrace as _;
 use esp_println::println;
 use esp_wifi::{ble::controller::BleConnector, initialize, EspWifiInitFor};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use hal::{clock::ClockControl, peripherals::*, prelude::*, systimer::SystemTimer, Rng, IO};
 
@@ -34,7 +36,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let button = examples_util::boot_button!(peripherals);
+    let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
+    let button = io.pins.gpio9.into_pull_down_input();
 
     let mut debounce_cnt = 500;
 

diff --git a/examples-esp32c2/examples/dhcp.rs b/examples-esp32c2/examples/dhcp.rs
@@ -1,6 +1,8 @@
 #![no_std]
 #![no_main]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32c2/examples/embassy_access_point.rs b/examples-esp32c2/examples/embassy_access_point.rs
@@ -10,6 +10,8 @@ use embassy_net::ConfigV4;
 use embassy_net::{
     Config, IpListenEndpoint, Ipv4Address, Ipv4Cidr, Stack, StackResources, StaticConfigV4,
 };
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32c2/examples/embassy_dhcp.rs b/examples-esp32c2/examples/embassy_dhcp.rs
@@ -5,6 +5,8 @@
 use embassy_executor::_export::StaticCell;
 use embassy_net::tcp::TcpSocket;
 use embassy_net::{Config, Ipv4Address, Stack, StackResources};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32c2/examples/embassy_esp_now.rs b/examples-esp32c2/examples/embassy_esp_now.rs
@@ -4,6 +4,8 @@
 
 use embassy_executor::_export::StaticCell;
 use embassy_futures::select::{select, Either};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32c2/examples/esp_now.rs b/examples-esp32c2/examples/esp_now.rs
@@ -6,6 +6,8 @@ use esp_backtrace as _;
 use esp_println::println;
 use esp_wifi::esp_now::{PeerInfo, BROADCAST_ADDRESS};
 use esp_wifi::{current_millis, initialize, EspWifiInitFor};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use hal::clock::ClockControl;
 use hal::{peripherals::Peripherals, prelude::*};

diff --git a/examples-esp32c2/examples/static_ip.rs b/examples-esp32c2/examples/static_ip.rs
@@ -1,6 +1,8 @@
 #![no_std]
 #![no_main]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32c3/Cargo.toml b/examples-esp32c3/Cargo.toml
@@ -20,7 +20,6 @@ embassy-net = { workspace = true, optional = true }
 embassy-sync.workspace = true
 
 esp32c3-hal.workspace = true
-examples-util = { path = "../examples-util", features = ["esp32c3"] }
 esp-backtrace = { workspace = true, features = ["esp32c3"] }
 esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32c3", "utils"] }
 embedded-hal-async = { workspace = true, optional = true }

diff --git a/examples-esp32c3/examples/access_point.rs b/examples-esp32c3/examples/access_point.rs
@@ -3,6 +3,8 @@
 #![feature(c_variadic)]
 #![feature(const_mut_refs)]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32c3/examples/async_ble.rs b/examples-esp32c3/examples/async_ble.rs
@@ -22,6 +22,8 @@ use esp_println::println;
 use esp_wifi::{
     ble::controller::asynch::BleConnector, initialize, EspWifiInitFor, EspWifiInitialization,
 };
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use examples_util::BootButton;
 use hal::{
@@ -142,7 +144,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let button = examples_util::boot_button!(peripherals);
+    let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
+    let button = io.pins.gpio9.into_pull_down_input();
 
     // Async requires the GPIO interrupt to wake futures
     hal::interrupt::enable(

diff --git a/examples-esp32c3/examples/ble.rs b/examples-esp32c3/examples/ble.rs
@@ -11,6 +11,8 @@ use bleps::{
 use esp_backtrace as _;
 use esp_println::println;
 use esp_wifi::{ble::controller::BleConnector, initialize, EspWifiInitFor};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use hal::{clock::ClockControl, peripherals::*, prelude::*, systimer::SystemTimer, Rng, IO};
 
@@ -34,7 +36,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let button = examples_util::boot_button!(peripherals);
+    let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
+    let button = io.pins.gpio9.into_pull_down_input();
 
     let mut debounce_cnt = 500;
 

diff --git a/examples-esp32c3/examples/coex.rs b/examples-esp32c3/examples/coex.rs
@@ -1,6 +1,8 @@
 #![no_std]
 #![no_main]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use bleps::{

diff --git a/examples-esp32c3/examples/dhcp.rs b/examples-esp32c3/examples/dhcp.rs
@@ -1,6 +1,8 @@
 #![no_std]
 #![no_main]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32c3/examples/embassy_access_point.rs b/examples-esp32c3/examples/embassy_access_point.rs
@@ -10,6 +10,8 @@ use embassy_net::ConfigV4;
 use embassy_net::{
     Config, IpListenEndpoint, Ipv4Address, Ipv4Cidr, Stack, StackResources, StaticConfigV4,
 };
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32c3/examples/embassy_dhcp.rs b/examples-esp32c3/examples/embassy_dhcp.rs
@@ -5,6 +5,8 @@
 use embassy_executor::_export::StaticCell;
 use embassy_net::tcp::TcpSocket;
 use embassy_net::{Config, Ipv4Address, Stack, StackResources};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32c3/examples/embassy_esp_now.rs b/examples-esp32c3/examples/embassy_esp_now.rs
@@ -4,6 +4,8 @@
 
 use embassy_executor::_export::StaticCell;
 use embassy_futures::select::{select, Either};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embassy_executor::Executor;

diff --git a/examples-esp32c3/examples/esp_now.rs b/examples-esp32c3/examples/esp_now.rs
@@ -6,6 +6,8 @@ use esp_backtrace as _;
 use esp_println::println;
 use esp_wifi::esp_now::{PeerInfo, BROADCAST_ADDRESS};
 use esp_wifi::{current_millis, initialize, EspWifiInitFor};
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use hal::clock::ClockControl;
 use hal::{peripherals::Peripherals, prelude::*};

diff --git a/examples-esp32c3/examples/static_ip.rs b/examples-esp32c3/examples/static_ip.rs
@@ -1,6 +1,8 @@
 #![no_std]
 #![no_main]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32c6/Cargo.toml b/examples-esp32c6/Cargo.toml
@@ -20,7 +20,6 @@ embassy-net = { workspace = true, optional = true }
 embassy-sync.workspace = true
 
 esp32c6-hal.workspace = true
-examples-util = { path = "../examples-util", features = ["esp32c6"] }
 esp-backtrace = { workspace = true, features = ["esp32c6"] }
 esp-wifi = { path = "../esp-wifi", default-features = false, features = ["esp32c6", "utils"] }
 

diff --git a/examples-esp32c6/examples/access_point.rs b/examples-esp32c6/examples/access_point.rs
@@ -3,6 +3,8 @@
 #![feature(c_variadic)]
 #![feature(const_mut_refs)]
 
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 
 use embedded_io::blocking::*;

diff --git a/examples-esp32c6/examples/async_ble.rs b/examples-esp32c6/examples/async_ble.rs
@@ -22,6 +22,8 @@ use esp_println::println;
 use esp_wifi::{
     ble::controller::asynch::BleConnector, initialize, EspWifiInitFor, EspWifiInitialization,
 };
+#[path = "../../examples-util/util.rs"]
+mod examples_util;
 use examples_util::hal;
 use examples_util::BootButton;
 use hal::{
@@ -142,7 +144,8 @@ fn main() -> ! {
     )
     .unwrap();
 
-    let button = examples_util::boot_button!(peripherals);
+    let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
+    let button = io.pins.gpio9.into_pull_down_input();
 
     // Async requires the GPIO interrupt to wake futures
     hal::interrupt::enable(