Merge pull request #73 from AnthonyGrondin/feat/update-esp-hal

Update esp-hal to 1.0.0-beta.0, esp-wifi to 0.13.0

Author: bugadani

Cargo.toml

@@ -24,14 +24,14 @@ opt-level = "z"
 opt-level = 3
 
 [dependencies]
-esp-hal = { version = "0.23.0", optional = true }
-esp-backtrace = { version = "0.15.0", optional = true, features = [
+esp-hal = { version = "1.0.0-beta.0", optional = true }
+esp-backtrace = { version = "0.15.1", optional = true, features = [
     "panic-handler",
     "println",
     "exception-handler",
 ] }
-esp-println = { version = "0.13.0", optional = true, features = ["log"] }
-esp-hal-embassy = { version = "0.6.0", optional = true }
+esp-println = { version = "0.13.1", optional = true, features = ["log"] }
+esp-hal-embassy = { version = "0.7.0", optional = true }
 
 embassy-time = { version = "0.4.0", optional = true }
 embassy-executor = { version = "0.7", package = "embassy-executor", features = [
@@ -44,9 +44,8 @@ embassy-net = { version = "0.6.0", features = [
     "medium-ethernet",
 ], optional = true }
 
-esp-wifi = { version = "0.12.0", optional = true, features = [
+esp-wifi = { version = "0.13.0", optional = true, features = [
     "sys-logs",
-    "utils",
     "wifi",
 ] }
 blocking-network-stack = { git = "https://github.com/bjoernQ/blocking-network-stack", rev = "b3ecefc222d8806edd221f266999ca339c52d34e" }
@@ -73,7 +72,7 @@ edge-http = { version = "0.5.0", optional = true }
 edge-nal = { version = "0.5.0", optional = true }
 edge-nal-embassy = { version = "0.5.0", optional = true }
 cfg-if = "1.0.0"
-esp-alloc = { version = "0.6.0", optional = true }
+esp-alloc = { version = "0.7.0", optional = true }
 enumset = { version = "1", default-features = false }
 
 [target.'cfg(target_os = "espidf")'.dependencies]
@@ -104,6 +103,7 @@ examples = [
     "esp-backtrace",
     "esp-println",
     "esp-wifi",
+    "esp-wifi/smoltcp",
     "smoltcp",
     "esp-alloc",
 ]

esp-mbedtls-sys/Cargo.toml

@@ -19,7 +19,7 @@ embuild     = "0.33"
 # For malloc/free
 # TODO: Replace with `esp-alloc` once `esp-alloc` starts to provide `malloc` and `free` in future
 # ... or switch to our own `mbedtls_malloc/free`
-esp-wifi = { version = "0.12.0", default-features = false, optional = true }
+esp-wifi = { version = "0.13.0", default-features = false, optional = true }
 
 # ESP-IDF: The mbedtls lib distributed with ESP-IDF is used
 [target.'cfg(target_os = "espidf")'.dependencies]

esp-mbedtls/Cargo.toml

@@ -14,11 +14,11 @@ log = { version = "0.4.17", default-features = false }
 enumset = { version = "1", default-features = false }
 embedded-io = { version = "0.6.1" }
 embedded-io-async = { version = "0.6.0", optional = true }
-esp-hal = { version = "0.23.0", optional = true }
+esp-hal = { version = "1.0.0-beta.0", features = ["unstable"], optional = true }
 # For malloc/free
 # TODO: Replace with `esp-alloc` once `esp-alloc` starts to provide `malloc` and `free` in future
 # ... or switch to our own `mbedtls_malloc/free`
-esp-wifi = { version = "0.12.0", default-features = false, optional = true }
+esp-wifi = { version = "0.13.0", default-features = false, optional = true }
 cfg-if = "1.0.0"
 edge-nal = { version = "0.5.0", optional = true }
 critical-section = "1.1.3"

examples/async_client.rs

@@ -25,8 +25,7 @@ use esp_mbedtls::{Tls, X509};
 use esp_println::logger::init_logger;
 use esp_println::{print, println};
 use esp_wifi::wifi::{
-    ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiStaDevice,
-    WifiState,
+    ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiState,
 };
 use esp_wifi::{init, EspWifiController};
 use hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
@@ -61,29 +60,22 @@ cfg_if::cfg_if! {
 async fn main(spawner: Spawner) -> ! {
     init_logger(log::LevelFilter::Info);
 
-    let peripherals = esp_hal::init({
-        let mut config = esp_hal::Config::default();
-        config.cpu_clock = CpuClock::max();
-        config
-    });
+    let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
+    let peripherals = esp_hal::init(config);
 
-    esp_alloc::heap_allocator!(115 * 1024);
+    esp_alloc::heap_allocator!(size: 115 * 1024);
 
     let timg0 = TimerGroup::new(peripherals.TIMG0);
+    let mut rng = Rng::new(peripherals.RNG);
 
-    let init = &*mk_static!(
+    let esp_wifi_ctrl = &*mk_static!(
         EspWifiController<'_>,
-        init(
-            timg0.timer0,
-            Rng::new(peripherals.RNG),
-            peripherals.RADIO_CLK,
-        )
-        .unwrap()
+        init(timg0.timer0, rng.clone(), peripherals.RADIO_CLK,).unwrap()
     );
 
-    let wifi = peripherals.WIFI;
-    let (wifi_interface, controller) =
-        esp_wifi::wifi::new_with_mode(init, wifi, WifiStaDevice).unwrap();
+    let (controller, interfaces) = esp_wifi::wifi::new(&esp_wifi_ctrl, peripherals.WIFI).unwrap();
+
+    let wifi_interface = interfaces.sta;
 
     cfg_if::cfg_if! {
         if #[cfg(feature = "esp32")] {
@@ -98,7 +90,7 @@ async fn main(spawner: Spawner) -> ! {
 
     let config = Config::dhcpv4(Default::default());
 
-    let seed = 1234; // very random, very secure seed
+    let seed = (rng.random() as u64) << 32 | rng.random() as u64;
 
     // Init network stack
     let (stack, runner) = embassy_net::new(
@@ -253,6 +245,6 @@ async fn connection(mut controller: WifiController<'static>) {
 }
 
 #[embassy_executor::task]
-async fn net_task(mut runner: Runner<'static, WifiDevice<'static, WifiStaDevice>>) {
+async fn net_task(mut runner: Runner<'static, WifiDevice<'static>>) {
     runner.run().await
 }

examples/async_server.rs

@@ -45,8 +45,7 @@ use esp_mbedtls::{Tls, TlsError, X509};
 use esp_println::logger::init_logger;
 use esp_println::{print, println};
 use esp_wifi::wifi::{
-    ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiStaDevice,
-    WifiState,
+    ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiState,
 };
 use esp_wifi::{init, EspWifiController};
 use hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
@@ -68,29 +67,22 @@ const PASSWORD: &str = env!("PASSWORD");
 async fn main(spawner: Spawner) -> ! {
     init_logger(log::LevelFilter::Info);
 
-    let peripherals = esp_hal::init({
-        let mut config = esp_hal::Config::default();
-        config.cpu_clock = CpuClock::max();
-        config
-    });
+    let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
+    let peripherals = esp_hal::init(config);
 
-    esp_alloc::heap_allocator!(115 * 1024);
+    esp_alloc::heap_allocator!(size: 115 * 1024);
 
     let timg0 = TimerGroup::new(peripherals.TIMG0);
+    let mut rng = Rng::new(peripherals.RNG);
 
-    let init = &*mk_static!(
+    let esp_wifi_ctrl = &*mk_static!(
         EspWifiController<'_>,
-        init(
-            timg0.timer0,
-            Rng::new(peripherals.RNG),
-            peripherals.RADIO_CLK,
-        )
-        .unwrap()
+        init(timg0.timer0, rng.clone(), peripherals.RADIO_CLK,).unwrap()
     );
 
-    let wifi = peripherals.WIFI;
-    let (wifi_interface, controller) =
-        esp_wifi::wifi::new_with_mode(init, wifi, WifiStaDevice).unwrap();
+    let (controller, interfaces) = esp_wifi::wifi::new(&esp_wifi_ctrl, peripherals.WIFI).unwrap();
+
+    let wifi_interface = interfaces.sta;
 
     cfg_if::cfg_if! {
         if #[cfg(feature = "esp32")] {
@@ -105,7 +97,7 @@ async fn main(spawner: Spawner) -> ! {
 
     let config = Config::dhcpv4(Default::default());
 
-    let seed = 1234; // very random, very secure seed
+    let seed = (rng.random() as u64) << 32 | rng.random() as u64;
 
     // Init network stack
     let (stack, runner) = embassy_net::new(
@@ -291,6 +283,6 @@ async fn connection(mut controller: WifiController<'static>) {
 }
 
 #[embassy_executor::task]
-async fn net_task(mut runner: Runner<'static, WifiDevice<'static, WifiStaDevice>>) {
+async fn net_task(mut runner: Runner<'static, WifiDevice<'static>>) {
     runner.run().await
 }

examples/certs/ca_cert.pem

@@ -1,31 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIFSzCCAzOgAwIBAgIUEnhwUe+pVB+2Dh0nvU/4RxtC0qowDQYJKoZIhvcNAQEL
+MIIDSzCCAjOgAwIBAgIUAtFs1cYQXPzsSiAx9eNPjZ6WwpUwDQYJKoZIhvcNAQEL
 BQAwNTEaMBgGA1UEAwwRZXNwLW1iZWR0bHMubG9jYWwxFzAVBgNVBAoMDkNBIENl
-cnRpZmljYXRlMB4XDTIzMDcxMDIxMDY0NFoXDTI0MDcwOTIxMDY0NFowNTEaMBgG
+cnRpZmljYXRlMB4XDTI1MDIyODE4NTQ1OFoXDTI2MDIyODE4NTQ1OFowNTEaMBgG
 A1UEAwwRZXNwLW1iZWR0bHMubG9jYWwxFzAVBgNVBAoMDkNBIENlcnRpZmljYXRl
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA04b8Hf8MVL7XQj/wA0Im
-l+hhgbJr0FabcbU6XuGM3bZVgQ+Xrru6iD46EOgI9xXeas96B+zu5DQrdZ7x4j2R
-l9HRXo6Ul+wtkUENNzqNr5hagbtCx7VPNEwpZziydRfmPoUfYZWgIg4eiu8QvWnk
-21VQx8MM3SMXblXJI9gGc57RTAU8JZbpCW/CVdYUnTE/ZeTdPPzIq777k7xY9QLN
-ISC8YuwAjmGw9SW/gKF5gv9y3dMm7XvoTV3MNaPx3584XkHeLaMP4KEp6i1P+cMn
-UXzQj182QudVcf0AzCjsF4+r17NsDarpzU4zQcWOr61vMFseiHR26ejAJmG5TPBi
-nXyrEzCkV+qfHpRTk5u5ksn62GJvhbzvF0q7Upgju7QtKz2/5CXyyDWocs/i6X69
-6rcGaPNRvrwMTJAbtzoKA2ojuoeVStoN6S7zGtywfXSbL322U/GFAe7KnKo94tvV
-jJn+76bRInzxEDkowvlbVveWjpz/u8IyJ2DhTcsHGsY8O9/UuGV4FTTq1faomnxI
-BVGz5ALl9ewJez2fbtsjseZYOcB1AS39Y/X8wngS8/20OLZKd+TtN0bW8S/jg/sj
-h3m8Yp53Sw927oopP8miBfpPdAjhv+OSYqhnF4HQVxz8RMKz3PbGA5aCbvUGXeHw
-K62jEKQ6iNwv6qCABy+7ZCECAwEAAaNTMFEwHQYDVR0OBBYEFDnq4mz6ySjpfXVK
-WJGdGxc9TKgsMB8GA1UdIwQYMBaAFDnq4mz6ySjpfXVKWJGdGxc9TKgsMA8GA1Ud
-EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBALKYWaSBji16FcpVwgYfv2Ag
-dQQ+mevOg3HF2R+XRHD235/QBsS2LrzOFSbtsz4bWMY7gDmwDE3sx0MWRe/OaPfN
-pVxx2TIYLdNSzI+gazAhqQOu4+i8MII0uuMuRsxI6gFjHAr0D+x+xH2gyOak1hQq
-JG1eLjEv3JQaFW2M16pN1a+oHoCk/uPhG2tegqPlps6tRpLTjUKQ+zfJrtpmCWoU
-K9XxaksIIZSJ6fnH13t0EvzYdkzt524dVgiEI/C8NpGT9ARXl/nlxuCoe8IHwFlI
-af47/WOay6PhJ5OSIfE5/Oi/B3iXtj/ssWE84ct72Gxx4xOaNkRJRymW232NLXfP
-QEQV0LXPT1f4j/qAv9gKqrmOCRCAB92pfZsPE2VatxqO8XdSvTu8GZvGoSrK/6GJ
-QXMUT3n/6ACAcTdkGnwJMfz6jDcXz+b9SAeKk22CHVl7nKV7vKYkCVkAHOxlXJh6
-k3yfrUy9Z0p07EFtMlejLSmbBY2TH+C7a0E4pkEu4ODQvpOZsEQjZS2yc0gfuxTv
-o4dJflpo3vm3V4V3794p/77jr83KHOTiiQcT1eMlhbN3q3WhkQq+TBCtHeq6D4NF
-x/dkPkJFjoQJn8WbMJrALIeUz97PdZjo6rdKqHaDgfZk8OIjAh3+IWbOMQs05l3A
-7WPtPr5ID+yRmohdBs/A
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmZ/fLZ7vJy0MJVNNpAc2
+TExin7zmSuVMKJlmqkOXpZs34AycQ3ew2kSBPH53ikna/qAKUnXJz2P/21XzBNb0
+aeixTqT0ABG+RG6g7gpD//XiEzjMzrl7dlWKOXCA5/nXQB43s01HPT2838lVsbJu
+J/y5bUHyPTuZoJEXRDuetuIr6Pw8fGr6ZraHSdJ2FWjndDcyluFAqONwa+HBJHd8
+QuKyb7eK0gi3EhOl356630J0dQKXEAsQdmgYRirRK3YwmqKtHpWqmau2WI6iaM+4
+alGIZSnsIqtE1Dp09Q64v6CDvhPF98uCuuBtpDVGIyY9WVUeDqz6WJ5vN9GGVtw7
+KQIDAQABo1MwUTAdBgNVHQ4EFgQUJOks4RmsqH87xDke2I2lgONnh44wHwYDVR0j
+BBgwFoAUJOks4RmsqH87xDke2I2lgONnh44wDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAAUsAqMDVMR3Vxen8QipBw97B6PnwoDwCOC4qCW2cbQ65
+RL+F53CuOPQrKDxztzk6z/DkrxkyaTRnpJkjtnpFL0+Jg5lX5LvMMckaLT4+eTXG
+IpN1p9QmH6paivdampMj3ahTyW1RtKQxEj2tArpy7mSGz4eopCALOGZw6xD717vQ
+gaOmyky24k+ZTXlGNq1pAppv5WT/CP9kj/QLfXjjSMDePaBnZFPoijuQNWWp0AP7
+h2E4jlPd2YLYdmxyuDCf7MYrUtpOmtzRcLa6TdEqtomqIrHkKyNO6fG+F4MWQgQK
+oyB3qwwIfRvoZrJ8r9IKFMtGxowVD/PMWM0hlpqWHQ==
 -----END CERTIFICATE-----

examples/certs/ca_key.pem

@@ -1,52 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-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
-LmBOTP1m5m96P3sSCYmHRCXdBOZHrdxV
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCZn98tnu8nLQwl
+U02kBzZMTGKfvOZK5UwomWaqQ5elmzfgDJxDd7DaRIE8fneKSdr+oApSdcnPY//b
+VfME1vRp6LFOpPQAEb5EbqDuCkP/9eITOMzOuXt2VYo5cIDn+ddAHjezTUc9Pbzf
+yVWxsm4n/LltQfI9O5mgkRdEO5624ivo/Dx8avpmtodJ0nYVaOd0NzKW4UCo43Br
+4cEkd3xC4rJvt4rSCLcSE6XfnrrfQnR1ApcQCxB2aBhGKtErdjCaoq0elaqZq7ZY
+jqJoz7hqUYhlKewiq0TUOnT1Dri/oIO+E8X3y4K64G2kNUYjJj1ZVR4OrPpYnm83
+0YZW3DspAgMBAAECggEAFO4F0TiX0xHNV5F9oLUV1ffLMQGiq34JbfeWV+idEsQu
+rODy8jMunlIafGQrg6Tzx+CEf38KN23jmB2h3h0uD/bSn0kUcCT6s+aRmNS/tnHo
+st84cgqtsi3Nxu0XtuMgSx1Cz/Qdmk+cua17thm97cc9+Q90whhqYgiab6KiyT4Z
+m9sZgN8emjkYI57NY+b4sSE2owgbn5Ow4dRhAP9NriC/Pb9DtrN+iOWZYFGgSUjv
+hobMZBj48ChM7krT3gxJVzGIKU/7cVB20Llq7hBLn+f9dhkTP/FCFfT9svY0OHd/
+jD7DJJzjpyGUfZiTC1itJzt/3ncmU0xpjujx96FC7QKBgQDJU763LI9X2YqyD7b9
+5fEpZ4R9y0/NrOlremYZB7dq+F8EzTju5oExYmHwMMXhbPXEdvPCOpvaOMJURP/K
+vP0IVYg2M8D5dIGPCqeUu8+DC6PAu2E2cb2y0ZPV1XJECpyRl4GNIcwIVHpE4EhZ
+ecJsGNM74OIC/skv/1s8iVDZTQKBgQDDV9d2MEevGYbMBkONRHO38I9NwA6GGH0Q
+MGb0GjCP3PEBk+LlSow13GryrThLJxo1rmKVPlUvMsCxWA58PSPBZ5PHCXKis1sp
+4vG8fGr0NyUSOlgklaPGxiFlM44OvyFRwXeCt/a2HWUaIXT85Fir380qI1PFUEdS
+AWQtuz7bTQKBgEhsr/cFOKvJvnM/4/yCc7cJXkhCk3rR8UaQyZnHhNwebVA0435N
+vbweQE0/vm/R2rfKcvY0T0y5jm7yQ3KTehM9cbrN82XJ27Gxi4ed6JCj50y2G8qS
+MEPb0Orj1i9UAe7+KcSzm8qDWVjdtik5/A8W/yZTR/r73TQ/EHs+iq8hAoGAATK+
+vZjaN7a+Xu4C6BDtbMlq950f+a6YxcqmNwUaGyfNyqavk5x7c7EgbtClMcDRplal
+gCjbuOhkyjGyFQ0C9SK/g08Jhvn2qzEbLn7M4SadcZkuBTttv8BjYA2K54hAmhHH
+u+OI/eD8R8bAwvRbnuJGjeWdk+5EIbqkdKtbXVkCgYAFnotzrjwD2kTyWZikKIzz
+fqHBGfTwIX7PqKK4XXOs/2A6Uhi255mbFcYolQoGnsHqzd1OXAPCnKCfy0HkEuKh
+6xgAL10X6Ew1b4KnNRYnuaRB59cVfg3cyWDaxK9bg36DmlxRijJwe4pbNyJbhqIP
+bPu9SGuz598NRff62GGTgg==
 -----END PRIVATE KEY-----