|
|
|
|
@ -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); |
|
|
|
|
|