fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-02-04 10:40:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'macbook' into 'master'

Browse source 
Add quirk to always update energy_full when the current energy surpasses it

See merge request upower/upower!222
This commit is contained in:
M Caron 2026-01-03 19:54:07 +00:00
commit 7da67e89fb
2 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/linux/integration-test.py
View file

@ -561,6 +561,43 @@ class Tests(dbusmock.DBusTestCase):
self.assertAlmostEqual(self.get_dbus_dev_property(bat0_up, "Percentage"), 80.0)
def test_macbook_energy_full_blip(self):
'''Value blip issue for Macbooks'''
ac = self.testbed.add_device('power_supply', 'AC', None,
['type', 'Mains', 'online', '0'], [])
bat0 = self.testbed.add_device('power_supply', 'BAT0', None,
['type', 'Battery',
'present', '1',
'status', 'Discharging',
'capacity', '60',
'energy_full', '60000000',
'energy_full_design', '80000000',
'energy_now', '48000000',
'voltage_now', '12000000'], [])
self.testbed.add_device('virtual', 'virtual/dmi', None,
['id/product_name', 'MacBookAir7,2'], [])
self.start_daemon()
devs = self.proxy.EnumerateDevices()
self.assertEqual(len(devs), 2)
if 'BAT' in devs[0] == ac_up:
(bat0_up, ac_up) = devs
else:
(ac_up, bat0_up) = devs
# blip
self.testbed.set_attribute(bat0, 'energy_full', '600000000')
self.testbed.set_attribute(bat0, 'energy_now', '480000000')
self.testbed.uevent(bat0, 'change')
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 80)
# go back to normal
self.testbed.set_attribute(bat0, 'energy_full', '60000000')
self.testbed.set_attribute(bat0, 'energy_now', '48000000')
self.testbed.uevent(bat0, 'change')
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 80)
def test_macbook_uevent(self):
"""MacBooks sent uevent 5 seconds before battery updates"""

10
src/up-device-battery.c
View file

@ -46,6 +46,7 @@ typedef struct {
gdouble energy_design;
gint charge_cycles;
gboolean always_update_energy_full;
gboolean trust_power_measurement;
gint64 last_power_discontinuity;
@ -310,6 +311,13 @@ up_device_battery_report (UpDeviceBattery *self,
"capacity", MIN (priv->energy_full / priv->energy_design * 100.0, 100),
"energy-full", priv->energy_full,
NULL);
/* QUIRK:
*
* Some Macbook Airs have a short blip where both energy_full and energy.cur
* are scaled up by some factor. However, they both eventually return back
* to normal, so energy_full must be updated. */
priv->always_update_energy_full = TRUE;
}
/* Infer percentage if unknown */
@ -567,7 +575,7 @@ up_device_battery_update_info (UpDeviceBattery *self, UpBatteryInfo *info)
/* Force -1 for unknown value (where 0 is also an unknown value) */
charge_cycles = info->charge_cycles > 0 ? info->charge_cycles : -1;
if (energy_full != priv->energy_full_reported || energy_design != priv->energy_design) {
if (energy_full != priv->energy_full_reported || energy_design != priv->energy_design || (priv->always_update_energy_full && energy_full != priv->energy_full)) {
priv->energy_full = energy_full;
priv->energy_full_reported = energy_full;
priv->energy_design = energy_design;