cpuTemperatur() hwmon0-3 support linux
This commit is contained in:
parent
6ae80aa251
commit
430051caaf
20
lib/cpu.js
20
lib/cpu.js
@ -772,11 +772,24 @@ function cpuTemperature(callback) {
|
|||||||
max: -1.0
|
max: -1.0
|
||||||
};
|
};
|
||||||
if (_linux) {
|
if (_linux) {
|
||||||
const cmd = 'cat /sys/class/hwmon/hwmon1/temp*_la*;echo "---";cat /sys/class/hwmon/hwmon1/temp*_i*';
|
const cmd = 'cat /sys/class/hwmon/hwmon0/temp*_la* 2>/dev/null;echo "---";cat /sys/class/hwmon/hwmon0/temp*_i* 2>/dev/null;echo "######";cat /sys/class/hwmon/hwmon1/temp*_la* 2>/dev/null;echo "---";cat /sys/class/hwmon/hwmon1/temp*_i* 2>/dev/null;echo "######";cat /sys/class/hwmon/hwmon2/temp*_la* 2>/dev/null;echo "---";cat /sys/class/hwmon/hwmon2/temp*_i* 2>/dev/null;echo "######";cat /sys/class/hwmon/hwmon3/temp*_la* 2>/dev/null;echo "---";cat /sys/class/hwmon/hwmon3/temp*_i* 2>/dev/null;';
|
||||||
try {
|
try {
|
||||||
exec(cmd, function (error, stdout) {
|
exec(cmd, function (error, stdout) {
|
||||||
if (!error) {
|
// if (!error) {
|
||||||
let parts = stdout.toString().split('---');
|
let sections = stdout.toString().split('######\n');
|
||||||
|
let bestSection = -1
|
||||||
|
let lineCount = 0
|
||||||
|
for (let i = 0; i < sections.length; i++) {
|
||||||
|
const lines = sections[i].split('\n');
|
||||||
|
if (lineCount < lines.length) {
|
||||||
|
lineCount = lines.length;
|
||||||
|
bestSection = i;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (bestSection >= 0 && lineCount > 2) {
|
||||||
|
let parts = sections[bestSection].split('---');
|
||||||
|
// let parts = stdout.toString().split('---');
|
||||||
let labels = parts[0].split('\n');
|
let labels = parts[0].split('\n');
|
||||||
let temps = parts[1].split('\n');
|
let temps = parts[1].split('\n');
|
||||||
temps.shift();
|
temps.shift();
|
||||||
@ -803,6 +816,7 @@ function cpuTemperature(callback) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// }
|
||||||
exec('sensors', function (error, stdout) {
|
exec('sensors', function (error, stdout) {
|
||||||
if (!error) {
|
if (!error) {
|
||||||
let lines = stdout.toString().split('\n');
|
let lines = stdout.toString().split('\n');
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user