summaryrefslogtreecommitdiff
path: root/libsowatch
diff options
context:
space:
mode:
Diffstat (limited to 'libsowatch')
-rw-r--r--libsowatch/libsowatch.pro12
-rw-r--r--libsowatch/metawatch.cpp409
-rw-r--r--libsowatch/metawatch.h122
-rw-r--r--libsowatch/metawatchpaintengine.cpp82
-rw-r--r--libsowatch/metawatchpaintengine.h34
-rw-r--r--libsowatch/metawatchsimulator.cpp82
-rw-r--r--libsowatch/metawatchsimulator.h32
-rw-r--r--libsowatch/metawatchsimulatorform.cpp82
-rw-r--r--libsowatch/metawatchsimulatorform.h46
-rw-r--r--libsowatch/metawatchsimulatorform.ui294
-rw-r--r--libsowatch/sowatch.h1
-rw-r--r--libsowatch/watchplugininterface.cpp7
-rw-r--r--libsowatch/watchplugininterface.h25
13 files changed, 41 insertions, 1187 deletions
diff --git a/libsowatch/libsowatch.pro b/libsowatch/libsowatch.pro
index b2ff054..a5b4fd8 100644
--- a/libsowatch/libsowatch.pro
+++ b/libsowatch/libsowatch.pro
@@ -23,7 +23,8 @@ SOURCES += \
testdeclarativewatchlet.cpp \
graphicswatchlet.cpp \
declarativewatchwrapper.cpp \
- declarativewatchlet.cpp
+ declarativewatchlet.cpp \
+ watchplugininterface.cpp
HEADERS +=\
watchsimulator.h \
@@ -37,10 +38,10 @@ HEADERS +=\
graphicswatchlet.h \
declarativewatchwrapper.h \
declarativewatchlet.h \
- sowatch_global.h
+ sowatch_global.h \
+ watchplugininterface.h
-FORMS += \
- metawatchsimulatorform.ui
+FORMS +=
install_headers.files =\
watchsimulator.h \
@@ -80,3 +81,6 @@ unix:!symbian {
+
+
+
diff --git a/libsowatch/metawatch.cpp b/libsowatch/metawatch.cpp
deleted file mode 100644
index b968fad..0000000
--- a/libsowatch/metawatch.cpp
+++ /dev/null
@@ -1,409 +0,0 @@
-#include <QtCore/QDebug>
-#include <QtCore/QDateTime>
-
-#include "metawatchpaintengine.h"
-#include "metawatch.h"
-
-using namespace sowatch;
-QTM_USE_NAMESPACE
-
-#define SINGLE_LINE_UPDATE 0
-
-const quint8 MetaWatch::bitRevTable[16] = {
- 0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15
-};
-
-const quint16 MetaWatch::crcTable[256] = {
- 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
- 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
- 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
- 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
- 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
- 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
- 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
- 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
- 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
- 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
- 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
- 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
- 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
- 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
- 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
- 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
- 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
- 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
- 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
- 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
- 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
- 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
- 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
- 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
- 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
- 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
- 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
- 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
- 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
- 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
- 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
- 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
-};
-
-#if 0 /* This snippet was used to build the table seen above. */
- quint16 remainder;
- int dividend;
- quint8 bit;
-
- for (dividend = 0; dividend < 256; dividend++) {
- remainder = dividend << 8;
- for (bit = 8; bit > 0; bit--) {
- if (remainder & 0x8000) {
- remainder = (remainder << 1) ^ 0x1021;
- } else {
- remainder = (remainder << 1);
- }
- }
- if ((dividend % 8) == 0) {
- printf(",\n0x%04hx", remainder);
- } else {
- printf(", 0x%04hx", remainder);
- }
- }
-#endif
-
-MetaWatch::MetaWatch(const QBluetoothAddress& address, QObject *parent) :
- Watch(QImage(96, 96, QImage::Format_MonoLSB), parent),
- _socket(new QBluetoothSocket(QBluetoothSocket::RfcommSocket)),
- _sendTimer(new QTimer(this))
-{
- connect(_socket, SIGNAL(connected()), SLOT(socketConnected()));
- connect(_socket, SIGNAL(disconnected()), SLOT(socketDisconnected()));
- connect(_socket, SIGNAL(readyRead()), SLOT(socketData()));
- connect(_socket, SIGNAL(error(QBluetoothSocket::SocketError)),
- SLOT(socketError(QBluetoothSocket::SocketError)));
- connect(_socket, SIGNAL(stateChanged(QBluetoothSocket::SocketState)),
- SLOT(socketState(QBluetoothSocket::SocketState)));
-
- _sendTimer->setInterval(30);
- connect(_sendTimer, SIGNAL(timeout()), SLOT(timedSend()));
-
- _socket->connectToService(address, 1, QIODevice::ReadWrite | QIODevice::Unbuffered);
-}
-
-QPaintEngine* MetaWatch::paintEngine() const
-{
- if (!_paintEngine) {
- _paintEngine = new MetaWatchPaintEngine(const_cast<MetaWatch*>(this),
- const_cast<QImage*>(&_image));
- }
-
- return _paintEngine;
-}
-
-QString MetaWatch::model() const
-{
- return "metawatch-digital";
-}
-
-bool MetaWatch::isConnected() const
-{
- return _socket->state() == QBluetoothSocket::ConnectedState;
-}
-
-bool MetaWatch::busy() const
-{
- return _socket->state() != QBluetoothSocket::ConnectedState ||
- _toSend.size() > 20;
-}
-
-void MetaWatch::update(const QList<QRect> &rects)
-{
- if (_socket->state() != QBluetoothSocket::ConnectedState) return;
- const QRect imageRect = _image.rect();
- QVector<bool> lines(_image.height(), false);
-
- foreach (const QRect& rect, rects) {
- QRect r = rect.intersect(imageRect);
- for (int i = r.top(); i <= r.bottom(); i++) {
- lines[i] = true;
- }
- }
-
- updateLines(ApplicationMode, _image, lines);
- updateDisplay(ApplicationMode);
-}
-
-void MetaWatch::clear(bool white)
-{qDebug() << "MWclear" << white;
- if (_socket->state() != QBluetoothSocket::ConnectedState) return;
- loadTemplate(ApplicationMode, white ? 1 : 0);
-}
-
-void MetaWatch::vibrate(bool on)
-{
-
-}
-
-void MetaWatch::setDateTime(const QDateTime &dateTime)
-{
- Message msg(SetRealTimeClock, QByteArray(10, 0));
- const QDate& date = dateTime.date();
- const QTime& time = dateTime.time();
-
- msg.data[0] = date.year() & 0xF00;
- msg.data[1] = date.year() & 0xFF;
- msg.data[2] = date.month();
- msg.data[3] = date.day();
- msg.data[4] = date.dayOfWeek() - 1;
- msg.data[5] = time.hour();
- msg.data[6] = time.minute();
- msg.data[7] = time.second();
- msg.data[8] = 1;
- msg.data[9] = 1;
-
- send(msg);
-}
-
-quint16 MetaWatch::calcCrc(const QByteArray &data, int size)
-{
- quint16 remainder = 0xFFFF;
-
- for (int i = 0; i < size; i++) {
- quint8 byte = data[i];
- byte = (bitRevTable[byte & 0xF] << 4) | bitRevTable[(byte & 0xF0) >> 4];
- remainder = crcTable[byte ^ (remainder >> 8)] ^ (remainder << 8);
- }
-
- return remainder;
-}
-
-quint16 MetaWatch::calcCrc(const Message& msg)
-{
- QByteArray data;
- const int msgSize = msg.data.size();
-
- data.resize(msgSize + 4);
- data[0] = 0x01;
- data[1] = msgSize + 6;
- data[2] = msg.type;
- data[3] = msg.options;
- data.replace(4, msgSize, msg.data);
-
- return calcCrc(data, msgSize + 4);
-}
-
-void MetaWatch::send(const Message &msg)
-{
- _toSend.enqueue(msg);
- if (!_sendTimer->isActive()) {
- _sendTimer->start();
- }
-}
-
-void MetaWatch::handleMessage(const Message &msg)
-{
- switch (msg.type) {
- case StatusChangeEvent:
- handleStatusChange(msg);
- break;
- case ButtonEvent:
- handleButtonEvent(msg);
- break;
- default:
- qWarning() << "Unknown message of type" << msg.type << "received";
- break;
- }
-}
-
-void MetaWatch::updateLine(Mode mode, const QImage& image, int line)
-{
- Message msg(WriteBuffer, QByteArray(13, 0), (1 << 4) | (mode & 0xF));
- const char * scanLine = (const char *) image.constScanLine(line);
-
- msg.data[0] = line;
- msg.data.replace(1, 12, scanLine, 12);
-
- send(msg);
-}
-
-void MetaWatch::updateLines(Mode mode, const QImage& image, int lineA, int lineB)
-{
- Message msg(WriteBuffer, QByteArray(26, 0), mode & 0xF);
- const char * scanLine = (const char *) image.constScanLine(lineA);
-
- msg.data[0] = lineA;
- msg.data.replace(1, 12, scanLine, 12);
-
- scanLine = (const char *) image.constScanLine(lineB);
- msg.data[13] = lineB;
- msg.data.replace(14, 12, scanLine, 12);
-
- send(msg);
-}
-
-void MetaWatch::updateLines(Mode mode, const QImage& image, const QVector<bool>& lines)
-{
- int lineCount = lines.count(true);
- int lineA = -1;
-
- if (lineCount == 0) return;
-
- for (int line = 0; line < lines.size(); line++) {
- if (lines[line]) {
- lineCount--;
-#if SINGLE_LINE_UPDATE
- updateLine(mode, image, line);
- continue;
-#endif
- if (lineA >= 0) {
- // We have a pair of lines to send.
- updateLines(mode, image, lineA, line);
- lineA = -1;
- } else if (lineCount > 0) {
- // Still another line to send.
- lineA = line;
- } else {
- updateLine(mode, image, line);
- break; // No more lines
- }
- }
- }
-}
-
-void MetaWatch::configureWatchMode(Mode mode, int timeout, bool invert)
-{
- Message msg(ConfigureMode, QByteArray(2, 0), mode & 0xF);
- msg.data[0] = timeout;
- msg.data[1] = invert ? 1 : 0;
- send(msg);
-}
-
-void MetaWatch::updateDisplay(Mode mode, bool copy)
-{
- Message msg(UpdateDisplay, QByteArray(),
- (copy ? 0x10 : 0) | (mode & 0xF));
- send(msg);
-}
-
-void MetaWatch::loadTemplate(Mode mode, int templ)
-{
- Message msg(LoadTemplate, QByteArray(1, templ), mode & 0xF);
- send(msg);
-}
-
-void MetaWatch::handleStatusChange(const Message &msg)
-{
- qDebug() << "watch status changed" << msg.data.size();
-}
-
-void MetaWatch::handleButtonEvent(const Message &msg)
-{
- if (msg.data.size() < 1) return;
- quint8 button = msg.data[0];
-
- emit buttonPressed(button); // TODO This is completely broken
-}
-
-void MetaWatch::socketConnected()
-{
- qDebug() << "connected";
- _partialReceived.type = NoMessage;
- _partialReceived.data.clear();
- _buttonState = 0;
- setDateTime(QDateTime::currentDateTime());
- configureWatchMode(ApplicationMode);
- emit connected();
-}
-
-void MetaWatch::socketDisconnected()
-{
- _toSend.clear();
- _sendTimer->stop();
- emit disconnected();
-}
-
-void MetaWatch::socketData()
-{
- qint64 dataRead;
-
- if (_partialReceived.type == 0) {
- if (_socket->bytesAvailable() < 4) return; /* Wait for more. */
- char header[4];
-
- dataRead = _socket->read(header, 4);
- if (dataRead < 4 || header[0] != 0x01) {
- qWarning() << "TODO: Resync/Handle Garbage";
- return;
- }
-
- _partialReceived.type = static_cast<MessageType>(header[2]);
- _partialReceived.data.resize(header[1] - 6);
- _partialReceived.options = header[3];
- }
- if (_socket->bytesAvailable() < _partialReceived.data.size() + 2) {
- return; /* Wait for more. */
- }
- dataRead = _socket->read(_partialReceived.data.data(), _partialReceived.data.size());
- if (dataRead < _partialReceived.data.size()) {
- qWarning() << "Short read";
- return;
- }
-
- char tail[2];
- dataRead = _socket->read(tail, 2);
- if (dataRead < 2) {
- qWarning() << "Short read";
- return;
- }
-
- quint16 realCrc = calcCrc(_partialReceived);
- quint16 expectedCrc = tail[1] << 8 | (tail[0] & 0xFFU);
- if (realCrc == expectedCrc) {
- handleMessage(_partialReceived);
- } else {
- qWarning() << "CRC error?";
- }
-
- _partialReceived.data.clear();
- _partialReceived.type = NoMessage;
-}
-
-void MetaWatch::socketError(QBluetoothSocket::SocketError error)
-{
- qWarning() << "Socket error:" << error;
-}
-
-void MetaWatch::socketState(QBluetoothSocket::SocketState error)
-{
- qDebug() << "socket is in" << error;
-}
-
-void MetaWatch::timedSend()
-{
- if (_toSend.count() > 0) {
- realSend(_toSend.dequeue());
- }
- if (_toSend.count() == 0) {
- _sendTimer->stop();
- }
-}
-
-void MetaWatch::realSend(const Message &msg)
-{
- const int msgSize = msg.data.size();
- QByteArray data;
- quint16 crc;
-
- data.resize(msgSize + 6);
- data[0] = 0x01;
- data[1] = msgSize + 6;
- data[2] = msg.type;
- data[3] = msg.options;
- data.replace(4, msgSize, msg.data);
- crc = calcCrc(data, msgSize + 4);
- data[msgSize+4] = crc & 0xFF;
- data[msgSize+5] = crc >> 8;
-
- //qDebug() << "Sending" << data.toHex();
-
- _socket->write(data);
-}
diff --git a/libsowatch/metawatch.h b/libsowatch/metawatch.h
deleted file mode 100644
index 80a1894..0000000
--- a/libsowatch/metawatch.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#ifndef METAWATCH_H
-#define METAWATCH_H
-
-#include <QtConnectivity/QBluetoothAddress>
-#include <QtConnectivity/QBluetoothSocket>
-#include <QtCore/QQueue>
-#include <QtCore/QTimer>
-#include "watch.h"
-
-using QTM_PREPEND_NAMESPACE(QBluetoothSocket);
-using QTM_PREPEND_NAMESPACE(QBluetoothAddress);
-
-namespace sowatch
-{
-
-class MetaWatch : public Watch
-{
- Q_OBJECT
- Q_ENUMS(MessageType Mode)
-
-public:
- explicit MetaWatch(const QBluetoothAddress& address, QObject *parent = 0);
-
- QPaintEngine* paintEngine() const;
-
- QString model() const;
- bool isConnected() const;
- bool busy() const;
- void update(const QList<QRect>& rects);
- void clear(bool white = false);
- void vibrate(bool on);
-
- void setDateTime(const QDateTime& dateTime);
-
- enum MessageType {
- NoMessage = 0,
- GetDeviceType = 0x01,
- GetDeviceTypeResponse = 0x02,
- GetInformationString = 0x03,
- GetInformationStringResponse = 0x04,
- AdvanceWatchHands = 0x20,
- SetVibrateMode = 0x23,
- SetRealTimeClock = 0x26,
- GetRealTimeClock = 0x27,
- GetRealTimeClockResponse = 0x28,
- StatusChangeEvent = 0x33,
- ButtonEvent = 0x34,
- WriteBuffer = 0x40,
- ConfigureMode = 0x41,
- ConfigureIdleBufferSize = 0x42,
- UpdateDisplay = 0x43,
- LoadTemplate = 0x44,
- EnableButton = 0x46,
- DisableButton = 0x47,
- ReadButtonConfiguration = 0x48,
- ReadButtonConfigurationResponse = 0x49,
- BatteryConfiguration = 0x53,
- LowBatteryWarning = 0x54,
- LowBatteryBluetoothOff = 0x55,
- ReadBatteryVoltage = 0x56,
- ReadBatteryVoltageResponse = 0x57,
- Accelerometer = 0xea
- };
-
- enum Mode {
- IdleMode = 0,
- ApplicationMode = 1
- };
-
-protected:
- QBluetoothSocket* _socket;
-
- struct Message {
- MessageType type;
- quint8 options;
- QByteArray data;
- Message(MessageType ntype = NoMessage, QByteArray ndata = QByteArray(), quint8 noptions = 0) :
- type(ntype), options(noptions), data(ndata)
- {
-
- }
- };
-
- QQueue<Message> _toSend;
- QTimer* _sendTimer;
- Message _partialReceived;
-
- quint8 _buttonState;
-
- static const quint8 bitRevTable[16];
- static const quint16 crcTable[256];
- quint16 calcCrc(const QByteArray& data, int size);
- quint16 calcCrc(const Message& msg);
-
- void send(const Message& msg);
- void handleMessage(const Message& msg);
-
- void updateLine(Mode mode, const QImage& image, int line);
- void updateLines(Mode mode, const QImage& image, int lineA, int lineB);
- void updateLines(Mode mode, const QImage& image, const QVector<bool>& lines);
- void configureWatchMode(Mode mode, int timeout = 10, bool invert = false);
- void updateDisplay(Mode mode, bool copy = true);
- void loadTemplate(Mode mode, int templ);
-
- void handleStatusChange(const Message& msg);
- void handleButtonEvent(const Message& msg);
-
-protected slots:
- void socketConnected();
- void socketDisconnected();
- void socketData();
- void socketError(QBluetoothSocket::SocketError error);
- void socketState(QBluetoothSocket::SocketState error);
- void timedSend();
-
-private:
- void realSend(const Message& msg);
-};
-
-}
-
-#endif // METAWATCH_H
diff --git a/libsowatch/metawatchpaintengine.cpp b/libsowatch/metawatchpaintengine.cpp
deleted file mode 100644
index 71ad452..0000000
--- a/libsowatch/metawatchpaintengine.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "metawatch.h"
-#include "metawatchpaintengine.h"
-
-using namespace sowatch;
-
-MetaWatchPaintEngine::MetaWatchPaintEngine(MetaWatch* watch, QImage* image) :
- WatchPaintEngine(watch, image), _watch(watch),
- _imageRect(image->rect())
-{
-}
-
-void MetaWatchPaintEngine::drawRects(const QRectF *rects, int rectCount)
-{
- int i;
- for (i = 0; i < rectCount; i++) {
- const QRectF& r = rects[i];
- if (_hasBrush && fillsEntireImage(r.toRect()) && (_isBrushBlack | _isBrushWhite)) {
- _watch->clear(_isBrushWhite);
- _damaged = QRegion();
- continue;
- }
- if (_hasBrush) {
- damageRect(r);
- }
- if (_hasPen) {
- damagePenStroke(QLineF(r.left(), r.top(), r.right(), r.top()));
- damagePenStroke(QLineF(r.right(), r.top(), r.right(), r.bottom()));
- damagePenStroke(QLineF(r.left(), r.bottom(), r.right(), r.bottom()));
- damagePenStroke(QLineF(r.left(), r.top(), r.left(), r.bottom()));
- }
- }
- _painter.drawRects(rects, rectCount);
-}
-
-void MetaWatchPaintEngine::drawRects(const QRect *rects, int rectCount)
-{
- int i;
- for (i = 0; i < rectCount; i++) {
- const QRect& r = rects[i];
- if (_hasBrush && fillsEntireImage(r) && (_isBrushBlack | _isBrushWhite)) {
- _watch->clear(_isBrushWhite);
- _damaged = QRegion();
- continue;
- }
- if (_hasBrush) {
- damageRect(r);
- }
- if (_hasPen) {
- damagePenStroke(QLine(r.left(), r.top(), r.right(), r.top()));
- damagePenStroke(QLine(r.right(), r.top(), r.right(), r.bottom()));
- damagePenStroke(QLine(r.left(), r.bottom(), r.right(), r.bottom()));
- damagePenStroke(QLine(r.left(), r.top(), r.left(), r.bottom()));
- }
- }
-
- _painter.drawRects(rects, rectCount);
-}
-
-void MetaWatchPaintEngine::updateState(const QPaintEngineState &state)
-{
- WatchPaintEngine::updateState(state);
- if (state.state() & QPaintEngine::DirtyBrush) {
- QBrush brush = state.brush();
- _isBrushBlack = false;
- _isBrushWhite = false;
- if (brush.style() == Qt::SolidPattern) {
- const QColor color = brush.color();
- if (color == Qt::black) {
- _isBrushBlack = true;
- } else if (color == Qt::white) {
- _isBrushWhite = true;
- }
- }
- }
-}
-
-bool MetaWatchPaintEngine::fillsEntireImage(const QRect& rect)
-{
- return rect == _imageRect &&
- (!_clipEnabled ||
- (_clipRegion.numRects() == 1 && _clipRegion.rects().at(0) == _imageRect));
-}
diff --git a/libsowatch/metawatchpaintengine.h b/libsowatch/metawatchpaintengine.h
deleted file mode 100644
index efc3d6e..0000000
--- a/libsowatch/metawatchpaintengine.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef METAWATCHPAINTENGINE_H
-#define METAWATCHPAINTENGINE_H
-
-#include <QtCore/QRect>
-#include "watchpaintengine.h"
-
-namespace sowatch
-{
-
-class MetaWatch;
-
-/** This WatchPaintEngine accelerates fillRects by using the MetaWatch's template command. */
-class MetaWatchPaintEngine : public WatchPaintEngine
-{
-public:
- explicit MetaWatchPaintEngine(MetaWatch* watch, QImage* image);
-
- void drawRects(const QRectF *rects, int rectCount);
- void drawRects(const QRect *rects, int rectCount);
-
- void updateState(const QPaintEngineState &state);
-
-protected:
- bool fillsEntireImage(const QRect& rect);
-
- MetaWatch* _watch;
- QRect _imageRect;
- bool _isBrushBlack;
- bool _isBrushWhite;
-};
-
-}
-
-#endif // METAWATCHPAINTENGINE_H
diff --git a/libsowatch/metawatchsimulator.cpp b/libsowatch/metawatchsimulator.cpp
deleted file mode 100644
index 11b938a..0000000
--- a/libsowatch/metawatchsimulator.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include <QtCore/QDebug>
-#include <QtGui/QPainter>
-
-#include "metawatchsimulator.h"
-
-#define SIMULATE_DAMAGES 1
-#define SIMULATE_FRAMERATE 1
-
-using namespace sowatch;
-
-MetaWatchSimulator::MetaWatchSimulator(QObject *parent) :
- WatchSimulator(QImage(96, 96, QImage::Format_Mono), parent),
- _screen(96, 96),
- _form(new MetaWatchSimulatorForm),
- _nextFrame(QTime::currentTime())
-{
- _form->showNormal();
- connect(_form, SIGNAL(destroyed()), SIGNAL(disconnected()));
- connect(_form, SIGNAL(buttonPressed(int)), SIGNAL(buttonPressed(int)));
- connect(_form, SIGNAL(buttonReleased(int)), SIGNAL(buttonReleased(int)));
-}
-
-MetaWatchSimulator::~MetaWatchSimulator()
-{
- delete _form;
-}
-
-QString MetaWatchSimulator::model() const
-{
- return "metawatch-digital";
-}
-
-bool MetaWatchSimulator::isConnected() const
-{
- return true;
-}
-
-bool MetaWatchSimulator::busy() const
-{
-#if SIMULATE_FRAMERATE
- return _nextFrame > QTime::currentTime();
-#else
- return false;
-#endif
-}
-
-void MetaWatchSimulator::update(const QList<QRect> &rects)
-{
-#if SIMULATE_DAMAGES
- const QRect imageRect = _image.rect();
- QPainter p;
- QVector<bool> rows(96, false);
- unsigned total = 0, totalRows;
-
- p.begin(&_screen);
- foreach (const QRect& rect, rects) {
- QRect r = rect.intersect(imageRect);
- for (int i = r.top(); i <= r.bottom(); i++) {
- rows[i] = true;
- }
- total += r.width() * r.height();
-
- p.drawImage(r, _image, r);
- }
- p.end();
-
- totalRows = rows.count(true);
-
- _form->refreshScreen(_screen);
-
- qDebug() << "updated " << total << " pixels " << totalRows << " lines";
- _nextFrame = QTime::currentTime().addMSecs(((totalRows / 2) + 1) * 30);
-#else
- _form->refreshScreen(QPixmap::fromImage(_image));
- _nextFrame = QTime::currentTime().addMSecs(30);
-#endif
-}
-
-void MetaWatchSimulator::vibrate(bool on)
-{
- qDebug() << "vibrate" << on;
-}
diff --git a/libsowatch/metawatchsimulator.h b/libsowatch/metawatchsimulator.h
deleted file mode 100644
index 674c3c6..0000000
--- a/libsowatch/metawatchsimulator.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef METAWATCHSIMULATOR_H
-#define METAWATCHSIMULATOR_H
-
-#include <QtCore/QTime>
-#include "watchsimulator.h"
-#include "metawatchsimulatorform.h"
-
-namespace sowatch {
-
-class MetaWatchSimulator : public WatchSimulator
-{
- Q_OBJECT
-public:
- explicit MetaWatchSimulator(QObject *parent = 0);
- ~MetaWatchSimulator();
-
- QString model() const;
- bool isConnected() const;
- bool busy() const;
-
- void update(const QList<QRect> &rects);
- void vibrate(bool on);
-
-protected:
- QPixmap _screen;
- MetaWatchSimulatorForm* _form;
- QTime _nextFrame;
-};
-
-}
-
-#endif // METAWATCHSIMULATOR_H
diff --git a/libsowatch/metawatchsimulatorform.cpp b/libsowatch/metawatchsimulatorform.cpp
deleted file mode 100644
index f2323bd..0000000
--- a/libsowatch/metawatchsimulatorform.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "metawatchsimulatorform.h"
-#include "ui_metawatchsimulatorform.h"
-
-using namespace sowatch;
-
-MetaWatchSimulatorForm::MetaWatchSimulatorForm(QWidget* parent) :
- QWidget(parent),
- ui(new Ui::MetaWatchSimulatorForm)
-{
- ui->setupUi(this);
-}
-
-MetaWatchSimulatorForm::~MetaWatchSimulatorForm()
-{
- delete ui;
-}
-
-void MetaWatchSimulatorForm::refreshScreen(const QPixmap& pixmap)
-{
- ui->lblDisplay->setPixmap(pixmap);
- ui->lblDisplay->update();
-}
-
-void MetaWatchSimulatorForm::btnAPressed()
-{
- emit buttonPressed(0);
-}
-
-void MetaWatchSimulatorForm::btnAReleased()
-{
- emit buttonReleased(0);
-}
-
-void MetaWatchSimulatorForm::btnBPressed()
-{
- emit buttonPressed(1);
-}
-
-void MetaWatchSimulatorForm::btnBReleased()
-{
- emit buttonReleased(1);
-}
-
-void MetaWatchSimulatorForm::btnCPressed()
-{
- emit buttonPressed(2);
-}
-
-void MetaWatchSimulatorForm::btnCReleased()
-{
- emit buttonReleased(2);
-}
-
-void MetaWatchSimulatorForm::btnDPressed()
-{
- emit buttonPressed(3);
-}
-
-void MetaWatchSimulatorForm::btnDReleased()
-{
- emit buttonReleased(3);
-}
-
-void MetaWatchSimulatorForm::btnEPressed()
-{
- emit buttonPressed(4);
-}
-
-void MetaWatchSimulatorForm::btnEReleased()
-{
- emit buttonReleased(4);
-}
-
-void MetaWatchSimulatorForm::btnFPressed()
-{
- emit buttonPressed(5);
-}
-
-void MetaWatchSimulatorForm::btnFReleased()
-{
- emit buttonReleased(5);
-}
diff --git a/libsowatch/metawatchsimulatorform.h b/libsowatch/metawatchsimulatorform.h
deleted file mode 100644
index 0b45746..0000000
--- a/libsowatch/metawatchsimulatorform.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef METAWATCHSIMULATORFORM_H
-#define METAWATCHSIMULATORFORM_H
-
-#include <QWidget>
-
-namespace Ui {
- class MetaWatchSimulatorForm;
-}
-
-namespace sowatch {
-
-class MetaWatchSimulatorForm : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit MetaWatchSimulatorForm(QWidget *parent = 0);
- ~MetaWatchSimulatorForm();
-
- void refreshScreen(const QPixmap& screen);
-
-signals:
- void buttonPressed(int button);
- void buttonReleased(int button);
-
-protected slots:
- void btnAPressed();
- void btnAReleased();
- void btnBPressed();
- void btnBReleased();
- void btnCPressed();
- void btnCReleased();
- void btnDPressed();
- void btnDReleased();
- void btnEPressed();
- void btnEReleased();
- void btnFPressed();
- void btnFReleased();
-
-private:
- Ui::MetaWatchSimulatorForm *ui;
-};
-
-}
-
-#endif // METAWATCHSIMULATORFORM_H
diff --git a/libsowatch/metawatchsimulatorform.ui b/libsowatch/metawatchsimulatorform.ui
deleted file mode 100644
index 39280b3..0000000
--- a/libsowatch/metawatchsimulatorform.ui
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MetaWatchSimulatorForm</class>
- <widget class="QWidget" name="MetaWatchSimulatorForm">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>262</width>
- <height>113</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>MetaWatch-Digital Simulator</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <layout class="QVBoxLayout" name="btnsLeft">
- <item>
- <widget class="QPushButton" name="btnA">
- <property name="text">
- <string>A</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnB">
- <property name="text">
- <string>B</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnC">
- <property name="text">
- <string>C</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="lblDisplay">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="btnsRight">
- <item>
- <widget class="QPushButton" name="btnD">
- <property name="text">
- <string>D</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnE">
- <property name="text">
- <string>E</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnF">
- <property name="text">
- <string>F</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections>
- <connection>
- <sender>btnA</sender>
- <signal>pressed()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnAPressed()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>44</x>
- <y>20</y>
- </hint>
- <hint type="destinationlabel">
- <x>105</x>
- <y>4</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnA</sender>
- <signal>released()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnAReleased()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>71</x>
- <y>21</y>
- </hint>
- <hint type="destinationlabel">
- <x>4</x>
- <y>10</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnB</sender>
- <signal>pressed()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnBPressed()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>68</x>
- <y>57</y>
- </hint>
- <hint type="destinationlabel">
- <x>98</x>
- <y>75</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnB</sender>
- <signal>released()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnBReleased()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>86</x>
- <y>56</y>
- </hint>
- <hint type="destinationlabel">
- <x>98</x>
- <y>58</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnC</sender>
- <signal>pressed()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnCPressed()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>37</x>
- <y>90</y>
- </hint>
- <hint type="destinationlabel">
- <x>73</x>
- <y>108</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnC</sender>
- <signal>released()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnCReleased()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>21</x>
- <y>89</y>
- </hint>
- <hint type="destinationlabel">
- <x>19</x>
- <y>105</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnD</sender>
- <signal>pressed()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnDPressed()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>203</x>
- <y>18</y>
- </hint>
- <hint type="destinationlabel">
- <x>205</x>
- <y>5</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnD</sender>
- <signal>released()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnDReleased()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>244</x>
- <y>22</y>
- </hint>
- <hint type="destinationlabel">
- <x>258</x>
- <y>21</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnE</sender>
- <signal>pressed()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnEPressed()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>237</x>
- <y>50</y>
- </hint>
- <hint type="destinationlabel">
- <x>256</x>
- <y>51</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnE</sender>
- <signal>released()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnEReleased()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>174</x>
- <y>46</y>
- </hint>
- <hint type="destinationlabel">
- <x>164</x>
- <y>40</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnF</sender>
- <signal>pressed()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnFPressed()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>236</x>
- <y>89</y>
- </hint>
- <hint type="destinationlabel">
- <x>258</x>
- <y>87</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>btnF</sender>
- <signal>released()</signal>
- <receiver>MetaWatchSimulatorForm</receiver>
- <slot>btnFReleased()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>185</x>
- <y>90</y>
- </hint>
- <hint type="destinationlabel">
- <x>187</x>
- <y>108</y>
- </hint>
- </hints>
- </connection>
- </connections>
- <slots>
- <slot>btnAPressed()</slot>
- <slot>btnAReleased()</slot>
- <slot>btnBPressed()</slot>
- <slot>btnBReleased()</slot>
- <slot>btnCPressed()</slot>
- <slot>btnCReleased()</slot>
- <slot>btnDPressed()</slot>
- <slot>btnDReleased()</slot>
- <slot>btnEPressed()</slot>
- <slot>btnEReleased()</slot>
- <slot>btnFPressed()</slot>
- <slot>btnFReleased()</slot>
- </slots>
-</ui>
diff --git a/libsowatch/sowatch.h b/libsowatch/sowatch.h
index a5044b3..0463389 100644
--- a/libsowatch/sowatch.h
+++ b/libsowatch/sowatch.h
@@ -8,5 +8,6 @@
#include "declarativewatchlet.h"
#include "watchserver.h"
#include "watchsimulator.h"
+#include "watchplugininterface.h"
#endif // SOWATCH_H
diff --git a/libsowatch/watchplugininterface.cpp b/libsowatch/watchplugininterface.cpp
new file mode 100644
index 0000000..2af65e2
--- /dev/null
+++ b/libsowatch/watchplugininterface.cpp
@@ -0,0 +1,7 @@
+#include "watchplugininterface.h"
+
+using namespace sowatch;
+
+WatchPluginInterface::~WatchPluginInterface()
+{
+}
diff --git a/libsowatch/watchplugininterface.h b/libsowatch/watchplugininterface.h
new file mode 100644
index 0000000..6b32385
--- /dev/null
+++ b/libsowatch/watchplugininterface.h
@@ -0,0 +1,25 @@
+#ifndef WATCHPLUGININTERFACE_H
+#define WATCHPLUGININTERFACE_H
+
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+
+namespace sowatch
+{
+
+class Watch;
+
+class WatchPluginInterface
+{
+public:
+ virtual ~WatchPluginInterface();
+
+ virtual QStringList drivers() = 0;
+ virtual Watch* getWatch(const QString& driver, const QString& connId, QObject *parent = 0) = 0;
+};
+
+}
+
+Q_DECLARE_INTERFACE(sowatch::WatchPluginInterface, "com.javispedro.sowatch.WatchPluginInterface")
+
+#endif // WATCHPLUGININTERFACE_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 09:53:43 +0000