c315170be5
## Summary The core idea is as follows: 1. When a Link loads the BatteryPlugin, we query Solid for a list of batteries. 1. If the list is empty, we print a warning message and return quickly 2. Otherwise, we connect *two signals* to every object in that list 2. We send out a single new NetworkPacket as soon as we've processed that list 3. When either of those two signals emits, we send another new NetworkPacket ### Multi-battery Support BUG: 357193 To handle devices with multiple batteries (requested in that bug), we average together the battery percentages. This also includes a new field in the packet for 'number of batteries' called `batteryQuantity`. For backwards compatibility, we can assume it has a default value of one. This should ensure we support - devices with no batteries at all (like many desktop machines) - devices with hot-pluggable batteries (like those laptops with detachable screens) ### Concerns Note that the implementation isn't perfect. We'll need some new localizable text to make it clear that we now support sending battery status information. Then there's a rather significant question: maybe we should have two battery plugins on each client, like we do for the `findmyphone`/`findthisdevice` plugins? ## Test Plan We need to ensure that other clients (including those using the Android codebase) will respond correctly. The main things to look at are 1. are these new packets sent when the plugin is enabled, and not sent when it's disabled? 2. is the charge percentage accurate? 3. is the charge state (charging, discharging, or full) accurate? and 4. do we see the correct number of warnings for low-battery?
155 lines
6 KiB
C++
155 lines
6 KiB
C++
/**
|
|
* Copyright 2013 Albert Vaca <albertvaka@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License or (at your option) version 3 or any later version
|
|
* accepted by the membership of KDE e.V. (or its successor approved
|
|
* by the membership of KDE e.V.), which shall act as a proxy
|
|
* defined in Section 14 of version 3 of the license.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "batteryplugin.h"
|
|
|
|
#include <KLocalizedString>
|
|
#include <KPluginFactory>
|
|
|
|
#include <Solid/Device>
|
|
#include <Solid/Battery>
|
|
#include <Solid/Predicate>
|
|
|
|
#include <core/daemon.h>
|
|
|
|
#include "batterydbusinterface.h"
|
|
|
|
K_PLUGIN_CLASS_WITH_JSON(BatteryPlugin, "kdeconnect_battery.json")
|
|
|
|
Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_BATTERY, "kdeconnect.plugin.battery")
|
|
|
|
BatteryPlugin::BatteryPlugin(QObject* parent, const QVariantList& args)
|
|
: KdeConnectPlugin(parent, args)
|
|
, batteryDbusInterface(new BatteryDbusInterface(device()))
|
|
{
|
|
|
|
//TODO: Our protocol should support a dynamic number of batteries.
|
|
//Solid::DeviceNotifier *notifier = Solid::DeviceNotifier::instance();
|
|
|
|
}
|
|
|
|
void BatteryPlugin::connected()
|
|
{
|
|
NetworkPacket np(PACKET_TYPE_BATTERY_REQUEST, {{QStringLiteral("request"),true}});
|
|
sendPacket(np);
|
|
|
|
const auto batteryDevice = Solid::DeviceInterface::Type::Battery;
|
|
const auto primary = Solid::Battery::BatteryType::PrimaryBattery;
|
|
|
|
QList<Solid::Device> batteries = Solid::Device::listFromQuery(Solid::Predicate(batteryDevice, QStringLiteral("type"), primary));
|
|
|
|
if (batteries.isEmpty()) {
|
|
qCWarning(KDECONNECT_PLUGIN_BATTERY) << "No Primary Battery detected on this system. This may be a bug.";
|
|
QList<Solid::Device> allBatteries = Solid::Device::listFromType(batteryDevice);
|
|
qCWarning(KDECONNECT_PLUGIN_BATTERY) << "Total quantity of batteries found: " << allBatteries.size();
|
|
return;
|
|
}
|
|
|
|
const Solid::Battery* chosen = batteries.first().as<Solid::Battery>();
|
|
|
|
connect(chosen, &Solid::Battery::chargeStateChanged, this, &BatteryPlugin::chargeChanged);
|
|
connect(chosen, &Solid::Battery::chargePercentChanged, this, &BatteryPlugin::chargeChanged);
|
|
|
|
// Explicitly send the current charge
|
|
chargeChanged();
|
|
}
|
|
|
|
void BatteryPlugin::chargeChanged()
|
|
{
|
|
|
|
bool isAnyBatteryCharging = false;
|
|
int batteryQuantity = 0;
|
|
int cumulativeCharge = 0;
|
|
|
|
const auto batteryDevice = Solid::DeviceInterface::Type::Battery;
|
|
const auto primary = Solid::Battery::BatteryType::PrimaryBattery;
|
|
|
|
QList<Solid::Device> batteries = Solid::Device::listFromQuery(Solid::Predicate(batteryDevice, QStringLiteral("type"), primary));
|
|
|
|
for (auto device : batteries) {
|
|
const Solid::Battery* battery = device.as<Solid::Battery>();
|
|
|
|
// Don't look at batteries that have been detached
|
|
if (battery->isPresent()) {
|
|
batteryQuantity++;
|
|
cumulativeCharge += battery->chargePercent();
|
|
if (battery->chargeState() == Solid::Battery::ChargeState::Charging) {
|
|
isAnyBatteryCharging = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (batteryQuantity == 0) {
|
|
qCWarning(KDECONNECT_PLUGIN_BATTERY) << "Primary Battery seems to have been removed. Suspending packets until it is reconnected.";
|
|
return;
|
|
}
|
|
|
|
// Load a new Battery object to represent the first device in the list
|
|
Solid::Battery* chosen = batteries.first().as<Solid::Battery>();
|
|
|
|
// Prepare an outgoing network packet
|
|
NetworkPacket status(PACKET_TYPE_BATTERY, {{}});
|
|
status.set(QStringLiteral("isCharging"), isAnyBatteryCharging);
|
|
status.set(QStringLiteral("currentCharge"), cumulativeCharge / batteryQuantity);
|
|
// FIXME: In future, we should consider sending an array of battery objects
|
|
status.set(QStringLiteral("batteryQuantity"), batteryQuantity);
|
|
// We consider primary battery to be low if it will only last for 5 minutes or
|
|
// less. This doesn't necessarily work if (for example) Solid finds multiple
|
|
// batteries.
|
|
if (chosen->remainingTime() < 600 && chosen->chargeState() == Solid::Battery::ChargeState::Discharging) {
|
|
status.set(QStringLiteral("thresholdEvent"), (int)ThresholdBatteryLow);
|
|
} else {
|
|
status.set(QStringLiteral("thresholdEvent"), (int)ThresholdNone);
|
|
}
|
|
sendPacket(status);
|
|
}
|
|
|
|
BatteryPlugin::~BatteryPlugin()
|
|
{
|
|
//FIXME: Qt dbus does not allow to remove an adaptor! (it causes a crash in
|
|
// the next dbus access to its parent). The implication of not deleting this
|
|
// is that disabling the plugin does not remove the interface (that will
|
|
// return outdated values) and that enabling it again instantiates a second
|
|
// adaptor. This is also a memory leak until the entire device is destroyed.
|
|
|
|
//batteryDbusInterface->deleteLater();
|
|
}
|
|
|
|
bool BatteryPlugin::receivePacket(const NetworkPacket& np)
|
|
{
|
|
bool isCharging = np.get<bool>(QStringLiteral("isCharging"), false);
|
|
int currentCharge = np.get<int>(QStringLiteral("currentCharge"), -1);
|
|
int thresholdEvent = np.get<int>(QStringLiteral("thresholdEvent"), (int)ThresholdNone);
|
|
|
|
if (batteryDbusInterface->charge() != currentCharge
|
|
|| batteryDbusInterface->isCharging() != isCharging
|
|
) {
|
|
batteryDbusInterface->updateValues(isCharging, currentCharge);
|
|
}
|
|
|
|
if ( thresholdEvent == ThresholdBatteryLow && !isCharging ) {
|
|
Daemon::instance()->sendSimpleNotification(QStringLiteral("batteryLow"), i18nc("device name: low battery", "%1: Low Battery", device()->name()), i18n("Battery at %1%", currentCharge), QStringLiteral("battery-040"));
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#include "batteryplugin.moc"
|