Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennecollin committed Sep 13, 2024
1 parent 9303b85 commit 1617bbd
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ uart = ["esp-println/uart"]

[dependencies]
defmt = { version = "0.3.8", optional = true }
embassy-executor = { version = "0.5.0", features=["nightly"]}
embassy-executor = { version = "0.6.0", features=["nightly"] }
embassy-futures = "0.1.1"
embassy-net = { version = "0.4.0", features = ["tcp", "udp", "dns", "dhcpv4", "dhcpv4-hostname", "medium-ethernet"] }
embassy-time = { version = "0.3.1", features=["generic-queue-8"] }
esp-backtrace = { version = "0.12.1", features = ["panic-handler", "exception-handler"] }
esp-hal = { version = "0.18.0" }
esp-hal-embassy = { version = "0.1.0", features = ["time-timg0"] }
esp-println = { version = "0.9.1", features = ["critical-section", "colors"] }
esp-wifi = { version = "0.6.0", features = ["wifi", "ipv4", "tcp", "udp", "icmp", "igmp", "dns", "dhcpv4", "embassy-net"] }
esp-backtrace = { version = "0.14.1", features = ["panic-handler", "exception-handler"] }
esp-hal = { version = "0.20.1" }
esp-hal-embassy = { version = "0.3.0" }
esp-println = { version = "0.11.0", features = ["critical-section", "colors"] }
esp-wifi = { version = "0.9.1", features = ["wifi", "ipv4", "tcp", "udp", "icmp", "igmp", "dns", "dhcpv4", "embassy-net"] }
heapless = "0.8.0"
log = { version = "0.4.22", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2024-06-12"
channel = "nightly" # For embassy_executor
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]

15 changes: 10 additions & 5 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![no_std]
#![no_main]
#![feature(type_alias_impl_trait)]
#![feature(impl_trait_in_assoc_type)]

mod dns;
mod http_server;
Expand All @@ -19,7 +19,10 @@ use esp_hal::{
riscv::singleton,
rng::Rng,
system::SystemControl,
timer::{systimer::SystemTimer, timg::TimerGroup},
timer::{
systimer::{SystemTimer, Target},
timg::TimerGroup,
},
};
use esp_hal_embassy as embassy;
use esp_wifi::{
Expand Down Expand Up @@ -65,7 +68,9 @@ async fn main(spawner: Spawner) {
let seed: u64 = u64::from_ne_bytes(seed_buf);

// Initialize the wifi
let timer = SystemTimer::new(peripherals.SYSTIMER).alarm0;
let timer = SystemTimer::new(peripherals.SYSTIMER)
.split::<Target>()
.alarm0;
let init = initialize(
EspWifiInitFor::Wifi,
timer,
Expand Down Expand Up @@ -108,8 +113,8 @@ async fn main(spawner: Spawner) {
.unwrap();

// Initialize embassy for async tasks
let timg0 = TimerGroup::new_async(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timg0);
let timg0 = TimerGroup::new(peripherals.TIMG0, &clocks);
embassy::init(&clocks, timg0.timer0);

spawner.spawn(connection(controller)).ok();
spawner.spawn(net_task(stack)).ok();
Expand Down

0 comments on commit 1617bbd

Please sign in to comment.