getStatic() added audio, usb, bluetooth, printer
This commit is contained in:
+22
-13
@@ -994,7 +994,7 @@ function getCpuCurrentSpeedSync() {
|
||||
let cores = [];
|
||||
let speeds = [];
|
||||
|
||||
if (cpus && cpus.length && cpus[0].speed) {
|
||||
if (cpus && cpus.length && cpus[0].hasOwnProperty('speed')) {
|
||||
for (let i in cpus) {
|
||||
speeds.push(cpus[i].speed > 100 ? (cpus[i].speed + 1) / 1000 : cpus[i].speed / 10);
|
||||
}
|
||||
@@ -1010,19 +1010,28 @@ function getCpuCurrentSpeedSync() {
|
||||
}
|
||||
|
||||
if (speeds && speeds.length) {
|
||||
for (let i in speeds) {
|
||||
avgFreq = avgFreq + speeds[i];
|
||||
if (speeds[i] > maxFreq) { maxFreq = speeds[i]; }
|
||||
if (speeds[i] < minFreq) { minFreq = speeds[i]; }
|
||||
cores.push(parseFloat(speeds[i].toFixed(2)));
|
||||
try {
|
||||
for (let i in speeds) {
|
||||
avgFreq = avgFreq + speeds[i];
|
||||
if (speeds[i] > maxFreq) { maxFreq = speeds[i]; }
|
||||
if (speeds[i] < minFreq) { minFreq = speeds[i]; }
|
||||
cores.push(parseFloat(speeds[i].toFixed(2)));
|
||||
}
|
||||
avgFreq = avgFreq / speeds.length;
|
||||
return {
|
||||
min: parseFloat(minFreq.toFixed(2)),
|
||||
max: parseFloat(maxFreq.toFixed(2)),
|
||||
avg: parseFloat((avgFreq).toFixed(2)),
|
||||
cores: cores
|
||||
};
|
||||
} catch (e) {
|
||||
return {
|
||||
min: 0,
|
||||
max: 0,
|
||||
avg: 0,
|
||||
cores: cores
|
||||
};
|
||||
}
|
||||
avgFreq = avgFreq / speeds.length;
|
||||
return {
|
||||
min: parseFloat(minFreq.toFixed(2)),
|
||||
max: parseFloat(maxFreq.toFixed(2)),
|
||||
avg: parseFloat((avgFreq).toFixed(2)),
|
||||
cores: cores
|
||||
};
|
||||
} else {
|
||||
return {
|
||||
min: 0,
|
||||
|
||||
+9
-1
@@ -95,7 +95,11 @@ function getStaticData(callback) {
|
||||
graphics.graphics(),
|
||||
network.networkInterfaces(),
|
||||
memory.memLayout(),
|
||||
filesystem.diskLayout()
|
||||
filesystem.diskLayout(),
|
||||
audio.audio(),
|
||||
bluetooth.bluetoothDevices(),
|
||||
usb.usb(),
|
||||
printer.printer(),
|
||||
]).then((res) => {
|
||||
data.system = res[0];
|
||||
data.bios = res[1];
|
||||
@@ -110,6 +114,10 @@ function getStaticData(callback) {
|
||||
data.net = res[10];
|
||||
data.memLayout = res[11];
|
||||
data.diskLayout = res[12];
|
||||
data.audio = res[13];
|
||||
data.bluetooth = res[14];
|
||||
data.usb = res[15];
|
||||
data.printer = res[16];
|
||||
if (callback) { callback(data); }
|
||||
resolve(data);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user