Skip to content

feat(ui): add dual-core task monitor in status bar and CPU info in device screen #2563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
r13xr13 wants to merge 1 commit into from
+56 −1
Closed

feat(ui): add dual-core task monitor in status bar and CPU info in device screen #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion src/core/display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -885,6 +930,8 @@ void drawStatusBar() {
idx++;
}
}

drawDualCoreInfo();
}

void drawMainBorder(bool clear) {
Expand Down
8 changes: 8 additions & 0 deletions src/core/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down