From 419a5e31b4b5d4bb9ae679bd458260258ba76d5c Mon Sep 17 00:00:00 2001
From: c0smic <ZiradielR13@proton.me>
Date: Thu, 18 Jun 2026 04:49:39 -0400
Subject: [PATCH] feat(ui): add dual-core task monitor in status bar and CPU
 info in device screen

drawDualCoreInfo() displays live C0:C1 task counts on the status bar, updated on each frame. Device info screen now shows CPU model, revision, core count, frequency, and core affinity breakdown.
---
 src/core/display.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++-
 src/core/utils.cpp   |  8 ++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/src/core/display.cpp b/src/core/display.cpp
index aebbf901a2..b94eb0e01f 100644
--- a/src/core/display.cpp
+++ b/src/core/display.cpp
@@ -802,6 +802,44 @@ void drawSubmenu(int index, std::vector<Option> &options, const char *title) {
 #endif
 }
 
+static void drawDualCoreInfo() {
+    UBaseType_t taskCount = uxTaskGetNumberOfTasks();
+    if (taskCount == 0 || taskCount > 64) {
+        uint16_t x = tftWidth - 72;
+        tft.fillRect(x - 2, 7, 60, 18, bruceConfig.bgColor);
+        setTftDisplay(x, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
+        tft.drawString("C0:C1", x, 12, 1);
+        return;
+    }
+    size_t sz = sizeof(TaskStatus_t) * taskCount;
+    TaskStatus_t *arr = (TaskStatus_t *)malloc(sz);
+    if (!arr) return;
+    uint32_t rt;
+    UBaseType_t n = uxTaskGetSystemState(arr, taskCount, &rt);
+    int c0 = 0, c1 = 0;
+    for (UBaseType_t i = 0; i < n && i < taskCount; i++) {
+#if (configCORECOUNT > 1)
+        if (arr[i].xCoreID == 0) c0++;
+        else if (arr[i].xCoreID == 1) c1++;
+#else
+        (void)c1; c0++;
+#endif
+    }
+    free(arr);
+    char buf[20];
+    int w;
+#if (configCORECOUNT > 1)
+    w = snprintf(buf, sizeof(buf), "C0:%d C1:%d", c0, c1);
+#else
+    w = snprintf(buf, sizeof(buf), "C0:%d", c0);
+#endif
+    w *= 6;
+    uint16_t x = tftWidth - w - 10;
+    tft.fillRect(x - 2, 7, w + 4, 18, bruceConfig.bgColor);
+    setTftDisplay(x, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
+    tft.drawString(buf, x, 12, 1);
+}
+
 void drawStatusBar() {
     uint8_t bat = getBattery();
     if (bat > 0) drawBatteryStatus(bat);
@@ -844,7 +882,14 @@ void drawStatusBar() {
         const int IH  = 16;
         const int GAP = 6;
         int totalW = iconCount * IW + (iconCount - 1) * GAP;
-        int sx = (tftWidth - totalW) / 2;
+
+        // Reserve right-side space for drawDualCoreInfo (called after icons)
+        // "C0:99 C1:99" = 12 chars x 6px = 72px; use 80px safe estimate
+        int coreInfoReserve = 80;
+        int availIconW = tftWidth - coreInfoReserve - 10;
+        int sx = (availIconW - totalW) / 2;
+        if (sx < 5) sx = 5;
+
         int iy = 7;
         int idx = 0;
 
@@ -885,6 +930,8 @@ void drawStatusBar() {
             idx++;
         }
     }
+
+    drawDualCoreInfo();
 }
 
 void drawMainBorder(bool clear) {
diff --git a/src/core/utils.cpp b/src/core/utils.cpp
index 433cd8b126..e20ebc2e37 100644
--- a/src/core/utils.cpp
+++ b/src/core/utils.cpp
@@ -123,6 +123,14 @@ void showDeviceInfo() {
         area.addLine("Free PSRAM: " + formatBytes(ESP.getFreePsram()));
     }
     area.addLine("");
+    area.addLine("[CPU]");
+    area.addLine("Model: " + String(ESP.getChipModel()));
+    area.addLine("Revision: v" + String(ESP.getChipRevision()));
+    area.addLine("Cores: 2 (PRO_CPU + APP_CPU)");
+    area.addLine("Freq: " + String(ESP.getCpuFreqMHz()) + " MHz");
+    area.addLine("Core 0 (PRO): Input, WiFi, BLE, Serial, RF");
+    area.addLine("Core 1 (APP): UI / Menu / Display");
+    area.addLine("");
     area.addLine("[NETWORK]");
     area.addLine("MAC addr: " + String(WiFi.macAddress()));
     String localIP = WiFi.localIP().toString();