ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #229 and remove unused datetime state

pull/135/head
Simon Stürz 2015-10-08 13:21:18 +02:00 committed by Michael Zanetti
parent ac7c163dbb
commit b37c8f9b6f
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/deviceplugins/datetime/deviceplugindatetime.cpp
View File

@ -390,24 +390,24 @@ void DevicePluginDateTime::processTimesData(const QByteArray &data)
// given time is always in UTC
QVariantMap result = response.value("results").toMap();
QString duskString = result.value("civil_twilight_end").toString();
QString dawnString = result.value("civil_twilight_begin").toString();
QString sunriseString = result.value("sunrise").toString();
QString noonString = result.value("solar_noon").toString();
QString dawnString = result.value("civil_twilight_begin").toString();
QString sunsetString = result.value("sunset").toString();
QString duskString = result.value("civil_twilight_end").toString();
m_dusk = QDateTime(QDate::currentDate(), QTime::fromString(duskString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
m_dawn = QDateTime(QDate::currentDate(), QTime::fromString(dawnString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
m_sunrise = QDateTime(QDate::currentDate(), QTime::fromString(sunriseString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
m_noon = QDateTime(QDate::currentDate(), QTime::fromString(noonString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
m_dawn = QDateTime(QDate::currentDate(), QTime::fromString(dawnString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
m_sunset = QDateTime(QDate::currentDate(), QTime::fromString(sunsetString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
m_dusk = QDateTime(QDate::currentDate(), QTime::fromString(duskString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
// calculate the times in each alarm
qCDebug(dcDateTime) << " dusk :" << m_dusk.toString();
qCDebug(dcDateTime) << " dawn :" << m_dawn.toString();
qCDebug(dcDateTime) << " sunrise :" << m_sunrise.toString();
qCDebug(dcDateTime) << " noon :" << m_noon.toString();
qCDebug(dcDateTime) << " sunset :" << m_sunset.toString();
qCDebug(dcDateTime) << " dawn :" << m_dawn.toString();
qCDebug(dcDateTime) << " dusk :" << m_dusk.toString();
qCDebug(dcDateTime) << "---------------------------------------------";
updateTimes();

10
plugins/deviceplugins/datetime/deviceplugindatetime.json
View File

@ -229,16 +229,6 @@
"idName": "alarm",
"name": "alarm"
}
],
"stateTypes": [
{
"id": "261b79b5-b60d-4b14-af95-dc87184ec332",
"idName": "nextAlarm",
"name": "next alarm",
"unit": "UnixTime",
"type": "int",
"defaultValue": 0
}
]
},
{

12
server/webserver.cpp
View File

@ -562,6 +562,11 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
}
settings.endGroup();
GuhSettings globalSettings(GuhSettings::SettingsRoleGlobal);
globalSettings.beginGroup("WebSocketServer");
int websocketPort = globalSettings.value("port", 4444).toInt();
globalSettings.endGroup();
QByteArray data;
QXmlStreamWriter writer(&data);
@ -580,6 +585,13 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
} else {
writer.writeTextElement("URLBase", "http://" + address.toString() + ":" + QString::number(m_port));
}
if (m_useSsl) {
writer.writeTextElement("websocketURL", "wss://" + address.toString() + ":" + QString::number(websocketPort));
} else {
writer.writeTextElement("websocketURL", "ws://" + address.toString() + ":" + QString::number(websocketPort));
}
writer.writeTextElement("presentationURL", "/");
writer.writeStartElement("device");