Fix remaining battery time estimation.

This supports bug report 1514.
pull/16/head
Francois Andriot 11 years ago committed by Darrell Anderson
parent 18ba4a49ac
commit 52b8aef9cc

@ -2729,22 +2729,13 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
if (nodename == "alarm") { if (nodename == "alarm") {
bdevice->internalSetAlarmEnergy(line.toDouble()/1000000.0); bdevice->internalSetAlarmEnergy(line.toDouble()/1000000.0);
} }
if (nodename == "charge_full") { if (nodename == "charge_full" || nodename == "energy_full") {
bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0); bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0);
} }
if (nodename == "charge_full_design") { if (nodename == "charge_full_design" || nodename == "energy_full_design") {
bdevice->internalSetMaximumDesignEnergy(line.toDouble()/1000000.0); bdevice->internalSetMaximumDesignEnergy(line.toDouble()/1000000.0);
} }
if (nodename == "charge_now") { if (nodename == "charge_now" || nodename == "energy_now") {
bdevice->internalSetEnergy(line.toDouble()/1000000.0);
}
if (nodename == "energy_full") {
bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0);
}
if (nodename == "energy_full_design") {
bdevice->internalSetMaximumDesignEnergy(line.toDouble()/1000000.0);
}
if (nodename == "energy_now") {
bdevice->internalSetEnergy(line.toDouble()/1000000.0); bdevice->internalSetEnergy(line.toDouble()/1000000.0);
} }
if (nodename == "manufacturer") { if (nodename == "manufacturer") {
@ -2753,7 +2744,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
if (nodename == "model_name") { if (nodename == "model_name") {
bdevice->internalSetVendorModel(line.stripWhiteSpace()); bdevice->internalSetVendorModel(line.stripWhiteSpace());
} }
if (nodename == "power_now") { if (nodename == "power_now" || nodename == "current_now") {
bdevice->internalSetDischargeRate(line.toDouble()/1000000.0); bdevice->internalSetDischargeRate(line.toDouble()/1000000.0);
} }
if (nodename == "present") { if (nodename == "present") {

Loading…
Cancel
Save