commit 0979e2137d25cfdb6a39d1abe884154d825dedea
parent ed568231f0d4d96a9b4530fdd6ee85ffb40eba7c
Author: filipton <filipton12@gmail.com>
Date: Sat, 7 Sep 2024 17:32:05 +0200
feat: make example work on esp32s3 (using 0.20.X esp-hal)
Diffstat:
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
@@ -665,6 +665,7 @@ dependencies = [
"esp-wifi",
"log",
"static_cell",
+ "xtensa-lx-rt",
]
[[package]]
@@ -746,9 +747,9 @@ dependencies = [
[[package]]
name = "esp-wifi"
-version = "0.9.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae0bce12453e0912ae595bb019d3c88576cf396aad1194e46235a0596c8db3d7"
+checksum = "d97f76de64be01a074dec52112656cf656c05657ce5dc3fc5b376b7f06958130"
dependencies = [
"atomic-waker",
"cfg-if",
@@ -781,9 +782,9 @@ dependencies = [
[[package]]
name = "esp-wifi-sys"
-version = "0.5.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a597f11c115df19df85bb38456ebf61c08400e254afe9244c542f702c7f744"
+checksum = "1829bd8c63b22a6d8a5485203a6e6bdc008897d9ee687aa6df8b57d2103a48d2"
dependencies = [
"anyhow",
]
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -10,14 +10,15 @@ esp-backtrace = { version = "0.14.1", features = [ "esp32s3", "exception-handler
esp-hal = { version = "0.20.1", features = [ "esp32s3", "embedded-hal", "embedded-hal-02", "async" ] }
esp-println = { version = "0.11.0", features = ["esp32s3", "log"] }
log = { version = "0.4.22" }
-esp-wifi = { version = "0.9.1", features = [ "esp32s3", "phy-enable-usb", "utils", "wifi", "dhcpv4", "ble", "embassy-net" ] }
+esp-wifi = { version = "0.8.0", features = [ "esp32s3", "phy-enable-usb", "utils", "wifi", "dhcpv4", "ble", "embassy-net" ] }
esp-hal-embassy = { version = "0.3.0", features = ["integrated-timers", "esp32s3"] }
embassy-executor = { version = "0.6.0", package = "embassy-executor", features = ["arch-riscv32", "task-arena-size-10240"] }
embassy-net = { version = "0.4.0", features = ["tcp", "udp", "dhcpv4", "medium-ethernet"] }
embassy-time = { version = "0.3.2" }
esp-storage = { version = "0.3.0", features = ["esp32s3"] }
-esp-hal-ota = { path = "../", features = ["esp32s3"] }
+esp-hal-ota = { path = "../", default-features = false, features = ["esp32s3", "log"] }
static_cell = { version = "2.1.0", features = ["nightly"] }
+xtensa-lx-rt = { version = "0.17.1", features = ["esp32s3", "float-save-restore"] }
[build-dependencies]
dotenvy = "0.15.7"
diff --git a/examples/src/main.rs b/examples/src/main.rs
@@ -8,10 +8,7 @@ use embassy_net::{tcp::TcpSocket, Config, Stack, StackResources};
use embassy_time::{Duration, Timer};
use esp_backtrace as _;
use esp_hal::{
- clock::ClockControl,
- peripherals::Peripherals,
- prelude::*,
- system::SystemControl,
+ clock::ClockControl, peripherals::Peripherals, prelude::*, system::SystemControl,
timer::timg::TimerGroup,
};
use esp_hal_ota::Ota;
diff --git a/simple-ota-server/firmware.bin b/simple-ota-server/firmware.bin
Binary files differ.