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

guh-control -> mea

Browse Source
This commit is contained in:
Michael Zanetti 2018-03-09 10:20:28 +01:00
parent c382d13e70
commit a7d9e081f0
310 changed files with 397 additions and 625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,2 +1,2 @@
# guh-control # mea
QtQuick guh client application QtQuick nymea client application

7
guh-control.pro
View File

@ -1,7 +0,0 @@
TEMPLATE=subdirs
SUBDIRS = libguh-common guh-control
libguh-common.subdir = libguh-common
guh-control.subdir = guh-control
guh-control.depends = libguh-common

129
guh-control/connectionmanager.cpp
View File

@ -1,129 +0,0 @@
#include "connectionmanager.h"
#include <QState>
#include <QSettings>
ConnectionManager::ConnectionManager(QObject *parent) :
QObject(parent),
m_discovery(new UpnpDiscovery(this)),
m_interface(0),
m_websocketInterface(new WebsocketInterface(this)),
m_bluetoothInterface(new BluetoothInterface(this))
{
}
GuhInterface *ConnectionManager::interface()
{
return m_interface;
}
UpnpDiscovery *ConnectionManager::upnpDiscovery()
{
return m_discovery;
}
WebsocketInterface *ConnectionManager::websocketInterface()
{
return m_websocketInterface;
}
BluetoothInterface *ConnectionManager::bluetoothInterface()
{
return m_bluetoothInterface;
}
QString ConnectionManager::currentInterfaceName() const
{
return m_currentInterfaceName;
}
QString ConnectionManager::currentStatusMessage() const
{
return m_currentStatusMessage;
}
void ConnectionManager::setInterface(GuhInterface *interface)
{
if (m_interface) {
disconnect(m_interface, &GuhInterface::connectedChanged, this, &ConnectionManager::onConnectedChanged);
disconnect(m_interface, &GuhInterface::dataReady, this, &ConnectionManager::dataReady);
}
m_interface = interface;
connect(m_interface, &GuhInterface::connectedChanged, this, &ConnectionManager::onConnectedChanged);
connect(m_interface, &GuhInterface::dataReady, this, &ConnectionManager::dataReady);
emit interfaceChanged();
}
void ConnectionManager::setCurrentInterfaceName(const QString &name)
{
m_currentInterfaceName = name;
emit currentInterfaceNameChanged();
}
void ConnectionManager::setCurrentStatusMessage(const QString &message)
{
m_currentStatusMessage = message;
emit currentStatusMessageChanged();
}
void ConnectionManager::onConnectedChanged()
{
if (m_interface->connected())
emit connected();
else
emit disconnect();
emit connectedChanged();
}
void ConnectionManager::onConnectingState()
{
QSettings settings;
qDebug() << "Loading last connection" << settings.fileName();
settings.beginGroup("Connections");
QString url = settings.value("webSocketUrl").toString();
settings.endGroup();
if (url.isEmpty()) {
qDebug() << "No stored websocket url";
m_websocketInterface->connectionFailed();
}
m_websocketInterface->setUrl(url);
m_websocketInterface->enable();
}
void ConnectionManager::onUpnpDiscoveringState()
{
upnpDiscovery()->discover();
}
void ConnectionManager::start(const ConnectionType &connectionType)
{
switch (connectionType) {
case ConnectionTypeAuto:
setInterface(m_websocketInterface);
break;
case ConnectionTypeWebSocket:
setInterface(m_websocketInterface);
m_discovery->discover();
break;
case ConnectionTypeCloud:
break;
case ConnectionTypeBluetooth:
setInterface(m_bluetoothInterface);
break;
default:
setInterface(m_bluetoothInterface);
break;
}
}
void ConnectionManager::stop()
{
m_interface->disable();
}

82
guh-control/connectionmanager.h
View File

@ -1,82 +0,0 @@
#ifndef CONNECTIONMANAGER_H
#define CONNECTIONMANAGER_H
#include <QObject>
#include <QStateMachine>
#include "guhinterface.h"
#include "websocketinterface.h"
#include "bluetoothinterface.h"
#include "cloudconnection/cloudconnection.h"
#include "discovery/upnpdiscovery.h"
class ConnectionManager : public QObject
{
Q_OBJECT
Q_ENUMS(ConnectionType)
Q_PROPERTY(UpnpDiscovery *upnpDiscovery READ upnpDiscovery CONSTANT)
Q_PROPERTY(GuhInterface *interface READ interface NOTIFY interfaceChanged)
Q_PROPERTY(WebsocketInterface *websocketInterface READ websocketInterface CONSTANT)
Q_PROPERTY(BluetoothInterface *bluetoothInterface READ bluetoothInterface CONSTANT)
Q_PROPERTY(QString currentInterfaceName READ currentInterfaceName WRITE setCurrentInterfaceName NOTIFY currentInterfaceNameChanged)
Q_PROPERTY(QString currentStatusMessage READ currentStatusMessage WRITE setCurrentStatusMessage NOTIFY currentStatusMessageChanged)
public:
enum ConnectionType {
ConnectionTypeAuto,
ConnectionTypeWebSocket,
ConnectionTypeCloud,
ConnectionTypeBluetooth
};
explicit ConnectionManager(QObject *parent = 0);
GuhInterface *interface();
UpnpDiscovery *upnpDiscovery();
WebsocketInterface *websocketInterface();
BluetoothInterface *bluetoothInterface();
QString currentInterfaceName() const;
QString currentStatusMessage() const;
private:
UpnpDiscovery *m_discovery;
GuhInterface *m_interface;
WebsocketInterface *m_websocketInterface;
BluetoothInterface *m_bluetoothInterface;
QString m_currentInterfaceName;
QString m_currentStatusMessage;
void setInterface(GuhInterface *interface);
void setCurrentInterfaceName(const QString &name);
void setCurrentStatusMessage(const QString &message);
private slots:
void onConnectedChanged();
// State slots
void onConnectingState();
void onUpnpDiscoveringState();
signals:
void connectedChanged();
void dataReady(const QVariantMap &data);
void connected();
void disconnected();
void interfaceChanged();
void websocketInterfaceChanged();
void currentInterfaceNameChanged();
void currentStatusMessageChanged();
public slots:
void start(const ConnectionType &connectionType = ConnectionTypeAuto);
void stop();
};
#endif // CONNECTIONMANAGER_H

6
libguh-common/libguh-common.pro → libnymea-common/libnymea-common.pro
View File

@ -1,6 +1,6 @@
include(../guh-control.pri) include(../mea.pri)
TARGET = guh-common TARGET = nymea-common
TEMPLATE = lib TEMPLATE = lib
QT += network QT += network
@ -84,7 +84,7 @@ SOURCES += types/vendor.cpp \
# install header file with relative subdirectory # install header file with relative subdirectory
for(header, HEADERS) { for(header, HEADERS) {
path = /usr/include/guh-common/$${dirname(header)} path = /usr/include/nymea-common/$${dirname(header)}
eval(headers_$${path}.files += $${header}) eval(headers_$${path}.files += $${header})
eval(headers_$${path}.path = $${path}) eval(headers_$${path}.path = $${path})
eval(INSTALLS *= headers_$${path}) eval(INSTALLS *= headers_$${path})

2
libguh-common/types/actiontype.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/actiontype.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/actiontypes.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/actiontypes.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/device.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/device.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/deviceclass.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/deviceclass.h → 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 guh-control * * This file is part of mea *
* * * *
* 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 *

0
libguh-common/types/eventdescriptor.cpp → libnymea-common/types/eventdescriptor.cpp
View File

0
libguh-common/types/eventdescriptor.h → libnymea-common/types/eventdescriptor.h
View File

0
libguh-common/types/eventdescriptors.cpp → libnymea-common/types/eventdescriptors.cpp
View File

0
libguh-common/types/eventdescriptors.h → libnymea-common/types/eventdescriptors.h
View File

2
libguh-common/types/eventtype.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/eventtype.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/eventtypes.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/eventtypes.h → 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 guh-control * * This file is part of mea *
* * * *
* 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 *

0
libguh-common/types/interface.cpp → libnymea-common/types/interface.cpp
View File

0
libguh-common/types/interface.h → libnymea-common/types/interface.h
View File

0
libguh-common/types/interfaces.cpp → libnymea-common/types/interfaces.cpp
View File

0
libguh-common/types/interfaces.h → libnymea-common/types/interfaces.h
View File

0
libguh-common/types/logentry.cpp → libnymea-common/types/logentry.cpp
View File

0
libguh-common/types/logentry.h → libnymea-common/types/logentry.h
View File

2
libguh-common/types/param.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/param.h → 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 guh-control * * This file is part of mea *
* * * *
* 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 *

0
libguh-common/types/paramdescriptor.cpp → libnymea-common/types/paramdescriptor.cpp
View File

0
libguh-common/types/paramdescriptor.h → libnymea-common/types/paramdescriptor.h
View File

0
libguh-common/types/paramdescriptors.cpp → libnymea-common/types/paramdescriptors.cpp
View File

0
libguh-common/types/paramdescriptors.h → libnymea-common/types/paramdescriptors.h
View File

2
libguh-common/types/params.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/params.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/paramtype.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/paramtype.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/paramtypes.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/paramtypes.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/plugin.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/plugin.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/plugins.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/plugins.h → 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 guh-control * * This file is part of mea *
* * * *
* 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 *

0
libguh-common/types/rule.cpp → libnymea-common/types/rule.cpp
View File

0
libguh-common/types/rule.h → libnymea-common/types/rule.h
View File

0
libguh-common/types/ruleaction.cpp → libnymea-common/types/ruleaction.cpp
View File

0
libguh-common/types/ruleaction.h → libnymea-common/types/ruleaction.h
View File

0
libguh-common/types/ruleactionparam.cpp → libnymea-common/types/ruleactionparam.cpp
View File

0
libguh-common/types/ruleactionparam.h → libnymea-common/types/ruleactionparam.h
View File

0
libguh-common/types/ruleactionparams.cpp → libnymea-common/types/ruleactionparams.cpp
View File

0
libguh-common/types/ruleactionparams.h → libnymea-common/types/ruleactionparams.h
View File

0
libguh-common/types/ruleactions.cpp → libnymea-common/types/ruleactions.cpp
View File

0
libguh-common/types/ruleactions.h → libnymea-common/types/ruleactions.h
View File

0
libguh-common/types/rules.cpp → libnymea-common/types/rules.cpp
View File

0
libguh-common/types/rules.h → libnymea-common/types/rules.h
View File

2
libguh-common/types/state.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/state.h → 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 guh-control * * This file is part of mea *
* * * *
* 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 *

0
libguh-common/types/statedescriptor.cpp → libnymea-common/types/statedescriptor.cpp
View File

0
libguh-common/types/statedescriptor.h → libnymea-common/types/statedescriptor.h
View File

0
libguh-common/types/stateevaluator.cpp → libnymea-common/types/stateevaluator.cpp
View File

0
libguh-common/types/stateevaluator.h → libnymea-common/types/stateevaluator.h
View File

0
libguh-common/types/stateevaluators.cpp → libnymea-common/types/stateevaluators.cpp
View File

0
libguh-common/types/stateevaluators.h → libnymea-common/types/stateevaluators.h
View File

2
libguh-common/types/states.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/states.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/statesproxy.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/statesproxy.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/statetype.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/statetype.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/statetypes.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/statetypes.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/types.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/vendor.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/vendor.h → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/vendors.cpp → 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 guh-control * * This file is part of mea *
* * * *
* 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
libguh-common/types/vendors.h → 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 guh-control * * This file is part of mea *
* * * *
* 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 *

0
guh-control.pri → mea.pri
View File

7
mea.pro Normal file
View File

@ -0,0 +1,7 @@
TEMPLATE=subdirs
SUBDIRS = libnymea-common mea
libnymea-common.subdir = libnymea-common
mea.subdir = mea
mea.depends = libnymea-common

2
guh-control/android/AndroidManifest.xml → mea/android/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest package="io.guh.guhcontrol" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto"> <manifest package="io.guh.mea" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon"> <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop"> <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter> <intent-filter>

0
guh-control/android/build.gradle → mea/android/build.gradle
View File

0
guh-control/android/gradle.properties → mea/android/gradle.properties
View File

0
guh-control/android/gradle/wrapper/gradle-wrapper.jar → mea/android/gradle/wrapper/gradle-wrapper.jar vendored
View File

0
guh-control/android/gradle/wrapper/gradle-wrapper.properties → mea/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

0
guh-control/android/gradlew → mea/android/gradlew vendored
View File

0
guh-control/android/gradlew.bat → mea/android/gradlew.bat vendored
View File

0
guh-control/android/local.properties → mea/android/local.properties
View File

0
guh-control/android/res/drawable-mdpi/icon.png → mea/android/res/drawable-mdpi/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
guh-control/android/res/values/libs.xml → mea/android/res/values/libs.xml
View File

0
guh-control/basicconfiguration.cpp → mea/basicconfiguration.cpp
View File

0
guh-control/basicconfiguration.h → mea/basicconfiguration.h
View File

2
guh-control/bluetoothinterface.cpp → mea/bluetoothinterface.cpp
View File

@ -4,7 +4,7 @@
#include <QJsonParseError> #include <QJsonParseError>
BluetoothInterface::BluetoothInterface(QObject *parent) : BluetoothInterface::BluetoothInterface(QObject *parent) :
GuhInterface(parent), NymeaInterface(parent),
m_socket(0), m_socket(0),
m_discovery(new BluetoothDiscovery(this)) m_discovery(new BluetoothDiscovery(this))
{ {

4
guh-control/bluetoothinterface.h → mea/bluetoothinterface.h
View File

@ -4,10 +4,10 @@
#include <QObject> #include <QObject>
#include <QBluetoothSocket> #include <QBluetoothSocket>
#include "guhinterface.h" #include "nymeainterface.h"
#include "discovery/bluetoothdiscovery.h" #include "discovery/bluetoothdiscovery.h"
class BluetoothInterface : public GuhInterface class BluetoothInterface : public NymeaInterface
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(BluetoothDiscovery *discovery READ discovery CONSTANT) Q_PROPERTY(BluetoothDiscovery *discovery READ discovery CONSTANT)

2
guh-control/deviceclasses.cpp → mea/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 guh-control * * This file is part of mea *
* * * *
* 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
guh-control/deviceclasses.h → mea/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 guh-control * * This file is part of mea *
* * * *
* 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
guh-control/deviceclassesproxy.cpp → mea/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 guh-control * * This file is part of mea *
* * * *
* 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
guh-control/deviceclassesproxy.h → mea/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 guh-control * * This file is part of mea *
* * * *
* 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 *

0
guh-control/devicediscovery.cpp → mea/devicediscovery.cpp
View File

0
guh-control/devicediscovery.h → mea/devicediscovery.h
View File

8
guh-control/devicemanager.cpp → mea/devicemanager.cpp
View File

@ -2,19 +2,19 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of guh-control. * * This file is part of mea. *
* * * *
* guh-control is free software: you can redistribute it and/or modify * * mea is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, version 3 of the License. * * the Free Software Foundation, version 3 of the License. *
* * * *
* guh-control is distributed in the hope that it will be useful, * * mea 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 General Public License for more details. * * GNU 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 General Public License *
* along with guh-control. If not, see <http://www.gnu.org/licenses/>. * * along with mea. If not, see <http://www.gnu.org/licenses/>. *
* * * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

8
guh-control/devicemanager.h → mea/devicemanager.h
View File

@ -2,19 +2,19 @@
* * * *
* Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> * * Copyright (C) 2017 Simon Stuerz <simon.stuerz@guh.io> *
* * * *
* This file is part of guh-control. * * This file is part of mea. *
* * * *
* guh-control is free software: you can redistribute it and/or modify * * mea is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, version 3 of the License. * * the Free Software Foundation, version 3 of the License. *
* * * *
* guh-control is distributed in the hope that it will be useful, * * mea 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 General Public License for more details. * * GNU 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 General Public License *
* along with guh-control. If not, see <http://www.gnu.org/licenses/>. * * along with mea. If not, see <http://www.gnu.org/licenses/>. *
* * * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

Some files were not shown because too many files have changed in this diff Show More