summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2014-07-10 11:56:26 +0200
committerTomasz Sterna <tomek@xiaoka.com>2014-07-10 11:56:26 +0200
commit072da88eee57e5d16f0b75c7b90c8a0bc6a60cb3 (patch)
tree48ad2f71d598a5b44d4522a37cf1a1e681bbfe79 /app
parentc5132f1434eb6e14abfe2d2761d9f3abdcc3ad0e (diff)
Implemented ping, disconnect, reconnect in daemon
Diffstat (limited to 'app')
-rw-r--r--app/pebbledinterface.cpp15
-rw-r--r--app/pebbledinterface.h3
-rw-r--r--app/qml/cover/CoverPage.qml2
-rw-r--r--app/qml/pages/ManagerPage.qml6
4 files changed, 24 insertions, 2 deletions
diff --git a/app/pebbledinterface.cpp b/app/pebbledinterface.cpp
index 9710d78..390964a 100644
--- a/app/pebbledinterface.cpp
+++ b/app/pebbledinterface.cpp
@@ -142,3 +142,18 @@ QString PebbledInterface::address() const
qDebug() << __FUNCTION__;
return pebbled->property(__FUNCTION__).toString();
}
+
+void PebbledInterface::ping()
+{
+ pebbled->call("ping", 66);
+}
+
+void PebbledInterface::disconnect()
+{
+ pebbled->call("disconnect");
+}
+
+void PebbledInterface::reconnect()
+{
+ pebbled->call("reconnect");
+}
diff --git a/app/pebbledinterface.h b/app/pebbledinterface.h
index 2afc6c0..eccc766 100644
--- a/app/pebbledinterface.h
+++ b/app/pebbledinterface.h
@@ -46,6 +46,9 @@ signals:
public slots:
void setEnabled(bool);
void setActive(bool);
+ void ping();
+ void disconnect();
+ void reconnect();
private slots:
void getUnitProperties();
diff --git a/app/qml/cover/CoverPage.qml b/app/qml/cover/CoverPage.qml
index 1fea52c..767799e 100644
--- a/app/qml/cover/CoverPage.qml
+++ b/app/qml/cover/CoverPage.qml
@@ -65,7 +65,7 @@ CoverBackground {
if (pebbled.connected) {
pebbled.ping();
} else {
- pebbled.connect();
+ pebbled.reconnect();
}
}
}
diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml
index f24fae7..adb1cf4 100644
--- a/app/qml/pages/ManagerPage.qml
+++ b/app/qml/pages/ManagerPage.qml
@@ -104,7 +104,11 @@ Page {
checked: pebbled.connected
automaticCheck: false
onClicked: {
- console.log('pebbled.(dis)connect()');
+ if (pebbled.connected) {
+ pebbled.disconnect();
+ } else {
+ pebbled.connect();
+ }
}
}