Update heap allocation (#252)

* feat: Update heap allocation

* docs: Update changelog

Author: SergioGasquez

CHANGELOG.md

@@ -12,10 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Updated `embedded-test` dependency to 0.7.0 (#251)
+- Use `esp_hal::ram(reclaimed)` attribute for heap allocator (#252)
 
 ### Fixed
 
 - Add App Descriptor macro to tests (#251)
+- ESP32 `dram2` size (#252)
 
 ### Removed
 

src/main.rs

@@ -231,7 +231,7 @@ fn main() -> Result<()> {
     // based on esp32 linker scripts
     // TODO: add this to esp-metadata
     let max_dram2 = match chip {
-        Chip::Esp32 => 98767,
+        Chip::Esp32 => 98768,
         Chip::Esp32c2 => 66416, // 0x3fcdeb70 -0x3fcce800
         Chip::Esp32c3 => 66320, // 0x3fcde710 - 3fcce400
         Chip::Esp32c6 => 65536, // 0x4087e610 - 0x4086e610

src/tui.rs

@@ -8,9 +8,9 @@ use esp_generate::{
 };
 use esp_metadata::Chip;
 use ratatui::crossterm::{
-    event::{self, Event, KeyCode, KeyEventKind},
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
     ExecutableCommand,
+    event::{self, Event, KeyCode, KeyEventKind},
+    terminal::{EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode},
 };
 use ratatui::{prelude::*, style::palette::tailwind, widgets::*};
 
@@ -290,7 +290,7 @@ impl App<'_> {
                     match key.code {
                         Char('q') => self.confirm_quit = true,
                         Char('s') | Char('S') => {
-                            return Ok(Some(self.repository.config.selected.clone()))
+                            return Ok(Some(self.repository.config.selected.clone()));
                         }
                         Esc => {
                             if self.state.len() == 1 {

template/src/bin/async_main.rs

@@ -77,7 +77,7 @@ async fn main(spawner: Spawner) -> ! {
 
     //IF option("alloc")
     //REPLACE 65536 max-dram2-uninit
-    esp_alloc::heap_allocator!(#[unsafe(link_section = ".dram2_uninit")] size: 65536);
+    esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 65536);
     //IF option("wifi") && (option("ble-bleps") || option("ble-trouble"))
     // COEX needs more RAM - so we've added some more
     esp_alloc::heap_allocator!(size: 64 * 1024);
@@ -88,9 +88,10 @@ async fn main(spawner: Spawner) -> ! {
     //IF option("esp32") || option("esp32s2") || option("esp32s3")
     esp_rtos::start(timg0.timer0);
     //ELSE
-    let sw_interrupt = esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
+    let sw_interrupt =
+        esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
     esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
-    //ENDIF 
+    //ENDIF
 
     //IF option("defmt") || option("log")
     info!("Embassy initialized!");
@@ -99,12 +100,12 @@ async fn main(spawner: Spawner) -> ! {
     //ENDIF
 
     //IF option("ble-trouble") || option("ble-bleps") || option("wifi")
-    let radio_init = esp_radio::init()
-    .expect("Failed to initialize Wi-Fi/BLE controller");
+    let radio_init = esp_radio::init().expect("Failed to initialize Wi-Fi/BLE controller");
     //ENDIF
     //IF option("wifi")
-    let (mut _wifi_controller, _interfaces) = esp_radio::wifi::new(&radio_init, peripherals.WIFI, Default::default())
-        .expect("Failed to initialize Wi-Fi controller");
+    let (mut _wifi_controller, _interfaces) =
+        esp_radio::wifi::new(&radio_init, peripherals.WIFI, Default::default())
+            .expect("Failed to initialize Wi-Fi controller");
     //ENDIF
     //IF option("ble-trouble")
     // find more examples https://github.com/embassy-rs/trouble/tree/main/examples/esp32

template/src/bin/main.rs

@@ -73,7 +73,7 @@ fn main() -> ! {
 
     //IF option("alloc")
     //REPLACE 65536 max-dram2-uninit
-    esp_alloc::heap_allocator!(#[unsafe(link_section = ".dram2_uninit")] size: 65536);
+    esp_alloc::heap_allocator!(#[esp_hal::ram(reclaimed)] size: 65536);
     //IF option("wifi") && (option("ble-bleps") || option("ble-trouble"))
     // COEX needs more RAM - so we've added some more
     esp_alloc::heap_allocator!(size: 64 * 1024);
@@ -85,15 +85,16 @@ fn main() -> ! {
     //IF option("esp32") || option("esp32s2") || option("esp32s3")
     esp_rtos::start(timg0.timer0);
     //ELSE
-    let sw_interrupt = esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
+    let sw_interrupt =
+        esp_hal::interrupt::software::SoftwareInterruptControl::new(peripherals.SW_INTERRUPT);
     esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
-    //ENDIF 
-    let radio_init = esp_radio::init()
-        .expect("Failed to initialize Wi-Fi/BLE controller");
+    //ENDIF
+    let radio_init = esp_radio::init().expect("Failed to initialize Wi-Fi/BLE controller");
     //ENDIF
     //IF option("wifi")
-    let (mut _wifi_controller, _interfaces) = esp_radio::wifi::new(&radio_init, peripherals.WIFI, Default::default())
-        .expect("Failed to initialize Wi-Fi controller");
+    let (mut _wifi_controller, _interfaces) =
+        esp_radio::wifi::new(&radio_init, peripherals.WIFI, Default::default())
+            .expect("Failed to initialize Wi-Fi controller");
     //ENDIF
     //IF option("ble-bleps")
     let _connector = BleConnector::new(&radio_init, peripherals.BT, Default::default());

xtask/src/main.rs

@@ -4,10 +4,10 @@ use std::{
     process::{Command, Stdio},
 };
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::{Parser, Subcommand};
 use esp_generate::{
-    config::{find_option, ActiveConfiguration},
+    config::{ActiveConfiguration, find_option},
     template::{GeneratorOptionCategory, GeneratorOptionItem, Template},
 };
 use esp_metadata::Chip;