diff options
| author | Javier S. Pedro <dev.git@javispedro.com> | 2014-09-17 00:09:03 +0200 |
|---|---|---|
| committer | Javier S. Pedro <dev.git@javispedro.com> | 2014-09-17 00:09:03 +0200 |
| commit | ffa3bc65f508aa805c82db28f90b8e0776846c1a (patch) | |
| tree | dc8c9aea8d03f85e2d7b9399b9bb03cb781f208d | |
| parent | d9f140ec45f91a8567b6d8e2ce69fe853ae8b3a9 (diff) | |
| download | salmeta-ffa3bc65f508aa805c82db28f90b8e0776846c1a.tar.gz salmeta-ffa3bc65f508aa805c82db28f90b8e0776846c1a.zip | |
Bump version, fix release build issues, fix writeLcdBuffer throughput
| -rw-r--r-- | rpm/salmeta.spec | 2 | ||||
| -rw-r--r-- | rpm/salmeta.yaml | 2 | ||||
| -rw-r--r-- | src/availablewidgetsmodel.cpp | 1 | ||||
| -rw-r--r-- | src/metawatchbletransport.cpp | 5 | ||||
| -rw-r--r-- | src/salmeta.cpp | 4 |
5 files changed, 11 insertions, 3 deletions
diff --git a/rpm/salmeta.spec b/rpm/salmeta.spec index d1f3b26..971d0aa 100644 --- a/rpm/salmeta.spec +++ b/rpm/salmeta.spec @@ -13,7 +13,7 @@ Name: salmeta %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Salmeta -Version: 0.1 +Version: 0.1.1 Release: 1 Group: Communications/Bluetooth License: GPLv3 diff --git a/rpm/salmeta.yaml b/rpm/salmeta.yaml index 17ec9bd..1432f81 100644 --- a/rpm/salmeta.yaml +++ b/rpm/salmeta.yaml @@ -1,6 +1,6 @@ Name: salmeta Summary: Salmeta -Version: 0.1 +Version: 0.1.1 Release: 1 Group: Communications/Bluetooth URL: http://javispedro.com diff --git a/src/availablewidgetsmodel.cpp b/src/availablewidgetsmodel.cpp index b95e79a..37232dc 100644 --- a/src/availablewidgetsmodel.cpp +++ b/src/availablewidgetsmodel.cpp @@ -1,3 +1,4 @@ +#include <QtCore/QDebug> #include <sailfishapp.h> #include "availablewidgetsmodel.h" diff --git a/src/metawatchbletransport.cpp b/src/metawatchbletransport.cpp index 9a56893..6df6c2a 100644 --- a/src/metawatchbletransport.cpp +++ b/src/metawatchbletransport.cpp @@ -1,3 +1,4 @@ +#include "metawatch.h" #include "metawatchbletransport.h" const GatoUUID MetaWatchBLETransport::ServiceUuid(quint16(0x8880)); @@ -24,8 +25,10 @@ MetaWatchBLETransport::~MetaWatchBLETransport() void MetaWatchBLETransport::sendMessage(quint8 type, quint8 options, const QByteArray &payload) { QByteArray packet = encode(type, options, payload); + bool need_ack = type != MetaWatch::MessageWriteLcdBuffer; qDebug() << "Send:" << packet.toHex(); - _dev->writeValue(_out, packet); + _dev->writeValue(_out, packet, + need_ack ? GatoPeripheral::WriteWithResponse : GatoPeripheral::WriteWithoutResponse); } void MetaWatchBLETransport::connectDevice() diff --git a/src/salmeta.cpp b/src/salmeta.cpp index 914f117..7bc14ae 100644 --- a/src/salmeta.cpp +++ b/src/salmeta.cpp @@ -1,5 +1,9 @@ #include <QtCore/QDebug> +#include <QtGui/QGuiApplication> #include <QtGui/QFontDatabase> +#include <QtQml/QQmlComponent> +#include <QtQml/QQmlContext> +#include <QtQuick/QQuickView> #include <sailfishapp.h> #include "controller.h" |