diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:35:58 +0400 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:35:58 +0400 |
| commit | b7ff6c33309224a4e598a0691e7cb2dc353a6ace (patch) | |
| tree | bc003a5aeba3b0980b5098985f6c28ba965b8b52 /tdecore/tdehw/tdehardwaredevices.cpp | |
| parent | 34f10b970c1e644842ef737b5504591997e37d59 (diff) | |
| parent | 411486cc50448e91b53d28119ccec54c5c2305cd (diff) | |
| download | tdelibs-b7ff6c33309224a4e598a0691e7cb2dc353a6ace.tar.gz tdelibs-b7ff6c33309224a4e598a0691e7cb2dc353a6ace.zip | |
Merge branch 'master' into HEAD
Conflicts:
tdecore/CMakeLists.txt
tdecore/tdehardwaredevices.h
tdecore/tdehw/tdehardwaredevices.cpp
Diffstat (limited to 'tdecore/tdehw/tdehardwaredevices.cpp')
| -rw-r--r-- | tdecore/tdehw/tdehardwaredevices.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 08646d17d..b82977d96 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -65,6 +65,7 @@ #include "tdeeventdevice.h" #include "tdeinputdevice.h" +// Compile-time configuration #include "config.h" // BEGIN BLOCK @@ -2558,6 +2559,15 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist if (nodename == "alarm") { bdevice->internalSetAlarmEnergy(line.toDouble()/1000000.0); } + if (nodename == "charge_full") { + bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0); + } + if (nodename == "charge_full_design") { + bdevice->internalSetMaximumDesignEnergy(line.toDouble()/1000000.0); + } + if (nodename == "charge_now") { + bdevice->internalSetEnergy(line.toDouble()/1000000.0); + } if (nodename == "energy_full") { bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0); } |