From b9789b89ac30972520ef54c0b8800ef25bf0d6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Hlusi=C4=8Dka?= <Limeth@users.noreply.github.com>
Date: Sat, 27 Dec 2025 23:51:46 +0100
Subject: [PATCH] Use RTOS executor for second core

---
 firmware2/src/main.rs | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/firmware2/src/main.rs b/firmware2/src/main.rs
index e127528..a76428a 100644
--- a/firmware2/src/main.rs
+++ b/firmware2/src/main.rs
@@ -34,7 +34,7 @@ use esp_hal::uart::Uart;
 use esp_hal::{Blocking, ram};
 use esp_radio::Controller;
 use esp_radio::ble::controller::BleConnector;
-use esp_rtos::embassy::InterruptExecutor;
+use esp_rtos::embassy::{Executor, InterruptExecutor};
 use esp_storage::FlashStorage;
 use itertools::chain;
 use log::{error, info};
@@ -239,18 +239,17 @@ async fn main(_spawner: Spawner) {
         software_interrupt.software_interrupt1,
         second_core_stack,
         move || {
-            static EXECUTOR: StaticCell<InterruptExecutor<2>> = StaticCell::new();
-            let exec = EXECUTOR.init(InterruptExecutor::new(
-                software_interrupt.software_interrupt2,
-            ));
-            let spawner = exec.start(Priority::Priority3);
-            spawner.must_spawn(run_lcd_task(st7701s));
-            // static EXECUTOR: StaticCell<Executor> = StaticCell::new();
-            // let executor: &mut Executor = EXECUTOR.init(Executor::new());
-            // executor.run(|spawner| {
-            //     let task = run_lcd_task(st7701s);
-            //     spawner.must_spawn(task);
-            // });
+            // static EXECUTOR: StaticCell<InterruptExecutor<2>> = StaticCell::new();
+            // let exec = EXECUTOR.init(InterruptExecutor::new(
+            //     software_interrupt.software_interrupt2,
+            // ));
+            // let spawner = exec.start(Priority::Priority3);
+            // spawner.must_spawn(run_lcd_task(st7701s));
+            static EXECUTOR: StaticCell<Executor> = StaticCell::new();
+            let executor: &mut Executor = EXECUTOR.init(Executor::new());
+            executor.run(|spawner| {
+                spawner.must_spawn(run_lcd_task(st7701s));
+            });
         },
     );
 
@@ -267,7 +266,7 @@ async fn main(_spawner: Spawner) {
             &stack,
             &mut storage,
             rmk_config,
-        )  // run_lcd(st7701s)
+        )  //, run_lcd(st7701s)
     ]
     .await;
 }