From efb5fc0cc27e08104f6c993f58478bf68b055703 Mon Sep 17 00:00:00 2001 From: Jacopo De Simoi Date: Thu, 27 Jun 2024 23:41:55 -0400 Subject: [PATCH] [CPUMeter] Put Kernel CPU first --- CPUMeter.c | 9 +++++---- CPUMeter.h | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CPUMeter.c b/CPUMeter.c index 1ddc29b5..a8723a24 100644 --- a/CPUMeter.c +++ b/CPUMeter.c @@ -26,9 +26,9 @@ in the source distribution for its full text. static const int CPUMeter_attributes[] = { - CPU_NICE, - CPU_NORMAL, CPU_SYSTEM, + CPU_NORMAL, + CPU_NICE, CPU_IRQ, CPU_SOFTIRQ, CPU_STEAL, @@ -90,9 +90,10 @@ static void CPUMeter_updateValues(Meter* this) { if (settings->showCPUFrequency) { double cpuFrequency = this->values[CPU_METER_FREQUENCY]; if (isNonnegative(cpuFrequency)) { - xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%4uMHz", (unsigned)cpuFrequency); - } else { xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A"); + } else { + // use GHz if too large + xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%4uMHz", (unsigned)cpuFrequency); } } diff --git a/CPUMeter.h b/CPUMeter.h index 7f2ddb1b..937acd56 100644 --- a/CPUMeter.h +++ b/CPUMeter.h @@ -11,9 +11,9 @@ in the source distribution for its full text. typedef enum { - CPU_METER_NICE = 0, - CPU_METER_NORMAL = 1, - CPU_METER_KERNEL = 2, + CPU_METER_KERNEL = 0, + CPU_METER_NICE = 1, + CPU_METER_NORMAL = 2, CPU_METER_IRQ = 3, CPU_METER_SOFTIRQ = 4, CPU_METER_STEAL = 5,