Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Commit

Permalink
Rebase updates
Browse files Browse the repository at this point in the history
  • Loading branch information
MabezDev committed Apr 18, 2024
1 parent 0927614 commit 3a385fe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ esp-backtrace = { version = "0.11.0", features = [
"println",
] }
esp-hal = { version = "0.16.0", features = [ "{{ mcu }}" ] }
esp-backtrace = { version = "0.10.0", features = ["{{ mcu }}", "panic-handler", "exception-handler", "print-uart"] }
esp-println = { version = "0.8.0", features = ["{{ mcu }}", "log"] }
esp-println = { version = "0.9.0", features = ["{{ mcu }}", "log"] }
log = { version = "0.4.20" }
{% if alloc -%}
esp-alloc = { version = "0.3.0" }
Expand Down
5 changes: 2 additions & 3 deletions pre-script.rhai
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ let mcu = variable::get("mcu");
let meta = metadata.get(mcu);

variable::set("esp_wifi_feature", meta.get("esp_wifi_feature"));
variable::set("hal_version", meta.get("hal_version"));
variable::set("wokwi_board", meta.get("wokwi_board"));

if mcu in ["esp32", "esp32s2", "esp32s3"] {
Expand Down Expand Up @@ -108,11 +107,11 @@ fn init_heap() {
// depends on: `peripherals` being in scope
variable::set("esp_wifi_snippet",
`
let timer = ${mcu}_hal::${meta.esp_wifi_timer};
let timer = esp_hal::${meta.esp_wifi_timer};
let _init = esp_wifi::initialize(
esp_wifi::EspWifiInitFor::${meta.esp_wifi_init},
timer,
${mcu}_hal::rng::Rng::new(peripherals.RNG),
esp_hal::rng::Rng::new(peripherals.RNG),
system.radio_clock_control,
&clocks,
)
Expand Down

0 comments on commit 3a385fe

Please sign in to comment.