Add getBatteryPercent & isCharging APIs

z3ntu · Apr 28, 2024 · 169904e · 169904e
1 parent 6f1e921
commit 169904e
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 0 deletions.
diff --git a/include/libopenrazer/device.h b/include/libopenrazer/device.h
@@ -144,6 +144,16 @@ class Device : public QObject
      */
     virtual QVector<ushort> getAllowedDPI() = 0;
 
+    /*!
+     * Returns the percentage the battery of the device is charged.
+     */
+    virtual double getBatteryPercent() = 0;
+
+    /*!
+     * Returns whether the device is currently charging.
+     */
+    virtual bool isCharging() = 0;
+
     /*!
      * Sets the lighting to custom mode (applies effects set from defineCustomFrame()).
      *
@@ -204,6 +214,8 @@ class Device : public ::libopenrazer::Device
     QPair<uchar, QVector<::openrazer::RazerDPI>> getDPIStages() override;
     ushort maxDPI() override;
     QVector<ushort> getAllowedDPI() override;
+    double getBatteryPercent() override;
+    bool isCharging() override;
     void displayCustomFrame() override;
     void defineCustomFrame(uchar row, uchar startColumn, uchar endColumn, QVector<::openrazer::RGB> colorData) override;
     ::openrazer::MatrixDimensions getMatrixDimensions() override;
@@ -248,6 +260,8 @@ class Device : public ::libopenrazer::Device
     QPair<uchar, QVector<::openrazer::RazerDPI>> getDPIStages() override;
     ushort maxDPI() override;
     QVector<ushort> getAllowedDPI() override;
+    double getBatteryPercent() override;
+    bool isCharging() override;
     void displayCustomFrame() override;
     void defineCustomFrame(uchar row, uchar startColumn, uchar endColumn, QVector<::openrazer::RGB> colorData) override;
     ::openrazer::MatrixDimensions getMatrixDimensions() override;

diff --git a/src/demo/libopenrazerdemo.cpp b/src/demo/libopenrazerdemo.cpp
@@ -161,6 +161,11 @@ int main(int argc, char *argv[])
             qDebug() << "Matrix dimensions:" << device->getMatrixDimensions();
         }
 
+        if (device->hasFeature("battery")) {
+            qDebug() << "Battery:" << device->getBatteryPercent() << "%";
+            qDebug() << "Charging:" << device->isCharging();
+        }
+
         for (libopenrazer::Led *led : device->getLeds()) {
             qDebug() << "LED:" << led->getLedId();
             if (led->hasBrightness()) {

diff --git a/src/openrazer/device.cpp b/src/openrazer/device.cpp
@@ -85,6 +85,8 @@ void DevicePrivate::setupCapabilities()
         supportedFeatures.append("poll_rate");
     if (hasCapabilityInternal("razer.device.lighting.chroma", "setCustom"))
         supportedFeatures.append("custom_frame");
+    if (hasCapabilityInternal("razer.device.power", "getBattery"))
+        supportedFeatures.append("battery");
 
     // razer.device.lighting.chroma more than only the normal fx, so check for methods directly
     if (hasCapabilityInternal("razer.device.lighting.chroma", "setNone")
@@ -269,6 +271,18 @@ ushort Device::maxDPI()
     return handleDBusReply(reply, Q_FUNC_INFO);
 }
 
+double Device::getBatteryPercent()
+{
+    QDBusReply<double> reply = d->devicePowerIface()->call("getBattery");
+    return handleDBusReply(reply, Q_FUNC_INFO);
+}
+
+bool Device::isCharging()
+{
+    QDBusReply<bool> reply = d->devicePowerIface()->call("isCharging");
+    return handleDBusReply(reply, Q_FUNC_INFO);
+}
+
 QVector<ushort> Device::getAllowedDPI()
 {
     QDBusReply<QVector<int>> reply = d->deviceDpiIface()->call("availableDPI");
@@ -339,6 +353,19 @@ QDBusInterface *DevicePrivate::deviceDpiIface()
     return ifaceDpi;
 }
 
+QDBusInterface *DevicePrivate::devicePowerIface()
+{
+    if (ifacePower == nullptr) {
+        ifacePower = new QDBusInterface(OPENRAZER_SERVICE_NAME, mObjectPath.path(), "razer.device.power",
+                                        OPENRAZER_DBUS_BUS, mParent);
+    }
+    if (!ifacePower->isValid()) {
+        fprintf(stderr, "%s\n",
+                qPrintable(OPENRAZER_DBUS_BUS.lastError().message()));
+    }
+    return ifacePower;
+}
+
 QDBusInterface *DevicePrivate::deviceLightingChromaIface()
 {
     if (ifaceLightingChroma == nullptr) {

diff --git a/src/openrazer/device_p.h b/src/openrazer/device_p.h
@@ -21,9 +21,11 @@ class DevicePrivate
 
     QDBusInterface *ifaceMisc = nullptr;
     QDBusInterface *ifaceDpi = nullptr;
+    QDBusInterface *ifacePower = nullptr;
     QDBusInterface *ifaceLightingChroma = nullptr;
     QDBusInterface *deviceMiscIface();
     QDBusInterface *deviceDpiIface();
+    QDBusInterface *devicePowerIface();
     QDBusInterface *deviceLightingChromaIface();
 
     QDBusObjectPath mObjectPath;

diff --git a/src/razer_test/device.cpp b/src/razer_test/device.cpp
@@ -159,6 +159,18 @@ QVector<ushort> Device::getAllowedDPI()
     return {};
 }
 
+double Device::getBatteryPercent()
+{
+    // TODO Needs implementation
+    return 100;
+}
+
+bool Device::isCharging()
+{
+    // TODO Needs implementation
+    return true;
+}
+
 void Device::displayCustomFrame()
 {
     QDBusReply<bool> reply = d->deviceIface()->call("displayCustomFrame");