Wifi device refactor

Cargo.toml

@@ -32,6 +32,8 @@ linked_list_allocator = { version = "0.10.3", default-features = false, features
 embedded-io = "0.3.1"
 fugit = "0.3.6"
 heapless = { version = "0.7.14", default-features = false }
+num-derive = { version = "0.3", features = ["full-syntax"] }
+num-traits = { version = "0.2", default-features = false }
 
 [build-dependencies]
 riscv-target = { version = "0.1.2", optional = true }

examples/coex.rs

@@ -27,8 +27,7 @@ use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wi
 use esp_backtrace as _;
 use esp_println::{logger::init_logger, print, println};
 use esp_wifi::initialize;
-use esp_wifi::wifi::utils::create_network_interface;
-use esp_wifi::wifi_interface::WifiError;
+use esp_wifi::wifi::{WifiError, utils::create_network_interface};
 use esp_wifi::{create_network_stack_storage, network_stack_storage};
 use hal::{
     clock::{ClockControl, CpuClock},

examples/dhcp.rs

@@ -21,8 +21,8 @@ use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wi
 use esp_backtrace as _;
 use esp_println::logger::init_logger;
 use esp_println::{print, println};
-use esp_wifi::wifi::utils::create_network_interface;
-use esp_wifi::wifi_interface::{Network, WifiError};
+use esp_wifi::wifi::{WifiError, utils::create_network_interface};
+use esp_wifi::wifi_interface::Network;
 use esp_wifi::{create_network_stack_storage, network_stack_storage};
 use esp_wifi::{current_millis, initialize};
 use hal::clock::{ClockControl, CpuClock};

examples/static_ip.rs

@@ -21,8 +21,8 @@ use embedded_svc::wifi::{AccessPointInfo, ClientConfiguration, Configuration, Wi
 use esp_backtrace as _;
 use esp_println::logger::init_logger;
 use esp_println::{print, println};
-use esp_wifi::wifi::utils::create_network_interface;
-use esp_wifi::wifi_interface::{Network, WifiError};
+use esp_wifi::wifi::{WifiError, utils::create_network_interface};
+use esp_wifi::wifi_interface::Network;
 use esp_wifi::{create_network_stack_storage, network_stack_storage};
 use esp_wifi::{current_millis, initialize};
 use hal::clock::{ClockControl, CpuClock};

src/lib.rs

@@ -27,6 +27,8 @@ use hal::*;
 use fugit::MegahertzU32;
 use hal::clock::Clocks;
 use linked_list_allocator::Heap;
+#[cfg(feature = "wifi")]
+use wifi::WifiError;
 
 use crate::common_adapter::init_rng;
 use crate::tasks::init_tasks;
@@ -135,14 +137,8 @@ pub fn initialize(
     {
         log::debug!("wifi init");
         // wifi init
-        let res = crate::wifi::wifi_init();
-        if res != 0 {
-            return Err(InitializationError::General(res));
-        }
-        let res = crate::wifi::wifi_start();
-        if res != 0 {
-            return Err(InitializationError::General(res));
-        }
+        crate::wifi::wifi_init()?;
+        crate::wifi::wifi_start()?;
     }
 
     #[cfg(feature = "ble")]
@@ -160,9 +156,18 @@ pub fn initialize(
 #[derive(Debug, Clone, Copy)]
 pub enum InitializationError {
     General(i32),
+    #[cfg(feature = "wifi")]
+    WifiError(WifiError),
     WrongClockConfig,
 }
 
+#[cfg(feature = "wifi")]
+impl From<WifiError> for InitializationError {
+    fn from(value: WifiError) -> Self {
+        InitializationError::WifiError(value)
+    }
+}
+
 #[cfg(any(feature = "esp32", feature = "esp32s3", feature = "esp32s2"))]
 /// Initialize for using WiFi / BLE
 /// This will initialize internals and also initialize WiFi and BLE
@@ -206,14 +211,8 @@ pub fn initialize(
     #[cfg(feature = "wifi")]
     {
         log::debug!("wifi init");
-        let res = crate::wifi::wifi_init();
-        if res != 0 {
-            return Err(InitializationError::General(res));
-        }
-        let res = crate::wifi::wifi_start();
-        if res != 0 {
-            return Err(InitializationError::General(res));
-        }
+        crate::wifi::wifi_init()?;
+        crate::wifi::wifi_start()?;
     }
 
     #[cfg(feature = "ble")]