Now that device loop is fixed, we also need to fix the D-Bus object
path for the devices themselves to match what UPower generates so
we can get its properties.
As we iterate over the expected array, the elements are the basenames
of those object paths. Reconstruct the full object paths by prepending
/org/freedesktop/UPower/devices/
The test uses a generator to get the list of basenames for the devices:
names = (n.split('/')[-1] for n in devs)
Unfortunately, using that "names" varible will consume the generator,
and our array will be lost.
When passing a device dictionary, this code:
print(sorted(names))
print(sorted(names))
will yield:
['battery_hidpp_battery_0']
[]
Save the sorted array, and use that to test for properties equality.
When a kernel device appears after the Bluetooth device, we could be
trying to bind the model property onto itself on the Bluetooth device.
Avoid this possibility by always binding the property from the bluez
device to the non-bluez device.
GLib-GObject-WARNING **: 20:20:50.644: Unable to bind the same property on the same instance
Fixes: 778b93a336 ("linux: Hide duplicate Logitech Bluetooth devices")
Some Bluetooth devices can be hidden if they also export their battery
info through the kernel, so make sure to not throw a warning when they
go away.
(upowerd:133931): UPower-WARNING **: 02:49:48.012: INTERNAL STATE CORRUPT (device-removed): not sending NULL, device:0x1f5dae0
Fixes: 778b93a336 ("linux: Hide duplicate Logitech Bluetooth devices")
Commit 1550d50f ("linux: Remove "usb" subsystem match") broke detection of
some idevices, since it left just the "usbmisc" subsystem match while some
idevice / kernel combinations (at least an iPhone 11 on a 6.0 kernel) don't
present any such udev usbmisc devices.
However, they do present "usb" subsystem ones, so add this match back.
Leave idevice detection also for the "usbmisc" match since that's what the
original (known working) code before aforementioned commit did - it is
possible that it is required for some kernel / idevice combinations.
up-enumerator-udev.c forgot to include the build config file, resulting in
HAVE_IDEVICE macro always being undefined.
This meant that the idevice backend was never actually instantiated - as
evidenced by the file not even compiling when this was fixed, due to
missing "up-device-idevice.h" include.
Fix both of these issues.
A lot of newer Logitech devices support both the BATT Bluetooth LE
service as well the HID++ protocol. This advertises 2 separate battery
interfaces, one HID++ one through the kernel, one BATT one through
BlueZ.
Avoid confusing UIs and hide the Bluetooth battery from the interface by
checking for duplicates each time a new device is added.
Closes: #166
Add up_device_unregister() method to allow backends to hide particular
UpDevices from the D-Bus interface.
Also rename the private up_device_register_device() function, no need to
say "device" twice there, we're registering the only device passed as an
argument.
Newer development versions of libgudev now strip the linefeeds by
themselves, so fix our naive linefeed-stripping which munched on the
last character of the string if there was no linefeed.
Could not find a percentage for capacity level 'Ful'
See https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/26
This fixes the serial number not being set on Bluetooth devices which
might not have a serial number but should always have a Bluetooth
address to differentiate them.
We were correctly handling an "Alias" property changing, but never
passed the property to that code as we were dropping anything that
wasn't a battery related update.
otherwise the native build on openbsd complains:
../src/openbsd/up-backend.c:278:23: warning: variable 'new_state' is uninitialized when used here [-Wuninitialized]
new_time_to_empty = (new_state == UP_DEVICE_STATE_DISCHARGING && a.minutes_left > 0 ? a.minutes_left : 0);
^~~~~~~~~
regression from 8be73b98 ?
The version number has been bumped to be able to maintain multiple
branches without conflict. This version bump is not associated with a
API/ABI break.
This switches to always use the power/current reading if we had a
sensible reading at some point in the past.
In contrast to the older UPower code, will will however ignore the
reading for 10 seconds after a discontinuity (power plug/unplug or
resume) unless we read an explicit zero value after the event happened.
We do this under the assumption that the readings may be wildly off, and
it is better to not show an estimate rather than one that is wildly
incorrect.
Note that this commit also normalises negative power readings while
discharging to be positive.
Closes: #199
Estimation code can request a battery poll if the value is not good
enough at the point. Make this a little bit more explicit by renaming
the intenral variable to "repoll_needed" and automatically resetting it
to FALSE.
The up_device_battery_estimate function did more than just estimating
the current power consumption (and doing some state guessing). Move the
time to full/empty checking out of the function. Also, let it directly
modify the reported state before it is pushed into the ring-buffer.
When polling is resumed the timeout needs to be reevaluated. This
requires running the polling handler once (in the next mainloop
iteration).
Set the ready time to zero to ensure this is happening. Without this, we
would be stuck without actually polling until we get a uevent from the
kernel on one of the power supplies.
Fixes: #198
When a battery is swapped the old history needs to be saved and the
other history should be loaded.
Change the code to load the history lazily when needed. Then, to reload,
we purely need to clear the history object and it'll be loaded again
when required.
