Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added DBus interface and properties. #69

Merged
merged 1 commit into from
Nov 20, 2017
Merged

Added DBus interface and properties. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions rockworkd/dbusinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,11 @@ void DBusPebble::SetAppOrder(const QStringList &newList)
m_pebble->setAppOrder(uuidList);
}

void DBusPebble::SendAppDataCallback(const QUuid &uuid, const QVariantMap &data, const std::function<void ()> &ackCallback, const std::function<void ()> &nackCallback)
{
m_pebble->sendAppDataCallback(uuid, data, ackCallback, nackCallback);
}

void DBusPebble::SendAppData(const QString &uuid, const QVariantMap &data)
{
m_pebble->sendAppData(QUuid(uuid), QVariantMap(data));
Expand Down
6 changes: 6 additions & 0 deletions rockworkd/dbusinterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ class DBusPebble: public QObject
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.rockwork.Pebble")
Q_PROPERTY(bool IsConnected READ IsConnected)
Q_PROPERTY(QString Name READ Name)
Q_PROPERTY(QString Address READ Address)
public:
DBusPebble(Pebble *pebble, QObject *parent);

Expand Down Expand Up @@ -112,6 +115,9 @@ public slots:
void ConfigurationURL(const QString &uuid);
void ConfigurationClosed(const QString &uuid, const QString &result);
void SetAppOrder(const QStringList &newList);
void SendAppDataCallback(const QUuid &uuid, const QVariantMap &data,
const std::function<void()> &ackCallback,
const std::function<void()> &nackCallback);
void SendAppData(const QString &uuid, const QVariantMap &data);
void CloseApp(const QString &uuid);
void LaunchApp(const QString &uuid);
Expand Down
5 changes: 5 additions & 0 deletions rockworkd/libpebble/pebble.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,11 @@ void Pebble::removeApp(const QUuid &uuid)
m_timelineSync->syncLocker(true);
}

void Pebble::sendAppDataCallback(const QUuid &uuid, const QVariantMap &data, const std::function<void ()> &ackCallback, const std::function<void ()> &nackCallback)
{
m_appMsgManager->send(uuid, data, ackCallback, nackCallback);
}

void Pebble::sendAppData(const QUuid &uuid, const QVariantMap &data)
{
m_appMsgManager->send(uuid, data);
Expand Down
4 changes: 4 additions & 0 deletions rockworkd/libpebble/pebble.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ public slots:
void removeApp(const QUuid &uuid);
AppInfo currentApp();

void sendAppDataCallback(const QUuid &uuid, const QVariantMap &data,
const std::function<void()> &ackCallback,
const std::function<void()> &nackCallback);

void closeApp(const QUuid &uuid);
void sendAppData(const QUuid &uuid, const QVariantMap &data);
void launchApp(const QUuid &uuid);
Expand Down