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

fix: battery designed capacity on windows

Browse Source
This commit is contained in:
plakak 2021-07-15 09:43:04 +02:00
parent a8cba81523
commit 7a1bcb12c5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/battery.js
View File

@ -46,7 +46,7 @@ function parseWinBatteryPart(lines, designCapacity, fullChargeCapacity) {
result.status = statusValue; result.status = statusValue;
result.hasBattery = true; result.hasBattery = true;
result.maxCapacity = fullChargeCapacity || parseInt(util.getValue(lines, 'DesignCapacity', '=') || 0); result.maxCapacity = fullChargeCapacity || parseInt(util.getValue(lines, 'DesignCapacity', '=') || 0);
result.designCapacity = parseInt(util.getValue(lines, 'DesignCapacity', '=') || designCapacity); result.designedCapacity = parseInt(util.getValue(lines, 'DesignCapacity', '=') || designCapacity);
result.voltage = parseInt(util.getValue(lines, 'DesignVoltage', '=') || 0) / 1000.0; result.voltage = parseInt(util.getValue(lines, 'DesignVoltage', '=') || 0) / 1000.0;
result.capacityUnit = 'mWh'; result.capacityUnit = 'mWh';
result.percent = parseInt(util.getValue(lines, 'EstimatedChargeRemaining', '=') || 0); result.percent = parseInt(util.getValue(lines, 'EstimatedChargeRemaining', '=') || 0);
@ -220,8 +220,8 @@ module.exports = function (callback) {
// let parts = data.results[0].split(/\n\s*\n/); // let parts = data.results[0].split(/\n\s*\n/);
let parts = data.results[0].split('\r\n'); let parts = data.results[0].split('\r\n');
let batteries = []; let batteries = [];
const hasValue = value => /\S/.test(value);
for (let i = 0; i < parts.length; i++) { for (let i = 0; i < parts.length; i++) {
const hasValue = value => /\S/.test(value);
if (hasValue(parts[i]) && (!batteries.length || !hasValue(parts[i - 1]))) { if (hasValue(parts[i]) && (!batteries.length || !hasValue(parts[i - 1]))) {
batteries.push([]); batteries.push([]);
} }
@ -236,13 +236,13 @@ module.exports = function (callback) {
let additionalBatteries = []; let additionalBatteries = [];
for (let i = 0; i < batteries.length; i++) { for (let i = 0; i < batteries.length; i++) {
let lines = batteries[i]; let lines = batteries[i];
const designCapacity = designCapacities && designCapacities.length >= (i + 1) && designCapacities[i] ? util.toInt(designCapacities[i]) : 0; const designedCapacity = designCapacities && designCapacities.length >= (i + 1) && designCapacities[i] ? util.toInt(designCapacities[i]) : 0;
const fullChargeCapacity = fullChargeCapacities && fullChargeCapacities.length >= (i + 1) && fullChargeCapacities[i] ? util.toInt(fullChargeCapacities[i]) : 0; const fullChargeCapacity = fullChargeCapacities && fullChargeCapacities.length >= (i + 1) && fullChargeCapacities[i] ? util.toInt(fullChargeCapacities[i]) : 0;
const parsed = parseWinBatteryPart(lines, designCapacity, fullChargeCapacity); const parsed = parseWinBatteryPart(lines, designedCapacity, fullChargeCapacity);
if (!first && parsed.status > 0 && parsed.status !== 10) { if (!first && parsed.status > 0 && parsed.status !== 10) {
result.hasBattery = parsed.hasBattery; result.hasBattery = parsed.hasBattery;
result.maxCapacity = parsed.maxCapacity; result.maxCapacity = parsed.maxCapacity;
result.designCapacity = parsed.designCapacity; result.designedCapacity = parsed.designedCapacity;
result.voltage = parsed.voltage; result.voltage = parsed.voltage;
result.capacityUnit = parsed.capacityUnit; result.capacityUnit = parsed.capacityUnit;
result.percent = parsed.percent; result.percent = parsed.percent;
@ -256,7 +256,7 @@ module.exports = function (callback) {
{ {
hasBattery: parsed.hasBattery, hasBattery: parsed.hasBattery,
maxCapacity: parsed.maxCapacity, maxCapacity: parsed.maxCapacity,
designCapacity: parsed.designCapacity, designedCapacity: parsed.designCapacity,
voltage: parsed.voltage, voltage: parsed.voltage,
capacityUnit: parsed.capacityUnit, capacityUnit: parsed.capacityUnit,
percent: parsed.percent, percent: parsed.percent,