fix: esp32 build

feat: mark ota valid after more operations

Author: filipton

src/board.rs

@@ -60,8 +60,6 @@ impl Board {
     pub fn init(peripherals: Peripherals) -> Result<Board> {
         use embedded_hal::digital::OutputPin;
 
-        esp_alloc::heap_allocator!(size: 120 * 1024);
-
         let timg0 = TimerGroup::new(peripherals.TIMG0);
         let timg1 = TimerGroup::new(peripherals.TIMG1);
         let rng = Rng::new(peripherals.RNG);

src/main.rs

@@ -67,18 +67,9 @@ async fn main(spawner: Spawner) {
         config
     });
 
-    set_brownout_detection(false);
-    let board = Board::init(peripherals).expect("Board init error");
-    {
-        if let Ok(mut ota) = esp_hal_ota::Ota::new(FlashStorage::new()) {
-            let res = ota.ota_mark_app_valid();
-            if let Err(e) = res {
-                log::error!("Ota mark app valid failed: {e:?}");
-            }
-        }
-    }
+    #[cfg(not(feature = "esp32"))]
+    esp_alloc::heap_allocator!(size: 120 * 1024);
 
-    // second heap init
     {
         #[cfg(feature = "esp32")]
         const HEAP_SIZE: usize = 90 * 1024;
@@ -100,6 +91,9 @@ async fn main(spawner: Spawner) {
         }
     }
 
+    set_brownout_detection(false);
+    let board = Board::init(peripherals).expect("Board init error");
+
     FkmLogger::set_logger();
     esp_hal_embassy::init(board.timg1.timer0);
 
@@ -110,6 +104,16 @@ async fn main(spawner: Spawner) {
     let global_state = Rc::new(GlobalStateInner::new(&nvs));
     let wifi_setup_sig = Rc::new(Signal::new());
 
+    // mark ota as valid
+    {
+        if let Ok(mut ota) = esp_hal_ota::Ota::new(FlashStorage::new()) {
+            let res = ota.ota_mark_app_valid();
+            if let Err(e) = res {
+                log::error!("Ota mark app valid failed: {e:?}");
+            }
+        }
+    }
+
     _ = spawner.spawn(lcd::lcd_task(
         board.lcd,
         global_state.clone(),