commit 9375d79b8a5255b57fc8b9954bcc9370cddabd33
parent 801354aab1d6642aeccd4378b95819eb3280ac4d
Author: filipton <filipton12@gmail.com>
Date: Sat, 5 Jul 2025 23:14:17 +0200
fix: build example for esp32 on nightly compiler
Diffstat:
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -16,7 +16,7 @@ embassy-executor = { version = "0.7.0", package = "embassy-executor", features =
embassy-net = { version = "0.7.0", features = ["tcp", "udp", "dhcpv4", "medium-ethernet"] }
embassy-time = { version = "0.4.0" }
esp-storage = { version = "0.6.0", features = [] }
-esp-hal-ota = { path = "/home/pilif/projects/esp-hal-ota", features = [] }
+esp-hal-ota = { path = "/home/pilif/projects/esp-hal-ota", features = ["log"] }
static_cell = { version = "2.1.0", features = ["nightly"] }
#xtensa-lx-rt = { version = "0.17.2", optional = true, features = ["esp32s3", "float-save-restore"] }
esp-alloc = "0.8.0"
diff --git a/examples/src/main.rs b/examples/src/main.rs
@@ -5,15 +5,15 @@
extern crate alloc;
use core::str::FromStr;
use embassy_executor::Spawner;
-use embassy_net::{tcp::TcpSocket, Config, Runner, Stack, StackResources};
+use embassy_net::{Config, Runner, Stack, StackResources, tcp::TcpSocket};
use embassy_time::{Duration, Timer};
use esp_backtrace as _;
use esp_hal::timer::timg::TimerGroup;
use esp_hal_ota::Ota;
use esp_storage::FlashStorage;
use esp_wifi::{
- wifi::{ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiState},
EspWifiController,
+ wifi::{ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiState},
};
const WIFI_SSID: &'static str = env!("SSID");
@@ -45,17 +45,19 @@ async fn main(spawner: Spawner) {
{
static mut HEAP: core::mem::MaybeUninit<[u8; 30 * 1024]> = core::mem::MaybeUninit::uninit();
- #[link_section = ".dram2_uninit"]
+ #[unsafe(link_section = ".dram2_uninit")]
static mut HEAP2: core::mem::MaybeUninit<[u8; 64 * 1024]> =
core::mem::MaybeUninit::uninit();
unsafe {
+ #[allow(static_mut_refs)]
esp_alloc::HEAP.add_region(esp_alloc::HeapRegion::new(
HEAP.as_mut_ptr() as *mut u8,
core::mem::size_of_val(&*core::ptr::addr_of!(HEAP)),
esp_alloc::MemoryCapability::Internal.into(),
));
+ #[allow(static_mut_refs)]
esp_alloc::HEAP.add_region(esp_alloc::HeapRegion::new(
HEAP2.as_mut_ptr() as *mut u8,
core::mem::size_of_val(&*core::ptr::addr_of!(HEAP2)),