Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[mce-qt] Add support for charger type tracking. JB#38667
Required constants are defined in mce-dev >= 1.27.0 The D-Bus methods and signals are available in mce >= 1.102.9 Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
- Loading branch information
Showing
7 changed files
with
254 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* Copyright (C) 2019 Jolla Ltd. | ||
* Copyright (c) 2019 Open Mobile Platform LLC. | ||
* Contact: Slava Monich <slava.monich@jolla.com> | ||
* | ||
* You may use this file under the terms of BSD license as follows: | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions | ||
* are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* 2. Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in the | ||
* documentation and/or other materials provided with the distribution. | ||
* 3. Neither the name of Jolla Ltd nor the names of its contributors may | ||
* be used to endorse or promote products derived from this software | ||
* without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS | ||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
* THE POSSIBILITY OF SUCH DAMAGE. | ||
* | ||
* The views and conclusions contained in the software and documentation | ||
* are those of the authors and should not be interpreted as representing | ||
* any official policies, either expressed or implied. | ||
*/ | ||
|
||
#ifndef QMCE_CHARGERTYPE_H_ | ||
#define QMCE_CHARGERTYPE_H_ | ||
|
||
#include "qmcetypes.h" | ||
|
||
class QMCE_EXPORT QMceChargerType : public QObject | ||
{ | ||
Q_OBJECT | ||
Q_PROPERTY(bool valid READ valid NOTIFY validChanged) | ||
Q_PROPERTY(Type type READ type NOTIFY typeChanged) | ||
Q_ENUMS(Type) | ||
public: | ||
enum Type { None, USB, DCP, HVDCP, CDP, Wireless, Other, }; | ||
QMceChargerType(QObject* aParent = NULL); | ||
bool valid() const; | ||
Type type() const; | ||
Q_SIGNALS: | ||
void validChanged(); | ||
void typeChanged(); | ||
private: | ||
class Private; | ||
Private* iPrivate; | ||
}; | ||
|
||
#endif // QMCE_CHARGERTYPE_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,180 @@ | ||
/* | ||
* Copyright (C) 2019 Jolla Ltd. | ||
* Copyright (c) 2019 Open Mobile Platform LLC. | ||
* Contact: Slava Monich <slava.monich@jolla.com> | ||
* | ||
* You may use this file under the terms of BSD license as follows: | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions | ||
* are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* 2. Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in the | ||
* documentation and/or other materials provided with the distribution. | ||
* 3. Neither the name of Jolla Ltd nor the names of its contributors may | ||
* be used to endorse or promote products derived from this software | ||
* without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS | ||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
* THE POSSIBILITY OF SUCH DAMAGE. | ||
* | ||
* The views and conclusions contained in the software and documentation | ||
* are those of the authors and should not be interpreted as representing | ||
* any official policies, either expressed or implied. | ||
*/ | ||
|
||
#include "qmcechargertype.h" | ||
#include "qmceproxy.h" | ||
|
||
#include <mce/mode-names.h> | ||
|
||
// ========================================================================== | ||
// QMceChargerType::Private | ||
// ========================================================================== | ||
|
||
class QMceChargerType::Private : public QObject { | ||
Q_OBJECT | ||
public: | ||
Private(QMceChargerType* aParent); | ||
bool valid() const; | ||
QMceChargerType::Type value() const; | ||
private: | ||
void queryValue(); | ||
void setValid(bool valid); | ||
private Q_SLOTS: | ||
void onProxyValidChanged(); | ||
void onQueryFinished(QDBusPendingCallWatcher* aWatcher); | ||
void updateValue(QString type); | ||
private: | ||
QMceChargerType* iParent; | ||
QSharedPointer<QMceProxy> iProxy; | ||
bool iValid; | ||
QMceChargerType::Type iValue; | ||
}; | ||
|
||
QMceChargerType::Private::Private(QMceChargerType* aParent) : | ||
QObject(aParent), | ||
iParent(aParent), | ||
iProxy(QMceProxy::instance()), | ||
iValid(false), | ||
iValue(None) | ||
{ | ||
connect(iProxy->signalProxy(), | ||
SIGNAL(charger_type_ind(QString)), | ||
SLOT(updateValue(QString))); | ||
connect(iProxy.data(), | ||
SIGNAL(validChanged()), | ||
SLOT(onProxyValidChanged())); | ||
if (iProxy->valid()) { | ||
queryValue(); | ||
} | ||
} | ||
|
||
bool QMceChargerType::Private::valid() const | ||
{ | ||
return iValid; | ||
} | ||
|
||
void QMceChargerType::Private::setValid(bool valid) | ||
{ | ||
if (iValid != valid) { | ||
iValid = valid; | ||
Q_EMIT iParent->validChanged(); | ||
} | ||
} | ||
|
||
QMceChargerType::Type QMceChargerType::Private::value() const | ||
{ | ||
return iValue; | ||
} | ||
|
||
void QMceChargerType::Private::updateValue(QString type) | ||
{ | ||
bool valid = true; | ||
QMceChargerType::Type value = Other; | ||
|
||
if (type == QStringLiteral(MCE_CHARGER_TYPE_NONE)) | ||
value = None; | ||
else if (type == QStringLiteral(MCE_CHARGER_TYPE_USB)) | ||
value = USB; | ||
else if (type == QStringLiteral(MCE_CHARGER_TYPE_DCP)) | ||
value = DCP; | ||
else if (type == QStringLiteral(MCE_CHARGER_TYPE_HVDCP)) | ||
value = HVDCP; | ||
else if (type == QStringLiteral(MCE_CHARGER_TYPE_CDP)) | ||
value = CDP; | ||
else if (type == QStringLiteral(MCE_CHARGER_TYPE_WIRELESS)) | ||
value = Wireless; | ||
else if (type == QStringLiteral(MCE_CHARGER_TYPE_OTHER)) | ||
value = Other; | ||
else | ||
valid = false; | ||
|
||
if (valid) { | ||
if (iValue != value) { | ||
iValue = value; | ||
Q_EMIT iParent->typeChanged(); | ||
} | ||
} | ||
setValid(valid); | ||
} | ||
|
||
void QMceChargerType::Private::queryValue() | ||
{ | ||
connect(new QDBusPendingCallWatcher( | ||
iProxy->requestProxy()->get_charger_type(), this), | ||
SIGNAL(finished(QDBusPendingCallWatcher*)), | ||
SLOT(onQueryFinished(QDBusPendingCallWatcher*))); | ||
} | ||
|
||
void QMceChargerType::Private::onQueryFinished(QDBusPendingCallWatcher* aWatcher) | ||
{ | ||
QDBusPendingReply<QString> reply(*aWatcher); | ||
if (!reply.isError()) { | ||
updateValue(reply.value()); | ||
} | ||
aWatcher->deleteLater(); | ||
} | ||
|
||
void QMceChargerType::Private::onProxyValidChanged() | ||
{ | ||
if (iProxy->valid()) { | ||
queryValue(); | ||
} else { | ||
setValid(false); | ||
} | ||
} | ||
|
||
// ========================================================================== | ||
// QMceChargerType | ||
// ========================================================================== | ||
|
||
QMceChargerType::QMceChargerType(QObject* aParent) : | ||
QObject(aParent), | ||
iPrivate(new Private(this)) | ||
{ | ||
} | ||
|
||
bool QMceChargerType::valid() const | ||
{ | ||
return iPrivate->valid(); | ||
} | ||
|
||
QMceChargerType::Type QMceChargerType::type() const | ||
{ | ||
return iPrivate->value(); | ||
} | ||
|
||
#include "qmcechargertype.moc" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters