From fa0e4e246ccb8f436598db4deee1777decfbc702 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sun, 16 Feb 2020 14:34:08 +0100 Subject: Fix units of current consumption value. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously it was not clear whether the units in tdehwlib are in Wh and W or Ah and A. Now the units are always Ah and A. Because power consumption is usually given in W, the value is converted from A to W. If it is less than 100 W, it is displayed as a decimal number. This is related to issue TDE/tdelibs#68. Signed-off-by: Slávek Banko --- src/hardware_batteryCollection.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/hardware_batteryCollection.cpp') diff --git a/src/hardware_batteryCollection.cpp b/src/hardware_batteryCollection.cpp index 523ca6f..e331492 100644 --- a/src/hardware_batteryCollection.cpp +++ b/src/hardware_batteryCollection.cpp @@ -50,7 +50,7 @@ void BatteryCollection::initDefault() { udis.clear(); - present_rate_unit = "mWh"; + present_rate_unit = "W"; charging_state = UNKNOWN_STATE; state = BAT_NORM; @@ -79,7 +79,7 @@ bool BatteryCollection::refreshInfo(TQPtrList BatteryList, bool force_l int _percent = 0; int _minutes = 0; int _present_batteries = 0; - int _present_rate = 0; + double _present_rate = 0; // for now: clean list before run update process! udis.clear(); @@ -214,7 +214,7 @@ TQString BatteryCollection::getChargeLevelUnit() const { } //! get the current reported battery rate -int BatteryCollection::getCurrentRate() const { +double BatteryCollection::getCurrentRate() const { return present_rate; } -- cgit v1.2.3