From 3ef5df25bc7178d49a4e18eb6b62f48811187def Mon Sep 17 00:00:00 2001 From: Redha Gouicem Date: Fri, 28 Aug 2020 12:15:32 +0200 Subject: always display frequency in MHz --- CPUMeter.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'CPUMeter.c') diff --git a/CPUMeter.c b/CPUMeter.c index 6131a09d..e09769cc 100644 --- a/CPUMeter.c +++ b/CPUMeter.c @@ -65,18 +65,13 @@ static void CPUMeter_updateValues(Meter* this, char* buffer, int size) { memset(this->values, 0, sizeof(double) * CPU_METER_ITEMCOUNT); double percent = Platform_setCPUValues(this, cpu); if (this->pl->settings->showCPUFrequency) { - /* Initial frequency is in MHz. Emit it as GHz if it's larger than 1000MHz */ double cpuFrequency = this->values[CPU_METER_FREQUENCY]; char unit = 'M'; char cpuFrequencyBuffer[16]; if (cpuFrequency < 0) { xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A"); } else { - if (cpuFrequency > 1000) { - cpuFrequency /= 1000; - unit = 'G'; - } - xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.3f%cHz", cpuFrequency, unit); + xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.0f%cHz", cpuFrequency, unit); } if (this->pl->settings->showCPUUsage) { xSnprintf(buffer, size, "%5.1f%% %s", percent, cpuFrequencyBuffer); -- cgit v1.2.3 From 293e3a2931c267441170289e9d717fe43d51b390 Mon Sep 17 00:00:00 2001 From: Redha Gouicem Date: Mon, 31 Aug 2020 13:29:24 +0200 Subject: remove unused variable --- CPUMeter.c | 1 - 1 file changed, 1 deletion(-) (limited to 'CPUMeter.c') diff --git a/CPUMeter.c b/CPUMeter.c index e09769cc..8328150d 100644 --- a/CPUMeter.c +++ b/CPUMeter.c @@ -66,7 +66,6 @@ static void CPUMeter_updateValues(Meter* this, char* buffer, int size) { double percent = Platform_setCPUValues(this, cpu); if (this->pl->settings->showCPUFrequency) { double cpuFrequency = this->values[CPU_METER_FREQUENCY]; - char unit = 'M'; char cpuFrequencyBuffer[16]; if (cpuFrequency < 0) { xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A"); -- cgit v1.2.3 From 0f5d2cd1e456b251706ebd337cacc8593186819f Mon Sep 17 00:00:00 2001 From: Redha Gouicem Date: Mon, 31 Aug 2020 13:32:29 +0200 Subject: fixed compilation error --- CPUMeter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CPUMeter.c') diff --git a/CPUMeter.c b/CPUMeter.c index 8328150d..e082207c 100644 --- a/CPUMeter.c +++ b/CPUMeter.c @@ -70,7 +70,7 @@ static void CPUMeter_updateValues(Meter* this, char* buffer, int size) { if (cpuFrequency < 0) { xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A"); } else { - xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.0f%cHz", cpuFrequency, unit); + xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.0fGHz", cpuFrequency); } if (this->pl->settings->showCPUUsage) { xSnprintf(buffer, size, "%5.1f%% %s", percent, cpuFrequencyBuffer); -- cgit v1.2.3 From d0e8ff9319cb9c0c283234bdaa16d4753672e1e7 Mon Sep 17 00:00:00 2001 From: Redha Gouicem Date: Mon, 31 Aug 2020 14:09:22 +0200 Subject: fix unit (GHz -> MHz) --- CPUMeter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CPUMeter.c') diff --git a/CPUMeter.c b/CPUMeter.c index e082207c..82f9892e 100644 --- a/CPUMeter.c +++ b/CPUMeter.c @@ -70,7 +70,7 @@ static void CPUMeter_updateValues(Meter* this, char* buffer, int size) { if (cpuFrequency < 0) { xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A"); } else { - xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.0fGHz", cpuFrequency); + xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%.0fMHz", cpuFrequency); } if (this->pl->settings->showCPUUsage) { xSnprintf(buffer, size, "%5.1f%% %s", percent, cpuFrequencyBuffer); -- cgit v1.2.3