summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-01-08 01:49:53 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-01-08 01:49:53 +0100
commit86c1d896c748bf5117ccfe28b20e48a7e2a70c8d (patch)
tree14e8a8cad1061b62de5f589b57143b83bf0c0601
parent3b0f07f2cdf3c5228b6d38b33fb5f2bc8fa0542d (diff)
downloadtdelibs-86c1d896.zip
tdelibs-86c1d896.tar.gz
tdehwlib: Adjusted parsing of battery information
+ Added initialization of all values Some batteries do not provide all values and, without initialization, values may contain dubious data. + Added reading of current battery capacity value in percent (capacity) Some batteries may provide the current capacity value in percent instead of the current energy value. + Added check whether the battery provides current energy value (charge_now or energy_now) The current energy is calculated if the value is not provided in the battery information. + Added reading of estimated time to empty battery (time_to_empty_now) The remaining time is calculated if the value is not provided in the battery information. If the battery does not provide charging current information, the estimated time to charge the battery cannot be calculated. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdecore/tdehw/tdebatterydevice.cpp9
-rw-r--r--tdecore/tdehw/tdehardwaredevices.cpp37
2 files changed, 36 insertions, 10 deletions
diff --git a/tdecore/tdehw/tdebatterydevice.cpp b/tdecore/tdehw/tdebatterydevice.cpp
index 781fb99..e220fa5 100644
--- a/tdecore/tdehw/tdebatterydevice.cpp
+++ b/tdecore/tdehw/tdebatterydevice.cpp
@@ -21,7 +21,14 @@
#include "config.h"
-TDEBatteryDevice::TDEBatteryDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn) {
+TDEBatteryDevice::TDEBatteryDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) :
+ m_currentVoltage(0), m_minimumVoltage(0), m_maximumVoltage(0), m_maximumDesignVoltage(0),
+ m_alarmEnergy(0), m_currentEnergy(0), m_maximumEnergy(0), m_maximumDesignEnergy(0),
+ m_dischargeRate(0), m_timeRemaining(0),
+ m_technology(TQString::null),
+ m_status(TDEBatteryStatus::Unknown),
+ m_installed(0),
+ TDEGenericDevice(dt, dn) {
}
TDEBatteryDevice::~TDEBatteryDevice() {
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 45633bd..04ace0f 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -3023,6 +3023,9 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
TQDir valuesdir(valuesnodename);
valuesdir.setFilter(TQDir::All);
TQString nodename;
+ double bdevice_capacity = 0;
+ bool bdevice_has_energy = false;
+ bool bdevice_has_time_to_empty = false;
const TQFileInfoList *dirlist = valuesdir.entryInfoList();
if (dirlist) {
TQFileInfoListIterator valuesdirit(*dirlist);
@@ -3092,6 +3095,9 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
if (nodename == "alarm") {
bdevice->internalSetAlarmEnergy(line.toDouble()/1000000.0);
}
+ else if (nodename == "capacity") {
+ bdevice_capacity = line.toDouble();
+ }
else if (nodename == "charge_full" || nodename == "energy_full") {
bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0);
}
@@ -3100,6 +3106,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
}
else if (nodename == "charge_now" || nodename == "energy_now") {
bdevice->internalSetEnergy(line.toDouble()/1000000.0);
+ bdevice_has_energy = true;
}
else if (nodename == "manufacturer") {
bdevice->internalSetVendorName(line.stripWhiteSpace());
@@ -3122,6 +3129,11 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
else if (nodename == "technology") {
bdevice->internalSetTechnology(line);
}
+ else if (nodename == "time_to_empty_now") {
+ // Convert from minutes to seconds
+ bdevice->internalSetTimeRemaining(line.toDouble()*60);
+ bdevice_has_time_to_empty = true;
+ }
else if (nodename == "voltage_min_design") {
bdevice->internalSetMinimumVoltage(line.toDouble()/1000000.0);
}
@@ -3134,16 +3146,23 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
}
}
- // Calculate time remaining
- // Discharge/charge rate is in watt-hours
- // Energy is in watt-hours
- // Therefore, energy/rate = time in hours
- // Convert to seconds...
- if (bdevice->status() == TDEBatteryStatus::Charging) {
- bdevice->internalSetTimeRemaining(((bdevice->maximumEnergy()-bdevice->energy())/bdevice->dischargeRate())*60*60);
+ // Calculate current energy if missing
+ if (!bdevice_has_energy) {
+ bdevice->internalSetEnergy(bdevice_capacity*bdevice->maximumEnergy()/100);
}
- else {
- bdevice->internalSetTimeRemaining((bdevice->energy()/bdevice->dischargeRate())*60*60);
+
+ // Calculate time remaining
+ if (bdevice->dischargeRate() > 0) {
+ // Discharge/charge rate is in watt-hours
+ // Energy is in watt-hours
+ // Therefore, energy/rate = time in hours
+ // Convert to seconds...
+ if (bdevice->status() == TDEBatteryStatus::Charging) {
+ bdevice->internalSetTimeRemaining(((bdevice->maximumEnergy()-bdevice->energy())/bdevice->dischargeRate())*60*60);
+ }
+ else if (!bdevice_has_time_to_empty) {
+ bdevice->internalSetTimeRemaining((bdevice->energy()/bdevice->dischargeRate())*60*60);
+ }
}
}