diff --git a/examples/src/bin/debug_assist.rs b/examples/src/bin/debug_assist.rs index 45ea3a5e3..c16fe0e59 100644 --- a/examples/src/bin/debug_assist.rs +++ b/examples/src/bin/debug_assist.rs @@ -15,6 +15,8 @@ use esp_backtrace as _; use esp_hal::{assist_debug::DebugAssist, handler, main}; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + static DA: Mutex>> = Mutex::new(RefCell::new(None)); #[main] diff --git a/examples/src/bin/dma_extmem2mem.rs b/examples/src/bin/dma_extmem2mem.rs index 096348aef..07b6422cb 100644 --- a/examples/src/bin/dma_extmem2mem.rs +++ b/examples/src/bin/dma_extmem2mem.rs @@ -21,6 +21,8 @@ use esp_hal::{ use log::{error, info}; extern crate alloc; +esp_bootloader_esp_idf::esp_app_desc!(); + const DATA_SIZE: usize = 1024 * 10; const CHUNK_SIZE: usize = 4032; // size is aligned to 64 bytes diff --git a/examples/src/bin/dma_mem2mem.rs b/examples/src/bin/dma_mem2mem.rs index fca3a292c..282cbba34 100644 --- a/examples/src/bin/dma_mem2mem.rs +++ b/examples/src/bin/dma_mem2mem.rs @@ -16,6 +16,8 @@ use esp_hal::{ }; use log::{error, info}; +esp_bootloader_esp_idf::esp_app_desc!(); + const DATA_SIZE: usize = 1024 * 10; #[main] diff --git a/examples/src/bin/embassy_hello_world.rs b/examples/src/bin/embassy_hello_world.rs index b11e31e75..55edb808a 100644 --- a/examples/src/bin/embassy_hello_world.rs +++ b/examples/src/bin/embassy_hello_world.rs @@ -14,6 +14,8 @@ use embassy_time::{Duration, Timer}; use esp_backtrace as _; use esp_hal::timer::timg::TimerGroup; +esp_bootloader_esp_idf::esp_app_desc!(); + #[embassy_executor::task] async fn run() { loop { diff --git a/examples/src/bin/embassy_multicore.rs b/examples/src/bin/embassy_multicore.rs index 6a1e168c6..92892de80 100644 --- a/examples/src/bin/embassy_multicore.rs +++ b/examples/src/bin/embassy_multicore.rs @@ -27,6 +27,8 @@ use esp_hal_embassy::Executor; use esp_println::println; use static_cell::StaticCell; +esp_bootloader_esp_idf::esp_app_desc!(); + static mut APP_CORE_STACK: Stack<8192> = Stack::new(); /// Waits for a message that contains a duration, then flashes a led for that diff --git a/examples/src/bin/embassy_multicore_interrupt.rs b/examples/src/bin/embassy_multicore_interrupt.rs index 297b1f6be..4d4951ad3 100644 --- a/examples/src/bin/embassy_multicore_interrupt.rs +++ b/examples/src/bin/embassy_multicore_interrupt.rs @@ -28,6 +28,8 @@ use esp_hal_embassy::InterruptExecutor; use esp_println::println; use static_cell::StaticCell; +esp_bootloader_esp_idf::esp_app_desc!(); + static mut APP_CORE_STACK: Stack<8192> = Stack::new(); /// Waits for a message that contains a duration, then flashes a led for that diff --git a/examples/src/bin/embassy_multiprio.rs b/examples/src/bin/embassy_multiprio.rs index a1249b822..8818fda4a 100644 --- a/examples/src/bin/embassy_multiprio.rs +++ b/examples/src/bin/embassy_multiprio.rs @@ -31,6 +31,8 @@ use esp_hal_embassy::InterruptExecutor; use esp_println::println; use static_cell::StaticCell; +esp_bootloader_esp_idf::esp_app_desc!(); + /// Periodically print something. #[embassy_executor::task] async fn high_prio() { diff --git a/examples/src/bin/embassy_rmt_rx.rs b/examples/src/bin/embassy_rmt_rx.rs index a0bb1331a..91aab7fc2 100644 --- a/examples/src/bin/embassy_rmt_rx.rs +++ b/examples/src/bin/embassy_rmt_rx.rs @@ -20,6 +20,8 @@ use esp_hal::{ }; use esp_println::{print, println}; +esp_bootloader_esp_idf::esp_app_desc!(); + const WIDTH: usize = 80; #[cfg(is_not_release)] diff --git a/examples/src/bin/embassy_rmt_tx.rs b/examples/src/bin/embassy_rmt_tx.rs index 84ca7cfe3..a36af53e3 100644 --- a/examples/src/bin/embassy_rmt_tx.rs +++ b/examples/src/bin/embassy_rmt_tx.rs @@ -22,6 +22,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[esp_hal_embassy::main] async fn main(_spawner: Spawner) { println!("Init!"); diff --git a/examples/src/bin/embassy_serial.rs b/examples/src/bin/embassy_serial.rs index 3df1ae516..c5173e1c0 100644 --- a/examples/src/bin/embassy_serial.rs +++ b/examples/src/bin/embassy_serial.rs @@ -24,6 +24,8 @@ const READ_BUF_SIZE: usize = 64; // EOT (CTRL-D) const AT_CMD: u8 = 0x04; +esp_bootloader_esp_idf::esp_app_desc!(); + #[embassy_executor::task] async fn writer(mut tx: UartTx<'static, Async>, signal: &'static Signal) { use core::fmt::Write; diff --git a/examples/src/bin/embassy_spi.rs b/examples/src/bin/embassy_spi.rs index 744d9b6ce..db1a16c6e 100644 --- a/examples/src/bin/embassy_spi.rs +++ b/examples/src/bin/embassy_spi.rs @@ -32,6 +32,8 @@ use esp_hal::{ timer::timg::TimerGroup, }; +esp_bootloader_esp_idf::esp_app_desc!(); + #[esp_hal_embassy::main] async fn main(_spawner: Spawner) { esp_println::println!("Init!"); diff --git a/examples/src/bin/embassy_usb_serial.rs b/examples/src/bin/embassy_usb_serial.rs index 660f9c518..6f38cf580 100644 --- a/examples/src/bin/embassy_usb_serial.rs +++ b/examples/src/bin/embassy_usb_serial.rs @@ -28,6 +28,8 @@ use esp_hal::{ timer::timg::TimerGroup, }; +esp_bootloader_esp_idf::esp_app_desc!(); + #[esp_hal_embassy::main] async fn main(_spawner: Spawner) { esp_println::println!("Init!"); diff --git a/examples/src/bin/embassy_usb_serial_jtag.rs b/examples/src/bin/embassy_usb_serial_jtag.rs index 2a6c0154f..e5d18df39 100644 --- a/examples/src/bin/embassy_usb_serial_jtag.rs +++ b/examples/src/bin/embassy_usb_serial_jtag.rs @@ -20,6 +20,8 @@ use static_cell::StaticCell; const MAX_BUFFER_SIZE: usize = 512; +esp_bootloader_esp_idf::esp_app_desc!(); + #[embassy_executor::task] async fn writer( mut tx: UsbSerialJtagTx<'static, Async>, diff --git a/examples/src/bin/etm_timer.rs b/examples/src/bin/etm_timer.rs index e29ec943e..32cfb59c3 100644 --- a/examples/src/bin/etm_timer.rs +++ b/examples/src/bin/etm_timer.rs @@ -27,6 +27,8 @@ use esp_hal::{ }, }; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/gpio_interrupt.rs b/examples/src/bin/gpio_interrupt.rs index 288fb30c9..cc0cf946a 100644 --- a/examples/src/bin/gpio_interrupt.rs +++ b/examples/src/bin/gpio_interrupt.rs @@ -25,6 +25,8 @@ use esp_hal::{ ram, }; +esp_bootloader_esp_idf::esp_app_desc!(); + static BUTTON: Mutex>> = Mutex::new(RefCell::new(None)); #[main] diff --git a/examples/src/bin/hmac.rs b/examples/src/bin/hmac.rs index a7c6f3571..6c5a37b9b 100644 --- a/examples/src/bin/hmac.rs +++ b/examples/src/bin/hmac.rs @@ -69,6 +69,8 @@ use hmac::{Hmac as HmacSw, Mac}; use nb::block; use sha2::Sha256; +esp_bootloader_esp_idf::esp_app_desc!(); + type HmacSha256 = HmacSw; #[main] diff --git a/examples/src/bin/ieee802154_receive_all_frames.rs b/examples/src/bin/ieee802154_receive_all_frames.rs index ea77da1fa..dee97af32 100644 --- a/examples/src/bin/ieee802154_receive_all_frames.rs +++ b/examples/src/bin/ieee802154_receive_all_frames.rs @@ -9,6 +9,8 @@ use esp_hal::main; use esp_ieee802154::{Config, Ieee802154}; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/ieee802154_receive_frame.rs b/examples/src/bin/ieee802154_receive_frame.rs index 657095499..c8f99db3d 100644 --- a/examples/src/bin/ieee802154_receive_frame.rs +++ b/examples/src/bin/ieee802154_receive_frame.rs @@ -9,6 +9,8 @@ use esp_hal::main; use esp_ieee802154::{Config, Ieee802154}; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/ieee802154_send_broadcast_frame.rs b/examples/src/bin/ieee802154_send_broadcast_frame.rs index 40ee81cc9..e39801c29 100644 --- a/examples/src/bin/ieee802154_send_broadcast_frame.rs +++ b/examples/src/bin/ieee802154_send_broadcast_frame.rs @@ -18,6 +18,8 @@ use ieee802154::mac::{ ShortAddress, }; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/ieee802154_send_frame.rs b/examples/src/bin/ieee802154_send_frame.rs index beea2d86a..9f51e5f29 100644 --- a/examples/src/bin/ieee802154_send_frame.rs +++ b/examples/src/bin/ieee802154_send_frame.rs @@ -18,6 +18,8 @@ use ieee802154::mac::{ ShortAddress, }; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/ieee802154_sniffer.rs b/examples/src/bin/ieee802154_sniffer.rs index 777de7f89..240cb4593 100644 --- a/examples/src/bin/ieee802154_sniffer.rs +++ b/examples/src/bin/ieee802154_sniffer.rs @@ -17,6 +17,8 @@ use esp_hal::{ use esp_ieee802154::{Config, Ieee802154}; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/lp_core_basic.rs b/examples/src/bin/lp_core_basic.rs index 8a52b16df..751c27623 100644 --- a/examples/src/bin/lp_core_basic.rs +++ b/examples/src/bin/lp_core_basic.rs @@ -23,6 +23,8 @@ use esp_hal::{ }; use esp_println::{print, println}; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/spi_loopback.rs b/examples/src/bin/spi_loopback.rs index 98774dd88..223127822 100644 --- a/examples/src/bin/spi_loopback.rs +++ b/examples/src/bin/spi_loopback.rs @@ -28,6 +28,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/spi_loopback_dma_psram.rs b/examples/src/bin/spi_loopback_dma_psram.rs index bb37f1f77..4fa69d922 100644 --- a/examples/src/bin/spi_loopback_dma_psram.rs +++ b/examples/src/bin/spi_loopback_dma_psram.rs @@ -35,6 +35,8 @@ use esp_hal::{ extern crate alloc; use log::*; +esp_bootloader_esp_idf::esp_app_desc!(); + macro_rules! dma_alloc_buffer { ($size:expr, $align:expr) => {{ let layout = core::alloc::Layout::from_size_align($size, $align).unwrap(); diff --git a/examples/src/bin/spi_slave_dma.rs b/examples/src/bin/spi_slave_dma.rs index aeb2270ab..e23b274e9 100644 --- a/examples/src/bin/spi_slave_dma.rs +++ b/examples/src/bin/spi_slave_dma.rs @@ -41,6 +41,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/touch.rs b/examples/src/bin/touch.rs index f8a58df24..7314f976e 100644 --- a/examples/src/bin/touch.rs +++ b/examples/src/bin/touch.rs @@ -28,6 +28,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + static TOUCH1: Mutex, Continuous, Blocking>>>> = Mutex::new(RefCell::new(None)); diff --git a/examples/src/bin/twai.rs b/examples/src/bin/twai.rs index b46550152..b34b8b64a 100644 --- a/examples/src/bin/twai.rs +++ b/examples/src/bin/twai.rs @@ -36,6 +36,8 @@ use esp_hal::{ use esp_println::println; use nb::block; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/usb_serial.rs b/examples/src/bin/usb_serial.rs index 8d455b52a..1dbec70b6 100644 --- a/examples/src/bin/usb_serial.rs +++ b/examples/src/bin/usb_serial.rs @@ -24,6 +24,8 @@ use usbd_serial::{SerialPort, USB_CLASS_CDC}; static mut EP_MEMORY: [u32; 1024] = [0; 1024]; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/examples/src/bin/wifi_80211_tx.rs b/examples/src/bin/wifi_80211_tx.rs index 669aff34a..2f2b9d041 100644 --- a/examples/src/bin/wifi_80211_tx.rs +++ b/examples/src/bin/wifi_80211_tx.rs @@ -32,6 +32,8 @@ use ieee80211::{ supported_rates, }; +esp_bootloader_esp_idf::esp_app_desc!(); + const SSID: &str = "esp-wifi 802.11 injection"; /// This is an arbitrary MAC address, used for the fake beacon frames. const MAC_ADDRESS: [u8; 6] = [0x00, 0x80, 0x41, 0x13, 0x37, 0x42]; diff --git a/examples/src/bin/wifi_access_point.rs b/examples/src/bin/wifi_access_point.rs index ec3b0b90e..a4c3bd0ff 100644 --- a/examples/src/bin/wifi_access_point.rs +++ b/examples/src/bin/wifi_access_point.rs @@ -36,6 +36,8 @@ use esp_wifi::{ }; use smoltcp::iface::{SocketSet, SocketStorage}; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { esp_println::logger::init_logger_from_env(); diff --git a/examples/src/bin/wifi_access_point_with_sta.rs b/examples/src/bin/wifi_access_point_with_sta.rs index 58abb4228..43538accb 100644 --- a/examples/src/bin/wifi_access_point_with_sta.rs +++ b/examples/src/bin/wifi_access_point_with_sta.rs @@ -38,6 +38,8 @@ use smoltcp::{ wire::IpAddress, }; +esp_bootloader_esp_idf::esp_app_desc!(); + const SSID: &str = env!("SSID"); const PASSWORD: &str = env!("PASSWORD"); diff --git a/examples/src/bin/wifi_bench.rs b/examples/src/bin/wifi_bench.rs index 6e5c52222..d56ed0b14 100644 --- a/examples/src/bin/wifi_bench.rs +++ b/examples/src/bin/wifi_bench.rs @@ -38,6 +38,8 @@ use smoltcp::{ wire::{DhcpOption, IpAddress}, }; +esp_bootloader_esp_idf::esp_app_desc!(); + const SSID: &str = env!("SSID"); const PASSWORD: &str = env!("PASSWORD"); const HOST_IP: &str = env!("HOST_IP"); diff --git a/examples/src/bin/wifi_ble.rs b/examples/src/bin/wifi_ble.rs index 64292c88d..d9ba61186 100644 --- a/examples/src/bin/wifi_ble.rs +++ b/examples/src/bin/wifi_ble.rs @@ -35,6 +35,8 @@ use esp_hal::{ use esp_println::println; use esp_wifi::{ble::controller::BleConnector, init}; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { esp_println::logger::init_logger_from_env(); diff --git a/examples/src/bin/wifi_coex.rs b/examples/src/bin/wifi_coex.rs index 087d2bea5..a2a73372a 100644 --- a/examples/src/bin/wifi_coex.rs +++ b/examples/src/bin/wifi_coex.rs @@ -49,6 +49,8 @@ use smoltcp::{ wire::{DhcpOption, IpAddress}, }; +esp_bootloader_esp_idf::esp_app_desc!(); + const SSID: &str = env!("SSID"); const PASSWORD: &str = env!("PASSWORD"); diff --git a/examples/src/bin/wifi_csi.rs b/examples/src/bin/wifi_csi.rs index 17d4a8954..bc2d78eaa 100644 --- a/examples/src/bin/wifi_csi.rs +++ b/examples/src/bin/wifi_csi.rs @@ -26,6 +26,8 @@ use smoltcp::{ wire::DhcpOption, }; +esp_bootloader_esp_idf::esp_app_desc!(); + const SSID: &str = env!("SSID"); const PASSWORD: &str = env!("PASSWORD"); diff --git a/examples/src/bin/wifi_dhcp.rs b/examples/src/bin/wifi_dhcp.rs index 8295f4167..d868a432c 100644 --- a/examples/src/bin/wifi_dhcp.rs +++ b/examples/src/bin/wifi_dhcp.rs @@ -38,6 +38,8 @@ use smoltcp::{ wire::{DhcpOption, IpAddress}, }; +esp_bootloader_esp_idf::esp_app_desc!(); + const SSID: &str = env!("SSID"); const PASSWORD: &str = env!("PASSWORD"); diff --git a/examples/src/bin/wifi_embassy_access_point.rs b/examples/src/bin/wifi_embassy_access_point.rs index 25f9a75a9..82607a2dc 100644 --- a/examples/src/bin/wifi_embassy_access_point.rs +++ b/examples/src/bin/wifi_embassy_access_point.rs @@ -42,6 +42,8 @@ use esp_wifi::{ }, }; +esp_bootloader_esp_idf::esp_app_desc!(); + // When you are okay with using a nightly compiler it's better to use https://docs.rs/static_cell/2.1.0/static_cell/macro.make_static.html macro_rules! mk_static { ($t:ty,$val:expr) => {{ diff --git a/examples/src/bin/wifi_embassy_access_point_with_sta.rs b/examples/src/bin/wifi_embassy_access_point_with_sta.rs index be680275c..f1f961486 100644 --- a/examples/src/bin/wifi_embassy_access_point_with_sta.rs +++ b/examples/src/bin/wifi_embassy_access_point_with_sta.rs @@ -51,6 +51,8 @@ use esp_wifi::{ }, }; +esp_bootloader_esp_idf::esp_app_desc!(); + const SSID: &str = env!("SSID"); const PASSWORD: &str = env!("PASSWORD"); diff --git a/examples/src/bin/wifi_embassy_bench.rs b/examples/src/bin/wifi_embassy_bench.rs index a14569cb6..ca8d6285f 100644 --- a/examples/src/bin/wifi_embassy_bench.rs +++ b/examples/src/bin/wifi_embassy_bench.rs @@ -33,6 +33,8 @@ use esp_wifi::{ wifi::{ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiState}, }; +esp_bootloader_esp_idf::esp_app_desc!(); + // When you are okay with using a nightly compiler it's better to use https://docs.rs/static_cell/2.1.0/static_cell/macro.make_static.html macro_rules! mk_static { ($t:ty,$val:expr) => {{ diff --git a/examples/src/bin/wifi_embassy_ble.rs b/examples/src/bin/wifi_embassy_ble.rs index 240802fda..99d9a38c0 100644 --- a/examples/src/bin/wifi_embassy_ble.rs +++ b/examples/src/bin/wifi_embassy_ble.rs @@ -39,6 +39,8 @@ use esp_hal::{ use esp_println::println; use esp_wifi::{EspWifiController, ble::controller::BleConnector, init}; +esp_bootloader_esp_idf::esp_app_desc!(); + // When you are okay with using a nightly compiler it's better to use https://docs.rs/static_cell/2.1.0/static_cell/macro.make_static.html macro_rules! mk_static { ($t:ty,$val:expr) => {{ diff --git a/examples/src/bin/wifi_embassy_dhcp.rs b/examples/src/bin/wifi_embassy_dhcp.rs index 9030e02d4..a98467dad 100644 --- a/examples/src/bin/wifi_embassy_dhcp.rs +++ b/examples/src/bin/wifi_embassy_dhcp.rs @@ -28,6 +28,8 @@ use esp_wifi::{ wifi::{ClientConfiguration, Configuration, WifiController, WifiDevice, WifiEvent, WifiState}, }; +esp_bootloader_esp_idf::esp_app_desc!(); + // When you are okay with using a nightly compiler it's better to use https://docs.rs/static_cell/2.1.0/static_cell/macro.make_static.html macro_rules! mk_static { ($t:ty,$val:expr) => {{ diff --git a/examples/src/bin/wifi_embassy_esp_now.rs b/examples/src/bin/wifi_embassy_esp_now.rs index 8f1b02cd1..7004c7f9b 100644 --- a/examples/src/bin/wifi_embassy_esp_now.rs +++ b/examples/src/bin/wifi_embassy_esp_now.rs @@ -23,6 +23,8 @@ use esp_wifi::{ init, }; +esp_bootloader_esp_idf::esp_app_desc!(); + // When you are okay with using a nightly compiler it's better to use https://docs.rs/static_cell/2.1.0/static_cell/macro.make_static.html macro_rules! mk_static { ($t:ty,$val:expr) => {{ diff --git a/examples/src/bin/wifi_embassy_esp_now_duplex.rs b/examples/src/bin/wifi_embassy_esp_now_duplex.rs index a4a7a84de..88e00ab72 100644 --- a/examples/src/bin/wifi_embassy_esp_now_duplex.rs +++ b/examples/src/bin/wifi_embassy_esp_now_duplex.rs @@ -23,6 +23,8 @@ use esp_wifi::{ init, }; +esp_bootloader_esp_idf::esp_app_desc!(); + // When you are okay with using a nightly compiler it's better to use https://docs.rs/static_cell/2.1.0/static_cell/macro.make_static.html macro_rules! mk_static { ($t:ty,$val:expr) => {{ diff --git a/examples/src/bin/wifi_esp_now.rs b/examples/src/bin/wifi_esp_now.rs index 5f657f7d1..98b579b81 100644 --- a/examples/src/bin/wifi_esp_now.rs +++ b/examples/src/bin/wifi_esp_now.rs @@ -23,6 +23,8 @@ use esp_wifi::{ init, }; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { esp_println::logger::init_logger_from_env(); diff --git a/examples/src/bin/wifi_sniffer.rs b/examples/src/bin/wifi_sniffer.rs index 1ebed7ddc..114c21104 100644 --- a/examples/src/bin/wifi_sniffer.rs +++ b/examples/src/bin/wifi_sniffer.rs @@ -24,6 +24,8 @@ use esp_println::println; use esp_wifi::{init, wifi}; use ieee80211::{match_frames, mgmt_frame::BeaconFrame}; +esp_bootloader_esp_idf::esp_app_desc!(); + static KNOWN_SSIDS: Mutex>> = Mutex::new(RefCell::new(BTreeSet::new())); #[main] diff --git a/examples/src/bin/wifi_static_ip.rs b/examples/src/bin/wifi_static_ip.rs index 3e7181301..201aa8421 100644 --- a/examples/src/bin/wifi_static_ip.rs +++ b/examples/src/bin/wifi_static_ip.rs @@ -31,6 +31,8 @@ use esp_wifi::{ }; use smoltcp::iface::{SocketSet, SocketStorage}; +esp_bootloader_esp_idf::esp_app_desc!(); + const SSID: &str = env!("SSID"); const PASSWORD: &str = env!("PASSWORD"); const STATIC_IP: &str = env!("STATIC_IP"); diff --git a/hil-test/tests/aes.rs b/hil-test/tests/aes.rs index a1bc15f9c..fe4e67fe9 100644 --- a/hil-test/tests/aes.rs +++ b/hil-test/tests/aes.rs @@ -12,6 +12,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context<'a> { aes: Aes<'a>, } diff --git a/hil-test/tests/aes_dma.rs b/hil-test/tests/aes_dma.rs index 93c719754..bee7bfea3 100644 --- a/hil-test/tests/aes_dma.rs +++ b/hil-test/tests/aes_dma.rs @@ -13,6 +13,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + const DMA_BUFFER_SIZE: usize = 16; #[cfg(test)] diff --git a/hil-test/tests/clock_monitor.rs b/hil-test/tests/clock_monitor.rs index b732e5818..d98e07f42 100644 --- a/hil-test/tests/clock_monitor.rs +++ b/hil-test/tests/clock_monitor.rs @@ -9,6 +9,8 @@ use esp_hal::rtc_cntl::Rtc; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context<'a> { rtc: Rtc<'a>, } diff --git a/hil-test/tests/crc.rs b/hil-test/tests/crc.rs index c45261e82..6def31d15 100644 --- a/hil-test/tests/crc.rs +++ b/hil-test/tests/crc.rs @@ -11,6 +11,8 @@ use core::ops::Deref; use esp_hal::rom::{crc, md5}; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + #[cfg(test)] #[embedded_test::tests(default_timeout = 3)] mod tests { diff --git a/hil-test/tests/critical_section.rs b/hil-test/tests/critical_section.rs index ee764df10..dd573744b 100644 --- a/hil-test/tests/critical_section.rs +++ b/hil-test/tests/critical_section.rs @@ -20,6 +20,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + fn test_access_at_priority(peripherals: Peripherals, priority: Priority) { static LOCK: RawPriorityLimitedMutex = RawPriorityLimitedMutex::new(Priority::Priority1); diff --git a/hil-test/tests/delay.rs b/hil-test/tests/delay.rs index 8830b52f9..f4acbf900 100644 --- a/hil-test/tests/delay.rs +++ b/hil-test/tests/delay.rs @@ -10,6 +10,8 @@ use embedded_hal::delay::DelayNs; use esp_hal::delay::Delay; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { delay: Delay, } diff --git a/hil-test/tests/delay_async.rs b/hil-test/tests/delay_async.rs index d8395ca1c..78d303348 100644 --- a/hil-test/tests/delay_async.rs +++ b/hil-test/tests/delay_async.rs @@ -21,6 +21,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { peripherals: Peripherals, } diff --git a/hil-test/tests/dma_macros.rs b/hil-test/tests/dma_macros.rs index 7a1801bc9..acd248385 100644 --- a/hil-test/tests/dma_macros.rs +++ b/hil-test/tests/dma_macros.rs @@ -8,6 +8,8 @@ use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + const DATA_SIZE: usize = 1024 * 10; pub(crate) const fn compute_size(size: usize, chunk_size: usize) -> usize { diff --git a/hil-test/tests/dma_mem2mem.rs b/hil-test/tests/dma_mem2mem.rs index 956f45a27..f812db36a 100644 --- a/hil-test/tests/dma_mem2mem.rs +++ b/hil-test/tests/dma_mem2mem.rs @@ -14,6 +14,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + const DATA_SIZE: usize = 1024 * 10; struct Context { diff --git a/hil-test/tests/ecc.rs b/hil-test/tests/ecc.rs index cec49696f..0e649b4fc 100644 --- a/hil-test/tests/ecc.rs +++ b/hil-test/tests/ecc.rs @@ -26,6 +26,8 @@ use esp_hal::{ use hex_literal::hex; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct TestParams<'a> { prime_fields: &'a [&'a [u8]], nb_loop_mul: usize, diff --git a/hil-test/tests/embassy_interrupt_executor.rs b/hil-test/tests/embassy_interrupt_executor.rs index 72e27b578..dc3a26602 100644 --- a/hil-test/tests/embassy_interrupt_executor.rs +++ b/hil-test/tests/embassy_interrupt_executor.rs @@ -25,6 +25,8 @@ use esp_hal_embassy::Executor; use esp_hal_embassy::InterruptExecutor; use hil_test::mk_static; +esp_bootloader_esp_idf::esp_app_desc!(); + #[embassy_executor::task] async fn responder_task( signal: &'static Signal, diff --git a/hil-test/tests/embassy_interrupt_spi_dma.rs b/hil-test/tests/embassy_interrupt_spi_dma.rs index b6fa2986d..dd33b95e2 100644 --- a/hil-test/tests/embassy_interrupt_spi_dma.rs +++ b/hil-test/tests/embassy_interrupt_spi_dma.rs @@ -27,6 +27,8 @@ use esp_hal_embassy::InterruptExecutor; use hil_test::mk_static; use portable_atomic::AtomicBool; +esp_bootloader_esp_idf::esp_app_desc!(); + static STOP_INTERRUPT_TASK: AtomicBool = AtomicBool::new(false); static INTERRUPT_TASK_WORKING: AtomicBool = AtomicBool::new(false); diff --git a/hil-test/tests/embassy_timers_executors.rs b/hil-test/tests/embassy_timers_executors.rs index 7ff65f66d..507c4fcc3 100644 --- a/hil-test/tests/embassy_timers_executors.rs +++ b/hil-test/tests/embassy_timers_executors.rs @@ -23,6 +23,8 @@ use esp_hal::{ use esp_hal_embassy::InterruptExecutor; use hil_test::mk_static; +esp_bootloader_esp_idf::esp_app_desc!(); + // List of the functions that are ACTUALLY TESTS but are called in the invokers mod test_helpers { use super::*; diff --git a/hil-test/tests/esp_wifi_ble_controller.rs b/hil-test/tests/esp_wifi_ble_controller.rs index 61f1cfc13..3d0a00d80 100644 --- a/hil-test/tests/esp_wifi_ble_controller.rs +++ b/hil-test/tests/esp_wifi_ble_controller.rs @@ -21,6 +21,8 @@ use esp_hal::{clock::CpuClock, peripherals::Peripherals, rng::Rng, timer::timg:: use esp_wifi::ble::controller::BleConnector; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + // Compile-time test to check that esp-wifi can be reinitialized. fn _esp_wifi_can_be_reinited() { let mut p = esp_hal::init(esp_hal::Config::default()); diff --git a/hil-test/tests/esp_wifi_floats.rs b/hil-test/tests/esp_wifi_floats.rs index 67a2af2b2..1c2ffdf72 100644 --- a/hil-test/tests/esp_wifi_floats.rs +++ b/hil-test/tests/esp_wifi_floats.rs @@ -20,6 +20,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + #[inline(never)] fn run_float_calc(x: f32) -> f32 { let result = core::hint::black_box(x) * 2.0; diff --git a/hil-test/tests/esp_wifi_init.rs b/hil-test/tests/esp_wifi_init.rs index 9d23fff3d..881ba3d66 100644 --- a/hil-test/tests/esp_wifi_init.rs +++ b/hil-test/tests/esp_wifi_init.rs @@ -24,6 +24,8 @@ use esp_wifi::InitializationError; use hil_test::mk_static; use static_cell::StaticCell; +esp_bootloader_esp_idf::esp_app_desc!(); + #[embassy_executor::task] async fn try_init( signal: &'static Signal>, diff --git a/hil-test/tests/flip_link.rs b/hil-test/tests/flip_link.rs index 4bd445d99..ac905a4df 100644 --- a/hil-test/tests/flip_link.rs +++ b/hil-test/tests/flip_link.rs @@ -9,6 +9,8 @@ use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + #[cfg(test)] #[embedded_test::tests(default_timeout = 3)] mod tests { diff --git a/hil-test/tests/get_time.rs b/hil-test/tests/get_time.rs index 00e1f76b1..5da71e946 100644 --- a/hil-test/tests/get_time.rs +++ b/hil-test/tests/get_time.rs @@ -9,6 +9,8 @@ use esp_hal::delay::Delay; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { delay: Delay, } diff --git a/hil-test/tests/gpio.rs b/hil-test/tests/gpio.rs index 2540b1ce1..89f286478 100644 --- a/hil-test/tests/gpio.rs +++ b/hil-test/tests/gpio.rs @@ -35,6 +35,8 @@ cfg_if::cfg_if! { } } +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { test_gpio1: AnyPin<'static>, test_gpio2: AnyPin<'static>, diff --git a/hil-test/tests/gpio_custom_handler.rs b/hil-test/tests/gpio_custom_handler.rs index 643d0712f..96942bb75 100644 --- a/hil-test/tests/gpio_custom_handler.rs +++ b/hil-test/tests/gpio_custom_handler.rs @@ -37,6 +37,8 @@ use esp_hal_embassy::InterruptExecutor; use hil_test::mk_static; use portable_atomic::{AtomicUsize, Ordering}; +esp_bootloader_esp_idf::esp_app_desc!(); + #[unsafe(no_mangle)] unsafe extern "C" fn GPIO() { // Prevents binding the default handler, but we need to clear the GPIO diff --git a/hil-test/tests/i2c.rs b/hil-test/tests/i2c.rs index c70a20f65..f3987e1d8 100644 --- a/hil-test/tests/i2c.rs +++ b/hil-test/tests/i2c.rs @@ -19,6 +19,8 @@ use esp_hal::{ use esp_hal_embassy::InterruptExecutor; use hil_test::mk_static; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { interrupt: SoftwareInterrupt<'static, 1>, i2c: I2c<'static, Blocking>, diff --git a/hil-test/tests/i2s.rs b/hil-test/tests/i2s.rs index 324b25fc3..f25e93415 100644 --- a/hil-test/tests/i2s.rs +++ b/hil-test/tests/i2s.rs @@ -29,6 +29,8 @@ cfg_if::cfg_if! { } } +esp_bootloader_esp_idf::esp_app_desc!(); + const BUFFER_SIZE: usize = 2000; #[derive(Clone)] diff --git a/hil-test/tests/i2s_parallel.rs b/hil-test/tests/i2s_parallel.rs index 3fea79635..97e07756a 100644 --- a/hil-test/tests/i2s_parallel.rs +++ b/hil-test/tests/i2s_parallel.rs @@ -14,6 +14,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + #[cfg(test)] #[embedded_test::tests(default_timeout = 3, executor = hil_test::Executor::new())] mod tests { diff --git a/hil-test/tests/init.rs b/hil-test/tests/init.rs index 3c8856eca..2cead0b00 100644 --- a/hil-test/tests/init.rs +++ b/hil-test/tests/init.rs @@ -17,6 +17,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + #[cfg(test)] #[embedded_test::tests(default_timeout = 3)] mod tests { diff --git a/hil-test/tests/interrupt.rs b/hil-test/tests/interrupt.rs index 48f5e5593..482b9dd91 100644 --- a/hil-test/tests/interrupt.rs +++ b/hil-test/tests/interrupt.rs @@ -23,6 +23,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + static SWINT0: Mutex>>> = Mutex::new(RefCell::new(None)); #[allow(unused)] // TODO: Remove attribute when interrupt latency test re-enabled diff --git a/hil-test/tests/lcd_cam.rs b/hil-test/tests/lcd_cam.rs index 85fbceaf7..9b2a4a142 100644 --- a/hil-test/tests/lcd_cam.rs +++ b/hil-test/tests/lcd_cam.rs @@ -26,6 +26,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { peripherals: Peripherals, dma_tx_buf: DmaTxBuf, diff --git a/hil-test/tests/lcd_cam_i8080.rs b/hil-test/tests/lcd_cam_i8080.rs index 95ad7e956..b2a1542aa 100644 --- a/hil-test/tests/lcd_cam_i8080.rs +++ b/hil-test/tests/lcd_cam_i8080.rs @@ -25,6 +25,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + const DATA_SIZE: usize = 1024 * 10; #[allow(non_snake_case)] diff --git a/hil-test/tests/lcd_cam_i8080_async.rs b/hil-test/tests/lcd_cam_i8080_async.rs index 22ff19267..38b1ab56b 100644 --- a/hil-test/tests/lcd_cam_i8080_async.rs +++ b/hil-test/tests/lcd_cam_i8080_async.rs @@ -20,6 +20,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + const DATA_SIZE: usize = 1024 * 10; struct Context<'d> { diff --git a/hil-test/tests/parl_io.rs b/hil-test/tests/parl_io.rs index deedc15b5..9316fae98 100644 --- a/hil-test/tests/parl_io.rs +++ b/hil-test/tests/parl_io.rs @@ -37,6 +37,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { parl_io: PARL_IO<'static>, dma_channel: DMA_CH0<'static>, diff --git a/hil-test/tests/parl_io_tx.rs b/hil-test/tests/parl_io_tx.rs index 8e740b1a6..1b7b2fdd2 100644 --- a/hil-test/tests/parl_io_tx.rs +++ b/hil-test/tests/parl_io_tx.rs @@ -34,6 +34,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { parl_io: PARL_IO<'static>, dma_channel: DMA_CH0<'static>, diff --git a/hil-test/tests/parl_io_tx_async.rs b/hil-test/tests/parl_io_tx_async.rs index ae05808e2..7da5e02df 100644 --- a/hil-test/tests/parl_io_tx_async.rs +++ b/hil-test/tests/parl_io_tx_async.rs @@ -34,6 +34,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { parl_io: PARL_IO<'static>, dma_channel: DMA_CH0<'static>, diff --git a/hil-test/tests/pcnt.rs b/hil-test/tests/pcnt.rs index 9cbf6b64e..a3c88c88f 100644 --- a/hil-test/tests/pcnt.rs +++ b/hil-test/tests/pcnt.rs @@ -20,6 +20,8 @@ struct Context<'d> { delay: Delay, } +esp_bootloader_esp_idf::esp_app_desc!(); + #[cfg(test)] #[embedded_test::tests(default_timeout = 3)] mod tests { diff --git a/hil-test/tests/qspi.rs b/hil-test/tests/qspi.rs index badc81d61..9059f8433 100644 --- a/hil-test/tests/qspi.rs +++ b/hil-test/tests/qspi.rs @@ -22,6 +22,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + cfg_if::cfg_if! { if #[cfg(pdma)] { type DmaChannel0<'d> = esp_hal::peripherals::DMA_SPI2<'d>; diff --git a/hil-test/tests/rmt.rs b/hil-test/tests/rmt.rs index 97ae1584f..73eb45e92 100644 --- a/hil-test/tests/rmt.rs +++ b/hil-test/tests/rmt.rs @@ -15,6 +15,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + cfg_if::cfg_if! { if #[cfg(esp32h2)] { const FREQ: Rate = Rate::from_mhz(32); diff --git a/hil-test/tests/rsa.rs b/hil-test/tests/rsa.rs index 0e9d040e9..ba9ce873c 100644 --- a/hil-test/tests/rsa.rs +++ b/hil-test/tests/rsa.rs @@ -19,6 +19,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + const BIGNUM_1: U512 = Uint::from_be_hex( "c7f61058f96db3bd87dbab08ab03b4f7f2f864eac249144adea6a65f97803b719d8ca980b7b3c0389c1c7c6\ 7dc353c5e0ec11f5fc8ce7f6073796cc8f73fa878", diff --git a/hil-test/tests/rsa_async.rs b/hil-test/tests/rsa_async.rs index 4ee6e0fcd..f960c931d 100644 --- a/hil-test/tests/rsa_async.rs +++ b/hil-test/tests/rsa_async.rs @@ -19,6 +19,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + const BIGNUM_1: U512 = Uint::from_be_hex( "c7f61058f96db3bd87dbab08ab03b4f7f2f864eac249144adea6a65f97803b719d8ca980b7b3c0389c1c7c6\ 7dc353c5e0ec11f5fc8ce7f6073796cc8f73fa878", diff --git a/hil-test/tests/sha.rs b/hil-test/tests/sha.rs index 3ecde6629..81684a712 100644 --- a/hil-test/tests/sha.rs +++ b/hil-test/tests/sha.rs @@ -22,6 +22,8 @@ use esp_hal::{ use hil_test as _; use nb::block; +esp_bootloader_esp_idf::esp_app_desc!(); + /// Dummy data used to feed the hasher. const SOURCE_DATA: &[u8] = &[b'a'; 258]; diff --git a/hil-test/tests/spi_full_duplex.rs b/hil-test/tests/spi_full_duplex.rs index 4439b4de7..eb872c76e 100644 --- a/hil-test/tests/spi_full_duplex.rs +++ b/hil-test/tests/spi_full_duplex.rs @@ -21,6 +21,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + cfg_if::cfg_if! { if #[cfg(feature = "unstable")] { use esp_hal::{ diff --git a/hil-test/tests/spi_half_duplex_read.rs b/hil-test/tests/spi_half_duplex_read.rs index 419ae6537..b2fd2f2f1 100644 --- a/hil-test/tests/spi_half_duplex_read.rs +++ b/hil-test/tests/spi_half_duplex_read.rs @@ -20,6 +20,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { spi: SpiDma<'static, Blocking>, miso_mirror: Output<'static>, diff --git a/hil-test/tests/spi_half_duplex_write.rs b/hil-test/tests/spi_half_duplex_write.rs index 003aa9e7f..f92fe12ed 100644 --- a/hil-test/tests/spi_half_duplex_write.rs +++ b/hil-test/tests/spi_half_duplex_write.rs @@ -21,6 +21,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { spi: SpiDma<'static, Blocking>, pcnt_unit: Unit<'static, 0>, diff --git a/hil-test/tests/spi_half_duplex_write_psram.rs b/hil-test/tests/spi_half_duplex_write_psram.rs index 94ef9a831..9918df5f5 100644 --- a/hil-test/tests/spi_half_duplex_write_psram.rs +++ b/hil-test/tests/spi_half_duplex_write_psram.rs @@ -26,6 +26,8 @@ use esp_hal::{ use hil_test as _; extern crate alloc; +esp_bootloader_esp_idf::esp_app_desc!(); + macro_rules! dma_alloc_buffer { ($size:expr, $align:expr) => {{ let layout = core::alloc::Layout::from_size_align($size, $align).unwrap(); diff --git a/hil-test/tests/spi_slave.rs b/hil-test/tests/spi_slave.rs index 4700c8a92..14cd99d20 100644 --- a/hil-test/tests/spi_slave.rs +++ b/hil-test/tests/spi_slave.rs @@ -18,6 +18,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + cfg_if::cfg_if! { if #[cfg(any(esp32, esp32s2))] { type DmaChannel<'d> = esp_hal::peripherals::DMA_SPI2<'d>; diff --git a/hil-test/tests/storage_read_app_desc.rs b/hil-test/tests/storage_read_app_desc.rs index f39dafba9..48f49a0e1 100644 --- a/hil-test/tests/storage_read_app_desc.rs +++ b/hil-test/tests/storage_read_app_desc.rs @@ -10,7 +10,6 @@ use embedded_storage::ReadStorage; use esp_storage::FlashStorage; use hil_test as _; - #[repr(C)] pub struct EspAppDesc { pub magic_word: u32, // Magic word ESP_APP_DESC_MAGIC_WORD diff --git a/hil-test/tests/systimer.rs b/hil-test/tests/systimer.rs index 9a2e8b657..9031eddb0 100644 --- a/hil-test/tests/systimer.rs +++ b/hil-test/tests/systimer.rs @@ -25,6 +25,8 @@ use esp_hal::{ use hil_test as _; use portable_atomic::{AtomicUsize, Ordering}; +esp_bootloader_esp_idf::esp_app_desc!(); + static ALARM_TARGET: Mutex>>> = Mutex::new(RefCell::new(None)); static ALARM_PERIODIC: Mutex>>> = diff --git a/hil-test/tests/twai.rs b/hil-test/tests/twai.rs index e2cc6647e..f94b5a6aa 100644 --- a/hil-test/tests/twai.rs +++ b/hil-test/tests/twai.rs @@ -14,6 +14,8 @@ use esp_hal::{ use hil_test as _; use nb::block; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { twai: twai::Twai<'static, Blocking>, } diff --git a/hil-test/tests/uart.rs b/hil-test/tests/uart.rs index 33ee46966..3a5ea4a22 100644 --- a/hil-test/tests/uart.rs +++ b/hil-test/tests/uart.rs @@ -14,6 +14,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { uart0: Uart<'static, Blocking>, uart1: Uart<'static, Blocking>, diff --git a/hil-test/tests/uart_async.rs b/hil-test/tests/uart_async.rs index 8b7a1289d..a6dd89621 100644 --- a/hil-test/tests/uart_async.rs +++ b/hil-test/tests/uart_async.rs @@ -19,6 +19,8 @@ use esp_hal::{ use esp_hal_embassy::InterruptExecutor; use hil_test::mk_static; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { interrupt: SoftwareInterrupt<'static, 1>, uart: Uart<'static, Async>, diff --git a/hil-test/tests/uart_regression.rs b/hil-test/tests/uart_regression.rs index 5312ab103..9c546be5b 100644 --- a/hil-test/tests/uart_regression.rs +++ b/hil-test/tests/uart_regression.rs @@ -6,6 +6,8 @@ #![no_std] #![no_main] +esp_bootloader_esp_idf::esp_app_desc!(); + #[cfg(test)] #[embedded_test::tests(default_timeout = 3)] mod tests { diff --git a/hil-test/tests/uart_tx_rx_async.rs b/hil-test/tests/uart_tx_rx_async.rs index ec1b9e806..58ca08a78 100644 --- a/hil-test/tests/uart_tx_rx_async.rs +++ b/hil-test/tests/uart_tx_rx_async.rs @@ -12,6 +12,8 @@ use esp_hal::{ }; use hil_test as _; +esp_bootloader_esp_idf::esp_app_desc!(); + struct Context { rx: UartRx<'static, Async>, tx: UartTx<'static, Async>, diff --git a/hil-test/tests/usb_serial_jtag.rs b/hil-test/tests/usb_serial_jtag.rs index ef04d1bb8..28d128448 100644 --- a/hil-test/tests/usb_serial_jtag.rs +++ b/hil-test/tests/usb_serial_jtag.rs @@ -12,6 +12,8 @@ mod tests { use esp_hal::usb_serial_jtag::UsbSerialJtag; use hil_test as _; + esp_bootloader_esp_idf::esp_app_desc!(); + #[test] fn creating_peripheral_does_not_break_debug_connection() { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/Cargo.toml b/qa-test/Cargo.toml index db51f0586..545718c83 100644 --- a/qa-test/Cargo.toml +++ b/qa-test/Cargo.toml @@ -15,6 +15,7 @@ embedded-graphics = "0.8.1" embedded-hal-async = "1.0.0" esp-alloc = { path = "../esp-alloc" } esp-backtrace = { path = "../esp-backtrace", features = ["exception-handler", "panic-handler", "println"] } +esp-bootloader-esp-idf = { path = "../esp-bootloader-esp-idf" } esp-hal = { path = "../esp-hal", features = ["unstable", "log-04"] } esp-hal-embassy = { path = "../esp-hal-embassy" } esp-println = { path = "../esp-println", features = ["log-04"] } diff --git a/qa-test/src/bin/embassy_adc.rs b/qa-test/src/bin/embassy_adc.rs index be9d917b6..90c89f117 100644 --- a/qa-test/src/bin/embassy_adc.rs +++ b/qa-test/src/bin/embassy_adc.rs @@ -18,6 +18,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[esp_hal_embassy::main] async fn main(_spawner: Spawner) { esp_println::logger::init_logger_from_env(); diff --git a/qa-test/src/bin/embassy_executor_benchmark.rs b/qa-test/src/bin/embassy_executor_benchmark.rs index 2240cfc1c..0e30858fb 100644 --- a/qa-test/src/bin/embassy_executor_benchmark.rs +++ b/qa-test/src/bin/embassy_executor_benchmark.rs @@ -21,6 +21,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + static mut COUNTER: u32 = 0; static mut T2_COUNTER: u32 = 0; static mut T3_COUNTER: u32 = 0; diff --git a/qa-test/src/bin/embassy_i2c.rs b/qa-test/src/bin/embassy_i2c.rs index 1b8f25292..944043f3c 100644 --- a/qa-test/src/bin/embassy_i2c.rs +++ b/qa-test/src/bin/embassy_i2c.rs @@ -25,6 +25,8 @@ use esp_hal::{ }; use lis3dh_async::{Lis3dh, Range, SlaveAddr}; +esp_bootloader_esp_idf::esp_app_desc!(); + #[esp_hal_embassy::main] async fn main(_spawner: Spawner) { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/embassy_i2c_bmp180_calibration_data.rs b/qa-test/src/bin/embassy_i2c_bmp180_calibration_data.rs index 05df33f4e..f075c200f 100644 --- a/qa-test/src/bin/embassy_i2c_bmp180_calibration_data.rs +++ b/qa-test/src/bin/embassy_i2c_bmp180_calibration_data.rs @@ -25,6 +25,8 @@ use esp_hal::{ timer::timg::TimerGroup, }; +esp_bootloader_esp_idf::esp_app_desc!(); + #[esp_hal_embassy::main] async fn main(_spawner: Spawner) { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/embassy_i2s_read.rs b/qa-test/src/bin/embassy_i2s_read.rs index 3e77060a0..c70db44d2 100644 --- a/qa-test/src/bin/embassy_i2s_read.rs +++ b/qa-test/src/bin/embassy_i2s_read.rs @@ -26,6 +26,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[esp_hal_embassy::main] async fn main(_spawner: Spawner) { println!("Init!"); diff --git a/qa-test/src/bin/embassy_i2s_sound.rs b/qa-test/src/bin/embassy_i2s_sound.rs index 12ce143a2..872aadff8 100644 --- a/qa-test/src/bin/embassy_i2s_sound.rs +++ b/qa-test/src/bin/embassy_i2s_sound.rs @@ -40,6 +40,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + const SINE: [i16; 64] = [ 0, 3211, 6392, 9511, 12539, 15446, 18204, 20787, 23169, 25329, 27244, 28897, 30272, 31356, 32137, 32609, 32767, 32609, 32137, 31356, 30272, 28897, 27244, 25329, 23169, 20787, 18204, diff --git a/qa-test/src/bin/gpio_interrupt_latency.rs b/qa-test/src/bin/gpio_interrupt_latency.rs index d50fedbc7..458a32067 100644 --- a/qa-test/src/bin/gpio_interrupt_latency.rs +++ b/qa-test/src/bin/gpio_interrupt_latency.rs @@ -27,6 +27,8 @@ use esp_hal::{ timer::timg::TimerGroup, }; +esp_bootloader_esp_idf::esp_app_desc!(); + static SIGNAL: Signal = Signal::new(); #[esp_hal_embassy::main] diff --git a/qa-test/src/bin/i2c_bmp180_calibration_data.rs b/qa-test/src/bin/i2c_bmp180_calibration_data.rs index 23a2da989..60e5acb53 100644 --- a/qa-test/src/bin/i2c_bmp180_calibration_data.rs +++ b/qa-test/src/bin/i2c_bmp180_calibration_data.rs @@ -19,6 +19,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/i2c_display.rs b/qa-test/src/bin/i2c_display.rs index 11570e56c..7c0802d43 100644 --- a/qa-test/src/bin/i2c_display.rs +++ b/qa-test/src/bin/i2c_display.rs @@ -30,6 +30,8 @@ use esp_hal::{ }; use ssd1306::{I2CDisplayInterface, Ssd1306, prelude::*}; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/lcd_cam_ov2640.rs b/qa-test/src/bin/lcd_cam_ov2640.rs index 87b5d0dc0..8b7824448 100644 --- a/qa-test/src/bin/lcd_cam_ov2640.rs +++ b/qa-test/src/bin/lcd_cam_ov2640.rs @@ -43,6 +43,8 @@ use esp_hal::{ }; use esp_println::{print, println}; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/lcd_dpi.rs b/qa-test/src/bin/lcd_dpi.rs index f92323f97..73a7ddc41 100644 --- a/qa-test/src/bin/lcd_dpi.rs +++ b/qa-test/src/bin/lcd_dpi.rs @@ -53,6 +53,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { esp_println::logger::init_logger_from_env(); diff --git a/qa-test/src/bin/lcd_i8080.rs b/qa-test/src/bin/lcd_i8080.rs index 60480f29f..1b492c0b9 100644 --- a/qa-test/src/bin/lcd_i8080.rs +++ b/qa-test/src/bin/lcd_i8080.rs @@ -38,6 +38,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { esp_println::logger::init_logger_from_env(); diff --git a/qa-test/src/bin/psram.rs b/qa-test/src/bin/psram.rs index 43315dcbe..af2d81fc5 100644 --- a/qa-test/src/bin/psram.rs +++ b/qa-test/src/bin/psram.rs @@ -20,6 +20,8 @@ use esp_backtrace as _; use esp_hal::{main, psram}; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + fn init_psram_heap(start: *mut u8, size: usize) { unsafe { esp_alloc::HEAP.add_region(esp_alloc::HeapRegion::new( diff --git a/qa-test/src/bin/qspi_flash.rs b/qa-test/src/bin/qspi_flash.rs index 107243cd4..a5a3326dc 100644 --- a/qa-test/src/bin/qspi_flash.rs +++ b/qa-test/src/bin/qspi_flash.rs @@ -43,6 +43,8 @@ use esp_hal::{ }; use esp_println::{print, println}; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/ram.rs b/qa-test/src/bin/ram.rs index 09d568547..32a7fecee 100644 --- a/qa-test/src/bin/ram.rs +++ b/qa-test/src/bin/ram.rs @@ -21,6 +21,8 @@ use esp_backtrace as _; use esp_hal::{delay::Delay, main, ram, rtc_cntl::Rtc, time::Duration}; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[ram(rtc_fast)] static mut SOME_INITED_DATA: [u8; 2] = [0xaa, 0xbb]; diff --git a/qa-test/src/bin/sleep_timer.rs b/qa-test/src/bin/sleep_timer.rs index 4719d956c..bebdd350d 100644 --- a/qa-test/src/bin/sleep_timer.rs +++ b/qa-test/src/bin/sleep_timer.rs @@ -16,6 +16,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/sleep_timer_ext0.rs b/qa-test/src/bin/sleep_timer_ext0.rs index 534056c53..1b18260f6 100644 --- a/qa-test/src/bin/sleep_timer_ext0.rs +++ b/qa-test/src/bin/sleep_timer_ext0.rs @@ -26,6 +26,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/sleep_timer_ext1.rs b/qa-test/src/bin/sleep_timer_ext1.rs index 3623efb5a..84475d8ae 100644 --- a/qa-test/src/bin/sleep_timer_ext1.rs +++ b/qa-test/src/bin/sleep_timer_ext1.rs @@ -26,6 +26,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/sleep_timer_lpio.rs b/qa-test/src/bin/sleep_timer_lpio.rs index 4aa619a04..3cf9963ca 100644 --- a/qa-test/src/bin/sleep_timer_lpio.rs +++ b/qa-test/src/bin/sleep_timer_lpio.rs @@ -27,6 +27,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/sleep_timer_rtcio.rs b/qa-test/src/bin/sleep_timer_rtcio.rs index b556564a5..5a62d2e47 100644 --- a/qa-test/src/bin/sleep_timer_rtcio.rs +++ b/qa-test/src/bin/sleep_timer_rtcio.rs @@ -32,6 +32,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { let peripherals = esp_hal::init(esp_hal::Config::default()); diff --git a/qa-test/src/bin/spi_halfduplex_read_manufacturer_id.rs b/qa-test/src/bin/spi_halfduplex_read_manufacturer_id.rs index 278421285..45654be32 100644 --- a/qa-test/src/bin/spi_halfduplex_read_manufacturer_id.rs +++ b/qa-test/src/bin/spi_halfduplex_read_manufacturer_id.rs @@ -41,6 +41,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { esp_println::logger::init_logger_from_env(); diff --git a/qa-test/src/bin/temperature_sensor.rs b/qa-test/src/bin/temperature_sensor.rs index f9d62f468..c29257abb 100644 --- a/qa-test/src/bin/temperature_sensor.rs +++ b/qa-test/src/bin/temperature_sensor.rs @@ -14,6 +14,8 @@ use esp_hal::{ }; use esp_println::println; +esp_bootloader_esp_idf::esp_app_desc!(); + #[main] fn main() -> ! { esp_println::logger::init_logger_from_env();