Attachment 1531 Details for Bug 1655 – tdepowersave : fix warning in getting charge level units

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdepowersave : fix warning in getting charge level units

tdepowersave-battery-units.diff (text/plain), 1.33 KB, created by Slávek Banko on 2013-10-02 15:05:43 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-10-02 15:05:43 CDT

Size: 1.33 KB

patch

obsolete

>diff --git a/src/hardware_battery.cpp b/src/hardware_battery.cpp
>index 8ae333d..457d754 100644
>--- a/src/hardware_battery.cpp
>+++ b/src/hardware_battery.cpp
>@@ -515,12 +515,12 @@ bool Battery::checkChargeLevelRate () {
>  */
> bool Battery::checkChargeLevelUnit () {
> 	kdDebugFuncOut(trace);
>-	
>+
> 	// First make sure the battery object is still available
> 	TDEBatteryDevice* bdevice = dynamic_cast<TDEBatteryDevice*>(m_hwdevices->findByUniqueID(udi));
> 	if (!bdevice) {
> 		//grr... no luck
>-		kdError() << "Battery::checkChargeLevelRate couldn't find battery" << endl;
>+		kdError() << "Battery::checkChargeLevelUnit couldn't find battery" << endl;
> 		kdDebugFuncOut(trace);
> 		return false;
> 	}
>@@ -531,11 +531,11 @@ bool Battery::checkChargeLevelUnit () {
> 		return false;
> 	}
> 
>-	// FIXME VERIFY CORRECTNESS
>-	// what does tdepowersave expect to see in charge_level_unit (battery.charge_level.unit)?
>-	charge_level_unit = "wH";
>-	//query was not successfull but this is optional
>-	kdWarning() << "Couldn't request charge_level.unit for udi: " << udi << endl;
>+	// Power supply energy informations in sysfs are always in uWh.
>+	// https://www.kernel.org/doc/Documentation/power/power_supply_class.txt
>+	// TDE hardware library internally uses Wh.
>+	// Since charge level unit are always Wh.
>+	charge_level_unit = "Wh";
> 	kdDebugFuncOut(trace);
> 	return false;
> }

Actions: View | Diff

Attachments on bug 1655: 1531 | 1532 | 1534 | 1535