uvos/UvosSmartHomeInterface
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added json broadcasting

Browse source
This commit is contained in:
Carl Klemm 2019-06-10 23:22:08 +02:00
parent df27b622a0
commit 3cbe947408
37 changed files with 514 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/actors/actor.cpp
View file

@ -75,22 +75,6 @@ void Actor::load(const QJsonObject& json)
triggerValue = json["TriggerValue"].toInt();
}
void Actor::store(QString subsecton, QSettings* settings)
{
settings->setValue(subsecton + "Active", active);
settings->setValue(subsecton + "Exausted", exausted);
if(!name.isEmpty())settings->setValue(subsecton + "Name", name);
settings->setValue(subsecton + "TriggerValue", triggerValue);
}
void Actor::load(QString subsecton, QSettings* settings)
{
active = settings->value(subsecton + "Active").toBool();
exausted = settings->value(subsecton + "Exausted").toBool();
if(settings->contains(subsecton + "Name"))name = settings->value(subsecton + "Name").toString();
triggerValue = settings->value(subsecton + "TriggerValue").toUInt();
}
void Actor::setTriggerValue(uint8_t value)
{
triggerValue=value;
@ -130,11 +114,3 @@ Actor* Actor::loadActor(const QJsonObject &json)
if(actor) actor->load(json);
return actor;
}
Actor* Actor::loadActor(QString subsecton, QSettings* settings)
{
QString type = settings->value(subsecton + "Type").toString();
Actor* actor = createActor(type);
if(actor) actor->load(subsecton, settings);
return actor;
}

5
src/actors/actor.h
View file

@ -3,7 +3,6 @@
#include <QObject>
#include <QString>
#include <QSettings>
#include <QJsonObject>
class Actor : public QObject
@ -52,10 +51,6 @@ public:
virtual void store(QJsonObject& json);
virtual void load(const QJsonObject& json);
static Actor* loadActor(const QJsonObject& json);
virtual void store(QString subsecton, QSettings* settings);
virtual void load(QString subsecton, QSettings* settings);
static Actor* loadActor(QString subsecton, QSettings* settings);
};
#endif // ACTOR_H

15
src/actors/alarmtime.cpp
View file

@ -128,18 +128,3 @@ void AlarmTime::load(const QJsonObject& json)
time_ = QDateTime::fromString(json["Time"].toString(""));
repeat_ = json["Repeat"].toInt(REPEAT_NEVER);
}
void AlarmTime::store(QString subsecton, QSettings* settings)
{
settings->setValue(subsecton + "Type", "Alarm");
Actor::store(subsecton, settings);
settings->setValue(subsecton + "Time", time_);
settings->setValue(subsecton + "Repeat", repeat_);
}
void AlarmTime::load(QString subsecton, QSettings* settings)
{
Actor::load(subsecton, settings);
time_ = settings->value(subsecton + "Time").toDateTime();
repeat_ = settings->value(subsecton + "Repeat").toUInt();
}

3
src/actors/alarmtime.h
View file

@ -38,9 +38,6 @@ public:
virtual void store(QJsonObject& json);
virtual void load(const QJsonObject& json);
virtual void store(QString subsecton, QSettings* settings);
virtual void load(QString subsecton, QSettings* settings);
uint8_t getRepeat();
public slots:

24
src/actors/regulator.cpp
View file

@ -74,30 +74,6 @@ void Regulator::load(const QJsonObject& json)
sensor_.name = json["SensorName"].toString("Sensor");
}
void Regulator::store(QString subsecton, QSettings* settings)
{
settings->setValue(subsecton + "Type", "Regulator");
Actor::store(subsecton, settings);
settings->setValue(subsecton + "Band", band_);
settings->setValue(subsecton + "SetPoint", setPoint_);
settings->setValue(subsecton + "SensorType", static_cast<int>(sensor_.type));
settings->setValue(subsecton + "SensorId", static_cast<int>(sensor_.id));
settings->setValue(subsecton + "SensorField", sensor_.field);
settings->setValue(subsecton + "SensorName", sensor_.name);
}
void Regulator::load(QString subsecton, QSettings* settings)
{
Actor::load(subsecton, settings);
setPoint_ = settings->value(subsecton + "SetPoint").toUInt();
band_ = settings->value(subsecton + "Band").toFloat();
sensor_.type = settings->value(subsecton + "SensorType").toUInt();
sensor_.id = settings->value(subsecton + "SensorId").toUInt();
sensor_.field = settings->value(subsecton + "SensorField").toFloat();
sensor_.name = settings->value(subsecton + "SensorName").toString();
}
QString Regulator::getName()
{
if(name.size() > 0) return name;

3
src/actors/regulator.h
View file

@ -33,7 +33,4 @@ public:
virtual void store(QJsonObject& json);
virtual void load(const QJsonObject& json);
virtual void store(QString subsecton, QSettings* settings);
virtual void load(QString subsecton, QSettings* settings);
};

24
src/actors/sensoractor.cpp
View file

@ -70,30 +70,6 @@ void SensorActor::load(const QJsonObject& json)
sensor_.name = json["SensorName"].toString("Sensor");
}
void SensorActor::store(QString subsecton, QSettings* settings)
{
settings->setValue(subsecton + "Type", "Sensor");
Actor::store(subsecton, settings);
settings->setValue(subsecton + "Sloap", sloap_);
settings->setValue(subsecton + "Threshold", threshold_);
settings->setValue(subsecton + "SensorType", static_cast<int>(sensor_.type));
settings->setValue(subsecton + "SensorId", static_cast<int>(sensor_.id));
settings->setValue(subsecton + "SensorField", sensor_.field);
settings->setValue(subsecton + "SensorName", sensor_.name);
}
void SensorActor::load(QString subsecton, QSettings* settings)
{
Actor::load(subsecton, settings);
sloap_ = settings->value(subsecton + "Sloap").toUInt();
threshold_ = settings->value(subsecton + "Threshold").toFloat();
sensor_.type = settings->value(subsecton + "SensorType").toUInt();
sensor_.id = settings->value(subsecton + "SensorId").toUInt();
sensor_.field = settings->value(subsecton + "SensorField").toFloat();
sensor_.name = settings->value(subsecton + "SensorName").toString();
}
QString SensorActor::getName()
{
if(name.size() > 0) return name;

3
src/actors/sensoractor.h
View file

@ -37,9 +37,6 @@ public:
virtual void store(QJsonObject& json);
virtual void load(const QJsonObject& json);
virtual void store(QString subsecton, QSettings* settings);
virtual void load(QString subsecton, QSettings* settings);
};

14
src/actors/timeractor.cpp
View file

@ -30,18 +30,6 @@ void TimerActor::load(const QJsonObject& json)
timeoutMsec_ = json["Timeout"].toInt(10000);
}
void TimerActor::store(QString subsecton, QSettings* settings)
{
settings->setValue(subsecton + "Type", "Timer");
Actor::store(subsecton, settings);
settings->setValue(subsecton + "Timeout", timeoutMsec_);
}
void TimerActor::load(QString subsecton, QSettings* settings)
{
Actor::load(subsecton, settings);
timeoutMsec_ = settings->value(subsecton + "Timeout").toInt();
}
void TimerActor::setTimeout(const int timeoutSec)
{
timeoutMsec_ = timeoutSec*1000;
@ -49,7 +37,7 @@ void TimerActor::setTimeout(const int timeoutSec)
int TimerActor::getTimeout()
{
return timeoutMsec_*1000;
return timeoutMsec_/1000;
}
void TimerActor::timeout()

3
src/actors/timeractor.h
View file

@ -27,7 +27,4 @@ public:
virtual void store(QJsonObject& json);
virtual void load(const QJsonObject& json);
virtual void store(QString subsecton, QSettings* settings);
virtual void load(QString subsecton, QSettings* settings);
};