ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add bluetooth service discovery and bluetooth interface

Browse Source
This commit is contained in:
Simon Stürz 2018-07-04 21:28:33 +02:00
parent 00e2ee75f0
commit 5e407ff13f
85 changed files with 463 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
libnymea-app-core/bluetoothinterface.cpp
View File

@ -1,92 +1,110 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* *
* This file is part of nymea:app *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "bluetoothinterface.h" #include "bluetoothinterface.h"
#include <QJsonDocument> #include <QUrl>
#include <QJsonParseError> #include <QDebug>
BluetoothInterface::BluetoothInterface(QObject *parent) : BluetoothInterface::BluetoothInterface(QObject *parent) :
NymeaInterface(parent), NymeaInterface(parent)
m_socket(0),
m_discovery(new BluetoothDiscovery(this))
{ {
connect(m_discovery, &BluetoothDiscovery::serviceFound, this, &BluetoothInterface::onServiceFound); m_socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol);
QObject::connect(m_socket, &QBluetoothSocket::connected, this, &BluetoothInterface::onConnected);
QObject::connect(m_socket, &QBluetoothSocket::disconnected, this, &BluetoothInterface::onDisconnected);
QObject::connect(m_socket, &QBluetoothSocket::readyRead, this, &BluetoothInterface::onDataReady);
}
QStringList BluetoothInterface::supportedSchemes() const
{
return {"rfcom"};
}
void BluetoothInterface::connect(const QUrl &url)
{
if (url.scheme() != "rfcom") {
qWarning() << "BluetoothInterface: Cannot connect. Invalid scheme in url" << url.toString();
return;
}
QString macAddress = url.host();
qDebug() << "Connecting to bluetooth server" << macAddress;
m_socket->connectToService(QBluetoothAddress(macAddress), QBluetoothUuid(QUuid("997936b5-d2cd-4c57-b41b-c6048320cd2b")));
}
void BluetoothInterface::disconnect()
{
m_socket->close();
}
NymeaInterface::ConnectionState BluetoothInterface::connectionState() const
{
switch (m_socket->state()) {
case QBluetoothSocket::ConnectedState:
return NymeaInterface::ConnectionStateConnected;
case QBluetoothSocket::ConnectingState:
case QBluetoothSocket::ServiceLookupState:
return NymeaInterface::ConnectionStateConnecting;
default:
return NymeaInterface::ConnectionStateDisconnected;
}
} }
void BluetoothInterface::sendData(const QByteArray &data) void BluetoothInterface::sendData(const QByteArray &data)
{ {
if (m_socket) m_socket->write(data + '\n');
m_socket->write(data + '\n');
}
void BluetoothInterface::sendRequest(const QVariantMap &request)
{
sendData(QJsonDocument::fromVariant(request).toJson(QJsonDocument::Compact));
}
BluetoothDiscovery *BluetoothInterface::discovery()
{
return m_discovery;
}
void BluetoothInterface::enable()
{
if (m_socket)
return;
m_socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol);
connect(m_socket, &QBluetoothSocket::readyRead, this, &BluetoothInterface::onDataReady);
connect(m_socket, &QBluetoothSocket::connected, this, &BluetoothInterface::onConnected);
connect(m_socket, &QBluetoothSocket::disconnected, this, &BluetoothInterface::onDisconnected);
}
void BluetoothInterface::disable()
{
delete m_socket;
m_socket = 0;
} }
void BluetoothInterface::onServiceFound(const QBluetoothServiceInfo &service) void BluetoothInterface::onServiceFound(const QBluetoothServiceInfo &service)
{ {
m_service = service; m_service = service;
enable();
if (m_socket->isOpen()) if (m_socket->isOpen())
return; return;
qDebug() << "Connecting to service" << m_service.serviceName(); qDebug() << "BluetoothInterface: Connecting to service" << m_service.serviceName();
m_socket->connectToService(m_service); m_socket->connectToService(m_service);
} }
void BluetoothInterface::onConnected() void BluetoothInterface::onConnected()
{ {
qDebug() << "Bluetooth Interface: connected" << m_socket->peerName() << m_socket->peerAddress(); qDebug() << "BluetoothInterface: connected" << m_socket->peerName() << m_socket->peerAddress();
setConnected(true); emit connected();
} }
void BluetoothInterface::onDisconnected() void BluetoothInterface::onDisconnected()
{ {
qDebug() << "Bluetooth Interface: disconnected"; qDebug() << "BluetoothInterface: disconnected" << m_socket->peerName() << m_socket->peerAddress();
setConnected(false); emit disconnected();
} }
void BluetoothInterface::onDataReady() void BluetoothInterface::onDataReady()
{ {
if (!m_socket)
return;
QByteArray message; QByteArray message;
while (m_socket->canReadLine()) { while (m_socket->canReadLine()) {
QByteArray dataLine = m_socket->readLine(); QByteArray dataLine = m_socket->readLine();
message.append(dataLine); message.append(dataLine);
if (dataLine.endsWith('\n')) { if (dataLine.endsWith('\n')) {
QJsonParseError error; emit dataReady(message);
QJsonDocument jsonDoc = QJsonDocument::fromJson(message, &error);
if (error.error != QJsonParseError::NoError) {
qWarning() << "Could not parse json data from guh" << message << error.errorString();
return;
}
emit dataReady(jsonDoc.toVariant().toMap());
message.clear(); message.clear();
} }
} }

47
libnymea-app-core/bluetoothinterface.h
View File

@ -1,3 +1,25 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* *
* This file is part of nymea:app *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef BLUETOOTHINTERFACE_H #ifndef BLUETOOTHINTERFACE_H
#define BLUETOOTHINTERFACE_H #define BLUETOOTHINTERFACE_H
@ -5,40 +27,29 @@
#include <QBluetoothSocket> #include <QBluetoothSocket>
#include "nymeainterface.h" #include "nymeainterface.h"
#include "discovery/bluetoothdiscovery.h"
class BluetoothInterface : public NymeaInterface class BluetoothInterface : public NymeaInterface
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(BluetoothDiscovery *discovery READ discovery CONSTANT)
public: public:
explicit BluetoothInterface(QObject *parent = 0); explicit BluetoothInterface(QObject *parent = nullptr);
QStringList supportedSchemes() const override;
void connect(const QUrl &url) override;
void disconnect() override;
ConnectionState connectionState() const override;
void sendData(const QByteArray &data) override; void sendData(const QByteArray &data) override;
void sendRequest(const QVariantMap &request) override;
BluetoothDiscovery *discovery();
private: private:
QBluetoothSocket *m_socket; QBluetoothSocket *m_socket = nullptr;
QBluetoothServiceInfo m_service; QBluetoothServiceInfo m_service;
BluetoothDiscovery *m_discovery;
signals:
public slots:
Q_INVOKABLE void enable() override;
Q_INVOKABLE void disable() override;
private slots: private slots:
void onServiceFound(const QBluetoothServiceInfo &service); void onServiceFound(const QBluetoothServiceInfo &service);
void onConnected(); void onConnected();
void onDisconnected(); void onDisconnected();
void onDataReady(); void onDataReady();
}; };
#endif // BLUETOOTHINTERFACE_H #endif // BLUETOOTHINTERFACE_H

2
libnymea-app-core/deviceclasses.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/deviceclasses.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/deviceclassesproxy.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/deviceclassesproxy.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/devices.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/devices.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/devicesproxy.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/devicesproxy.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

107
libnymea-app-core/discovery/bluetoothservicediscovery.cpp Normal file
View File

@ -0,0 +1,107 @@
#include "bluetoothservicediscovery.h"
#include "discoverymodel.h"
BluetoothServiceDiscovery::BluetoothServiceDiscovery(DiscoveryModel *discoveryModel, QObject *parent) :
QObject(parent),
m_discoveryModel(discoveryModel)
{
m_localDevice = new QBluetoothLocalDevice(this);
connect(m_localDevice, &QBluetoothLocalDevice::hostModeStateChanged, this, &BluetoothServiceDiscovery::onHostModeChanged);
m_serviceDiscovery = new QBluetoothServiceDiscoveryAgent(m_localDevice->address());
connect(m_serviceDiscovery, &QBluetoothServiceDiscoveryAgent::serviceDiscovered, this, &BluetoothServiceDiscovery::onServiceDiscovered);
connect(m_serviceDiscovery, &QBluetoothServiceDiscoveryAgent::finished, this, &BluetoothServiceDiscovery::onServiceDiscoveryFinished);
}
bool BluetoothServiceDiscovery::discovering() const
{
return m_discovering;
}
bool BluetoothServiceDiscovery::available() const
{
return m_available;
}
void BluetoothServiceDiscovery::discover(const QBluetoothUuid &uuid)
{
m_enabed = true;
if (m_discovering)
return;
qDebug() << "BluetoothServiceDiscovery: Start scanning services";
setDiscovering(true);
m_serviceDiscovery->setUuidFilter(uuid);
m_serviceDiscovery->start(QBluetoothServiceDiscoveryAgent::FullDiscovery);
}
void BluetoothServiceDiscovery::stopDiscovery()
{
m_enabed = false;
setDiscovering(false);
m_deviceDiscovery->stop();
}
void BluetoothServiceDiscovery::setDiscovering(const bool &discovering)
{
if (m_discovering == discovering)
return;
m_discovering = discovering;
emit discoveringChanged(m_discovering);
}
void BluetoothServiceDiscovery::onHostModeChanged(const QBluetoothLocalDevice::HostMode &mode)
{
qDebug() << "BluetoothServiceDiscovery: Host mode changed" << mode;
}
void BluetoothServiceDiscovery::onServiceDiscovered(const QBluetoothServiceInfo &serviceInfo)
{
qDebug() << "BluetoothServiceDiscovery: Service [+]" << serviceInfo.device().name() << serviceInfo.serviceName() << serviceInfo.serviceDescription() << serviceInfo.serviceProvider();
qDebug() << "Discovered service on"
<< serviceInfo.device().name() << serviceInfo.device().address().toString();
qDebug() << "\tService name:" << serviceInfo.serviceName();
qDebug() << "\tDescription:"
<< serviceInfo.attribute(QBluetoothServiceInfo::ServiceDescription).toString();
qDebug() << "\tProvider:"
<< serviceInfo.attribute(QBluetoothServiceInfo::ServiceProvider).toString();
qDebug() << "\tL2CAP protocol service multiplexer:"
<< serviceInfo.protocolServiceMultiplexer();
qDebug() << "\tRFCOMM server channel:" << serviceInfo.serverChannel();
if (serviceInfo.serviceClassUuids().isEmpty())
return;
if (serviceInfo.serviceClassUuids().first() == QBluetoothUuid(QUuid("997936b5-d2cd-4c57-b41b-c6048320cd2b"))) {
qDebug() << "Found nymea rfcom service!";
DiscoveryDevice* device = m_discoveryModel->find(serviceInfo.device().address());
if (!device) {
device = new DiscoveryDevice(DiscoveryDevice::DeviceTypeBluetooth, this);
qDebug() << "BluetoothServiceDiscovery: Adding new bluetooth host to model";
device->setName(serviceInfo.device().name());
device->setBluetoothAddress(serviceInfo.device().address());
m_discoveryModel->addDevice(device);
}
}
}
void BluetoothServiceDiscovery::onServiceDiscoveryFinished()
{
qDebug() << "BluetoothServiceDiscovery: Service discovery finished.";
setDiscovering(false);
foreach (const QBluetoothServiceInfo &serviceInfo, m_serviceDiscovery->discoveredServices()) {
onServiceDiscovered(serviceInfo);
}
// If discover was called, but never stopDiscover, continue discovery
if (m_enabed) {
qDebug() << "BluetoothServiceDiscovery: Restart bluetooth discovery";
m_serviceDiscovery->start(QBluetoothServiceDiscoveryAgent::FullDiscovery);
}
}

45
libnymea-app-core/discovery/bluetoothservicediscovery.h Normal file
View File

@ -0,0 +1,45 @@
#ifndef BLUETOOTHSERVICEDISCOVERY_H
#define BLUETOOTHSERVICEDISCOVERY_H
#include <QObject>
#include <QBluetoothLocalDevice>
#include <QBluetoothServiceDiscoveryAgent>
class DiscoveryModel;
class BluetoothServiceDiscovery : public QObject
{
Q_OBJECT
public:
explicit BluetoothServiceDiscovery(DiscoveryModel *discoveryModel, QObject *parent = nullptr);
bool discovering() const;
bool available() const;
Q_INVOKABLE void discover(const QBluetoothUuid &uuid);
Q_INVOKABLE void stopDiscovery();
private:
DiscoveryModel *m_discoveryModel = nullptr;
QBluetoothLocalDevice *m_localDevice = nullptr;
QBluetoothDeviceDiscoveryAgent *m_deviceDiscovery = nullptr;
QBluetoothServiceDiscoveryAgent *m_serviceDiscovery = nullptr;
bool m_enabed = false;
bool m_discovering = false;
bool m_available = false;
void setDiscovering(const bool &discovering);
signals:
void discoveringChanged(bool discovering);
private slots:
void onHostModeChanged(const QBluetoothLocalDevice::HostMode &mode);
void onServiceDiscovered(const QBluetoothServiceInfo &serviceInfo);
void onServiceDiscoveryFinished();
};
#endif // BLUETOOTHSERVICEDISCOVERY_H

36
libnymea-app-core/discovery/discoverydevice.cpp
View File

@ -22,11 +22,18 @@
#include <QUrl> #include <QUrl>
DiscoveryDevice::DiscoveryDevice(QObject *parent): QObject(parent) DiscoveryDevice::DiscoveryDevice(DeviceType deviceType, QObject *parent):
QObject(parent),
m_deviceType(deviceType)
{ {
m_portConfigs = new PortConfigs(this); m_portConfigs = new PortConfigs(this);
} }
DiscoveryDevice::DeviceType DiscoveryDevice::deviceType() const
{
return m_deviceType;
}
QUuid DiscoveryDevice::uuid() const QUuid DiscoveryDevice::uuid() const
{ {
return m_uuid; return m_uuid;
@ -55,6 +62,25 @@ void DiscoveryDevice::setHostAddress(const QHostAddress &hostAddress)
} }
} }
QBluetoothAddress DiscoveryDevice::bluetoothAddress() const
{
return m_bluetoothAddress;
}
QString DiscoveryDevice::bluetoothAddressString() const
{
return m_bluetoothAddress.toString();
}
void DiscoveryDevice::setBluetoothAddress(const QBluetoothAddress &bluetoothAddress)
{
if (m_bluetoothAddress == bluetoothAddress)
return;
m_bluetoothAddress = bluetoothAddress;
emit bluetoothAddressChanged();
}
QString DiscoveryDevice::name() const QString DiscoveryDevice::name() const
{ {
return m_name; return m_name;
@ -102,6 +128,11 @@ QString DiscoveryDevice::toUrl(int portConfigIndex)
return ret; return ret;
} }
QString DiscoveryDevice::toUrl(const QString &hostAddress)
{
return QString("rfcom://%1").arg(hostAddress);
}
PortConfigs::PortConfigs(QObject *parent): QAbstractListModel(parent) PortConfigs::PortConfigs(QObject *parent): QAbstractListModel(parent)
{ {
@ -147,6 +178,9 @@ void PortConfigs::insert(PortConfig *portConfig)
PortConfig* PortConfigs::get(int index) const PortConfig* PortConfigs::get(int index) const
{ {
if (index < 0 || index >= m_portConfigs.count())
return nullptr;
return m_portConfigs.at(index); return m_portConfigs.at(index);
} }

21
libnymea-app-core/discovery/discoverydevice.h
View File

@ -25,6 +25,7 @@
#include <QUuid> #include <QUuid>
#include <QUrl> #include <QUrl>
#include <QHostAddress> #include <QHostAddress>
#include <QBluetoothAddress>
#include <QObject> #include <QObject>
#include <QAbstractListModel> #include <QAbstractListModel>
@ -94,14 +95,24 @@ private:
class DiscoveryDevice: public QObject class DiscoveryDevice: public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(DeviceType deviceType READ deviceType CONSTANT)
Q_PROPERTY(QUuid uuid READ uuid CONSTANT) Q_PROPERTY(QUuid uuid READ uuid CONSTANT)
Q_PROPERTY(QString hostAddress READ hostAddressString NOTIFY hostAddressChanged) Q_PROPERTY(QString hostAddress READ hostAddressString NOTIFY hostAddressChanged)
Q_PROPERTY(QString bluetoothAddress READ bluetoothAddressString NOTIFY bluetoothAddressChanged)
Q_PROPERTY(QString name READ name NOTIFY nameChanged) Q_PROPERTY(QString name READ name NOTIFY nameChanged)
Q_PROPERTY(QString version READ version NOTIFY versionChanged) Q_PROPERTY(QString version READ version NOTIFY versionChanged)
Q_PROPERTY(PortConfigs* portConfigs READ portConfigs CONSTANT) Q_PROPERTY(PortConfigs* portConfigs READ portConfigs CONSTANT)
public: public:
explicit DiscoveryDevice(QObject *parent = nullptr); enum DeviceType {
DeviceTypeNetwork,
DeviceTypeBluetooth
};
Q_ENUM(DeviceType)
explicit DiscoveryDevice(DeviceType deviceType, QObject *parent = nullptr);
DeviceType deviceType() const;
QUuid uuid() const; QUuid uuid() const;
void setUuid(const QUuid &uuid); void setUuid(const QUuid &uuid);
@ -110,6 +121,10 @@ public:
QString hostAddressString() const; QString hostAddressString() const;
void setHostAddress(const QHostAddress &hostAddress); void setHostAddress(const QHostAddress &hostAddress);
QBluetoothAddress bluetoothAddress() const;
QString bluetoothAddressString() const;
void setBluetoothAddress(const QBluetoothAddress &bluetoothAddress);
QString name() const; QString name() const;
void setName(const QString &name); void setName(const QString &name);
@ -119,15 +134,19 @@ public:
PortConfigs *portConfigs() const; PortConfigs *portConfigs() const;
Q_INVOKABLE QString toUrl(int portConfigIndex); Q_INVOKABLE QString toUrl(int portConfigIndex);
Q_INVOKABLE QString toUrl(const QString &hostAddress);
signals: signals:
void nameChanged(); void nameChanged();
void hostAddressChanged(); void hostAddressChanged();
void bluetoothAddressChanged();
void versionChanged(); void versionChanged();
private: private:
DeviceType m_deviceType = DeviceTypeNetwork;
QUuid m_uuid; QUuid m_uuid;
QHostAddress m_hostAddress; QHostAddress m_hostAddress;
QBluetoothAddress m_bluetoothAddress;
QString m_name; QString m_name;
QString m_version; QString m_version;
PortConfigs *m_portConfigs = nullptr; PortConfigs *m_portConfigs = nullptr;

17
libnymea-app-core/discovery/discoverymodel.cpp
View File

@ -38,12 +38,16 @@ QVariant DiscoveryModel::data(const QModelIndex &index, int role) const
DiscoveryDevice *device = m_devices.at(index.row()); DiscoveryDevice *device = m_devices.at(index.row());
switch (role) { switch (role) {
case TypeRole:
return device->deviceType();
case UuidRole: case UuidRole:
return device->uuid(); return device->uuid();
case NameRole: case NameRole:
return device->name(); return device->name();
case HostAddressRole: case HostAddressRole:
return device->hostAddress().toString(); return device->hostAddress().toString();
case BluetoothAddressRole:
return device->bluetoothAddressString();
// case WebSocketUrlRole: // case WebSocketUrlRole:
// return device.webSocketUrl(); // return device.webSocketUrl();
// case PortRole: // case PortRole:
@ -86,6 +90,17 @@ DiscoveryDevice *DiscoveryModel::find(const QUuid &uuid)
return nullptr; return nullptr;
} }
DiscoveryDevice *DiscoveryModel::find(const QBluetoothAddress &bluetoothAddress)
{
foreach (DiscoveryDevice *device, m_devices) {
if (device->bluetoothAddress() == bluetoothAddress) {
return device;
}
}
return nullptr;
}
void DiscoveryModel::clearModel() void DiscoveryModel::clearModel()
{ {
beginResetModel(); beginResetModel();
@ -97,9 +112,11 @@ void DiscoveryModel::clearModel()
QHash<int, QByteArray> DiscoveryModel::roleNames() const QHash<int, QByteArray> DiscoveryModel::roleNames() const
{ {
QHash<int, QByteArray> roles; QHash<int, QByteArray> roles;
roles[TypeRole] = "type";
roles[UuidRole] = "uuid"; roles[UuidRole] = "uuid";
roles[NameRole] = "name"; roles[NameRole] = "name";
roles[HostAddressRole] = "hostAddress"; roles[HostAddressRole] = "hostAddress";
roles[BluetoothAddressRole] = "bluetoothAddress";
roles[VersionRole] = "version"; roles[VersionRole] = "version";
return roles; return roles;
} }

3
libnymea-app-core/discovery/discoverymodel.h
View File

@ -32,9 +32,11 @@ class DiscoveryModel : public QAbstractListModel
Q_PROPERTY(int count READ rowCount NOTIFY countChanged) Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
public: public:
enum DeviceRole { enum DeviceRole {
TypeRole,
UuidRole, UuidRole,
NameRole, NameRole,
HostAddressRole, HostAddressRole,
BluetoothAddressRole,
VersionRole VersionRole
}; };
Q_ENUM(DeviceRole) Q_ENUM(DeviceRole)
@ -48,6 +50,7 @@ public:
Q_INVOKABLE DiscoveryDevice* get(int index) const; Q_INVOKABLE DiscoveryDevice* get(int index) const;
Q_INVOKABLE DiscoveryDevice* find(const QUuid &uuid); Q_INVOKABLE DiscoveryDevice* find(const QUuid &uuid);
Q_INVOKABLE DiscoveryDevice* find(const QBluetoothAddress &bluetoothAddress);
void clearModel(); void clearModel();

24
libnymea-app-core/discovery/nymeadiscovery.cpp
View File

@ -2,6 +2,7 @@
#include "upnpdiscovery.h" #include "upnpdiscovery.h"
#include "zeroconfdiscovery.h" #include "zeroconfdiscovery.h"
#include "bluetoothservicediscovery.h"
NymeaDiscovery::NymeaDiscovery(QObject *parent) : QObject(parent) NymeaDiscovery::NymeaDiscovery(QObject *parent) : QObject(parent)
{ {
@ -9,6 +10,7 @@ NymeaDiscovery::NymeaDiscovery(QObject *parent) : QObject(parent)
m_upnp = new UpnpDiscovery(m_discoveryModel, this); m_upnp = new UpnpDiscovery(m_discoveryModel, this);
m_zeroConf = new ZeroconfDiscovery(m_discoveryModel, this); m_zeroConf = new ZeroconfDiscovery(m_discoveryModel, this);
m_bluetooth = new BluetoothServiceDiscovery(m_discoveryModel, this);
} }
bool NymeaDiscovery::discovering() const bool NymeaDiscovery::discovering() const
@ -18,16 +20,20 @@ bool NymeaDiscovery::discovering() const
void NymeaDiscovery::setDiscovering(bool discovering) void NymeaDiscovery::setDiscovering(bool discovering)
{ {
if (m_discovering != discovering) { if (m_discovering == discovering)
m_discovering = discovering; return;
// For zeroconf we'll ignore it as zeroconf doesn't do active discovery but just listens for changes in the net all the time
if (discovering) { m_discovering = discovering;
m_upnp->discover(); // For zeroconf we'll ignore it as zeroconf doesn't do active discovery but just listens for changes in the net all the time
} else { if (discovering) {
m_upnp->stopDiscovery(); //m_upnp->discover();
} // Note: this is the nymea uuid
emit discoveringChanged(); m_bluetooth->discover(QBluetoothUuid(QUuid("997936b5-d2cd-4c57-b41b-c6048320cd2b")));
} else {
m_upnp->stopDiscovery();
m_bluetooth->stopDiscovery();
} }
emit discoveringChanged();
} }
DiscoveryModel *NymeaDiscovery::discoveryModel() const DiscoveryModel *NymeaDiscovery::discoveryModel() const

3
libnymea-app-core/discovery/nymeadiscovery.h
View File

@ -6,6 +6,7 @@
class DiscoveryModel; class DiscoveryModel;
class UpnpDiscovery; class UpnpDiscovery;
class ZeroconfDiscovery; class ZeroconfDiscovery;
class BluetoothServiceDiscovery;
class NymeaDiscovery : public QObject class NymeaDiscovery : public QObject
{ {
@ -30,6 +31,8 @@ private:
UpnpDiscovery *m_upnp = nullptr; UpnpDiscovery *m_upnp = nullptr;
ZeroconfDiscovery *m_zeroConf = nullptr; ZeroconfDiscovery *m_zeroConf = nullptr;
BluetoothServiceDiscovery *m_bluetooth = nullptr;
}; };
#endif // NYMEADISCOVERY_H #endif // NYMEADISCOVERY_H

2
libnymea-app-core/discovery/upnpdiscovery.cpp
View File

@ -264,7 +264,7 @@ void UpnpDiscovery::networkReplyFinished(QNetworkReply *reply)
DiscoveryDevice* device = m_discoveryModel->find(uuid); DiscoveryDevice* device = m_discoveryModel->find(uuid);
if (!device) { if (!device) {
device = new DiscoveryDevice(m_discoveryModel); device = new DiscoveryDevice(DiscoveryDevice::DeviceTypeNetwork, m_discoveryModel);
device->setUuid(uuid); device->setUuid(uuid);
qDebug() << "Adding new host to model"; qDebug() << "Adding new host to model";
m_discoveryModel->addDevice(device); m_discoveryModel->addDevice(device);

2
libnymea-app-core/discovery/zeroconfdiscovery.cpp
View File

@ -70,7 +70,7 @@ void ZeroconfDiscovery::serviceEntryAdded(const QZeroConfService &entry)
DiscoveryDevice* device = m_discoveryModel->find(uuid); DiscoveryDevice* device = m_discoveryModel->find(uuid);
if (!device) { if (!device) {
device = new DiscoveryDevice(m_discoveryModel); device = new DiscoveryDevice(DiscoveryDevice::DeviceTypeNetwork, m_discoveryModel);
device->setUuid(uuid); device->setUuid(uuid);
// qDebug() << "Adding new host to model"; // qDebug() << "Adding new host to model";
m_discoveryModel->addDevice(device); m_discoveryModel->addDevice(device);

8
libnymea-app-core/libnymea-app-core.pro
View File

@ -67,7 +67,9 @@ SOURCES += \
ruletemplates/eventdescriptortemplate.cpp \ ruletemplates/eventdescriptortemplate.cpp \
ruletemplates/ruleactiontemplate.cpp \ ruletemplates/ruleactiontemplate.cpp \
ruletemplates/stateevaluatortemplate.cpp \ ruletemplates/stateevaluatortemplate.cpp \
ruletemplates/statedescriptortemplate.cpp ruletemplates/statedescriptortemplate.cpp \
bluetoothinterface.cpp \
discovery/bluetoothservicediscovery.cpp \
HEADERS += \ HEADERS += \
engine.h \ engine.h \
@ -120,7 +122,9 @@ HEADERS += \
ruletemplates/eventdescriptortemplate.h \ ruletemplates/eventdescriptortemplate.h \
ruletemplates/ruleactiontemplate.h \ ruletemplates/ruleactiontemplate.h \
ruletemplates/stateevaluatortemplate.h \ ruletemplates/stateevaluatortemplate.h \
ruletemplates/statedescriptortemplate.h ruletemplates/statedescriptortemplate.h \
bluetoothinterface.h \
discovery/bluetoothservicediscovery.h \
unix { unix {
target.path = /usr/lib target.path = /usr/lib

20
libnymea-app-core/nymeainterface.cpp
View File

@ -2,19 +2,21 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app. * * This file is part of nymea:app. *
* * * *
* nymea:app is free software: you can redistribute it and/or modify * * This library is free software; you can redistribute it and/or *
* it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, version 3 of the License. * * License as published by the Free Software Foundation; either *
* version 2.1 of the License, or (at your option) any later version. *
* * * *
* nymea:app is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU Lesser General Public *
* along with nymea:app. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* * * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

24
libnymea-app-core/nymeainterface.h
View File

@ -1,20 +1,22 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 - 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app. * * This file is part of nymea:app. *
* * * *
* nymea:app is free software: you can redistribute it and/or modify * * This library is free software; you can redistribute it and/or *
* it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, version 3 of the License. * * License as published by the Free Software Foundation; either *
* version 2.1 of the License, or (at your option) any later version. *
* * * *
* nymea:app is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU Lesser General Public *
* along with nymea:app. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* * * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@ -44,7 +46,7 @@ public:
virtual void disconnect() = 0; virtual void disconnect() = 0;
virtual ConnectionState connectionState() const = 0; virtual ConnectionState connectionState() const = 0;
virtual void sendData(const QByteArray &data) = 0; virtual void sendData(const QByteArray &data) = 0;
virtual void ignoreSslErrors(const QList<QSslError> &errors) = 0; virtual void ignoreSslErrors(const QList<QSslError> &errors) { Q_UNUSED(errors) }
signals: signals:
void connected(); void connected();

2
libnymea-app-core/pluginsproxy.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/pluginsproxy.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/vendorsproxy.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/vendorsproxy.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/bluetoothdevice.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/bluetoothdevice.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/bluetoothdeviceinfo.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/bluetoothdeviceinfo.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/bluetoothdeviceinfos.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/bluetoothdeviceinfos.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/bluetoothdiscovery.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/bluetoothdiscovery.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/networkmanagercontroler.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/networkmanagercontroler.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/wirelessaccesspoint.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/wirelessaccesspoint.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/wirelessaccesspoints.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/wirelessaccesspoints.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/wirelessaccesspointsproxy.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/wirelessaccesspointsproxy.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/wirelesssetupmanager.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-app-core/wifisetup/wirelesssetupmanager.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2018 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/actiontype.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/actiontype.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/actiontypes.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/actiontypes.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/device.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/device.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/deviceclass.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/deviceclass.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/eventtype.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/eventtype.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/eventtypes.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/eventtypes.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/param.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/param.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/params.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/params.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/paramtype.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/paramtype.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/paramtypes.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/paramtypes.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/plugin.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/plugin.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/plugins.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/plugins.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/state.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/state.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/states.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/states.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/statesproxy.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/statesproxy.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/statetype.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/statetype.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/statetypes.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/statetypes.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/types.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/vendor.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/vendor.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/vendors.cpp
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

2
libnymea-common/types/vendors.h
View File

@ -2,7 +2,7 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of nymea:app * * This file is part of nymea:app *
* * * *
* This library is free software; you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public * * modify it under the terms of the GNU Lesser General Public *

19
nymea-app/ui/ConnectPage.qml
View File

@ -173,6 +173,14 @@ Page {
} }
contentItem: RowLayout { contentItem: RowLayout {
ColorIcon {
Layout.fillHeight: true
Layout.preferredWidth: height
name: model.type === DiscoveryDevice.DeviceTypeNetwork ? "../images/network-vpn.svg" : "../images/bluetooth.svg"
color: app.guhAccent
}
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Label { Label {
@ -181,10 +189,11 @@ Page {
elide: Text.ElideRight elide: Text.ElideRight
} }
Label { Label {
text: model.hostAddress text: model.type === DiscoveryDevice.DeviceTypeNetwork ? model.hostAddress : model.bluetoothAddress
font.pixelSize: app.smallFont font.pixelSize: app.smallFont
} }
} }
ColorIcon { ColorIcon {
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredWidth: height Layout.preferredWidth: height
@ -193,12 +202,16 @@ Page {
visible: hasSecurePort visible: hasSecurePort
name: "../images/network-secure.svg" name: "../images/network-secure.svg"
color: isTrusted ? app.guhAccent : keyColor color: isTrusted ? app.guhAccent : keyColor
} }
} }
onClicked: { onClicked: {
Engine.connection.connect(discoveryDevice.toUrl(defaultPortConfigIndex)) if (model.type === DiscoveryDevice.DeviceTypeNetwork) {
Engine.connection.connect(discoveryDevice.toUrl(defaultPortConfigIndex))
} else if (model.type === DiscoveryDevice.DeviceTypeNetwork) {
Engine.connection.connect(discoveryDevice.toUrl(model.bluetoothAddress))
}
pageStack.push(connectingPage) pageStack.push(connectingPage)
} }