Merge pull request #169 from SergioGasquez/feat/esp-hal-0-20

Update deps

Cargo.toml

@@ -6,21 +6,21 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-esp-backtrace = { version = "0.13.0", features = [
+esp-backtrace = { version = "0.14.0", features = [
     "{{ mcu }}",
     "exception-handler",
     "panic-handler",
     "println",
 ] }
-esp-hal = { version = "0.19.0", features = [ "{{ mcu }}" ] }
-esp-println = { version = "0.10.0", features = ["{{ mcu }}", "log"] }
+esp-hal = { version = "0.20.1", features = [ "{{ mcu }}" ] }
+esp-println = { version = "0.11.0", features = ["{{ mcu }}", "log"] }
 log = { version = "0.4.21" }
 {% if alloc -%}
 esp-alloc = { version = "0.4.0" }
 {% endif -%}
 {% if wifi -%}
 embedded-io = "0.6.1"
-esp-wifi = { version = "0.7.1", features = [
+esp-wifi = { version = "0.8.0", features = [
     "{{ mcu }}",
     "phy-enable-usb",
     "utils",

pre-script.rhai

@@ -4,19 +4,16 @@ let metadata = #{
         wokwi_board: "board-esp32-devkit-c-v4",
         esp_wifi_init: "Wifi",
         esp_wifi_feature: "wifi",
-        esp_wifi_timer: "timer::timg::TimerGroup::new(peripherals.TIMG1, &clocks, None).timer0"
     },
     esp32s2: #{
         wokwi_board: "board-esp32-s2-devkitm-1",
         esp_wifi_init: "Wifi",
         esp_wifi_feature: "wifi",
-        esp_wifi_timer: "timer::timg::TimerGroup::new(peripherals.TIMG1, &clocks, None).timer0"
     },
     esp32s3: #{
         wokwi_board: "board-esp32-s3-devkitc-1",
         esp_wifi_init: "Wifi",
         esp_wifi_feature: "wifi",
-        esp_wifi_timer: "timer::timg::TimerGroup::new(peripherals.TIMG1, &clocks, None).timer0"
     },
 
     // RISC-V devices:
@@ -25,28 +22,24 @@ let metadata = #{
         wokwi_board: "",
         esp_wifi_init: "Wifi",
         esp_wifi_feature: "wifi",
-        esp_wifi_timer: "timer::systimer::SystemTimer::new(peripherals.SYSTIMER).alarm0"
     },
     esp32c3: #{
         extensions: "imc",
         wokwi_board: "board-esp32-c3-devkitm-1",
         esp_wifi_init: "Wifi",
         esp_wifi_feature: "wifi",
-        esp_wifi_timer: "timer::systimer::SystemTimer::new(peripherals.SYSTIMER).alarm0"
     },
     esp32c6: #{
         extensions: "imac",
         wokwi_board: "board-esp32-c6-devkitc-1",
         esp_wifi_init: "Wifi",
         esp_wifi_feature: "wifi",
-        esp_wifi_timer: "timer::systimer::SystemTimer::new(peripherals.SYSTIMER).alarm0"
     },
     esp32h2: #{
         extensions: "imac",
         wokwi_board: "board-esp32-h2-devkitm-1",
         esp_wifi_init: "Ble",
         esp_wifi_feature: "ble",
-        esp_wifi_timer: "timer::systimer::SystemTimer::new(peripherals.SYSTIMER).alarm0"
     },
 };
 
@@ -107,10 +100,10 @@ fn init_heap() {
 // depends on: `peripherals` being in scope
 variable::set("esp_wifi_snippet",
 `
-let timer = esp_hal::timer::PeriodicTimer::new(esp_hal::${meta.esp_wifi_timer}.into());
+let timg0 = esp_hal::timer::timg::TimerGroup::new(peripherals.TIMG0, &clocks);
 let _init = esp_wifi::initialize(
     esp_wifi::EspWifiInitFor::${meta.esp_wifi_init},
-    timer,
+    timg0.timer0,
     esp_hal::rng::Rng::new(peripherals.RNG),
     peripherals.RADIO_CLK,
     &clocks,