mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed cpu().speed windows / AMD, updated docs

Browse Source
This commit is contained in:
Sebastian Hildebrandt
2017-08-23 09:05:01 +02:00
parent 41ab8d9aa9
commit b48cfc207a
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cpu.js
+13 -5
View File
@@ -161,10 +161,15 @@ function getCpu() {
if (!error) {
let lines = stdout.split('\r\n');
let name = getValue(lines, 'name', '=') || '';
result.brand = name.split('@')[0].trim();
result.speed = name.split('@')[1].trim();
result.speed = parseFloat(result.speed.replace(/GHz+/g, "").trim()).toFixed(2);
_cpu_speed = result.speed;
if (name.indexOf('@') >= 0) {
result.brand = name.split('@')[0].trim();
result.speed = name.split('@')[1].trim();
result.speed = parseFloat(result.speed.replace(/GHz+/g, "").trim()).toFixed(2);
_cpu_speed = result.speed;
} else {
result.brand = name.split('@')[0].trim();
result.speed = 0;
}
result = cpuBrandManufacturer(result);
result.revision = getValue(lines, 'revision', '=');
result.cache.l1d = 0;
@@ -175,7 +180,10 @@ function getCpu() {
if (result.cache.l3) { result.cache.l3 = parseInt(result.cache.l3) * 1024}
result.vendor = getValue(lines, 'manufacturer', '=');
result.speedmax = Math.round(parseFloat(getValue(lines, 'maxclockspeed', '=').replace(/,/g, '.')) / 10.0) / 100;
result.speedmax = result.speedmax ? parseFloat(result.speedmax).toFixed(2) : ''
result.speedmax = result.speedmax ? parseFloat(result.speedmax).toFixed(2) : '';
if (!result.speed) {
result.speed = result.speedmax
}
let description = getValue(lines, 'description', '=').split(' ');
for (let i = 0; i < description.length; i++) {