diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-03-21 09:25:46 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-03-21 09:31:12 -0300 |
commit | 9ebe5b7c271939a4e48e9cd3f0fdb8f3ebeee432 (patch) | |
tree | ea89e39e0e26a2179032121431aea0e9aac722f6 | |
parent | 141566ffb6a8d61e394c1fe515159a7149fdcc6a (diff) | |
download | pfsense-9ebe5b7c271939a4e48e9cd3f0fdb8f3ebeee432.zip pfsense-9ebe5b7c271939a4e48e9cd3f0fdb8f3ebeee432.tar.gz |
Detect Zones and Cores for thermal sensors using regex, it fixes #3337
-rw-r--r-- | usr/local/www/widgets/javascript/thermal_sensors.js | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/usr/local/www/widgets/javascript/thermal_sensors.js b/usr/local/www/widgets/javascript/thermal_sensors.js index 17f07d0..edc9990 100644 --- a/usr/local/www/widgets/javascript/thermal_sensors.js +++ b/usr/local/www/widgets/javascript/thermal_sensors.js @@ -278,33 +278,16 @@ function pulsateThermalSensorsItems(itemsToPulsate) { } function getSensorFriendlyName(sensorFullName){ + var rzone = /^hw\.acpi\.thermal\.tz([0-9]+)\.temperature$/; + var rcore = /^dev\.cpu\.([0-9]+)\.temperature$/; - var friendlyName = ""; - - switch (sensorFullName) { - case "hw.acpi.thermal.tz0.temperature": - friendlyName = "Zone 0"; - break; - case "hw.acpi.thermal.tz1.temperature": - friendlyName = "Zone 1"; - break; - case "dev.cpu.0.temperature": - friendlyName = "Core 0"; - break; - case "dev.cpu.1.temperature": - friendlyName = "Core 1"; - break; - case "dev.cpu.2.temperature": - friendlyName = "Core 2"; - break; - case "dev.cpu.3.temperature": - friendlyName = "Core 3"; - break; - default: - friendlyName = sensorFullName; - } + if (rzone.test(sensorFullName)) + return "Zone " + rzone.exec(sensorFullName)[1]; + + if (rcore.test(sensorFullName)) + return "Core " + rcore.exec(sensorFullName)[1]; - return friendlyName; + return sensorFullName; } function getThermalSensorValue(stringValue){ |