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

Sensors now work over broadcast pipe

Browse source 
Added Polynomal actor
Added Item adding dialog
Added Factor Actor
This commit is contained in:
Carl Klemm 2020-02-04 22:56:10 +01:00
parent f6aaebafc6
commit 772d21a982
63 changed files with 1450 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/items/relay.cpp
View file

@ -3,7 +3,7 @@
//Relay
Relay::Relay(SensorStore* sensors, Microcontroller* micro, uint8_t id, QString name, uint16_t address, bool state, QObject* parent): Item(sensors, 0, name, state, parent), micro_(micro), id_(id), address_(address)
Relay::Relay(Microcontroller* micro, uint8_t id, QString name, uint16_t address, bool state, QObject* parent): Item(0, name, state, parent), micro_(micro), id_(id), address_(address)
{
itemId_ = address | ((uint32_t)id << 16);
}
@ -38,9 +38,9 @@ void Relay::store(QJsonObject& json)
json["Address"] = address_;
}
void Relay::load(const QJsonObject& json)
void Relay::load(const QJsonObject& json, const bool preserve)
{
Item::load(json);
Item::load(json, preserve);
id_ = static_cast<uint8_t>(json["Id"].toInt(0));
address_ = static_cast<uint16_t>(json["Address"].toInt(0));
itemId_ = address_ | (static_cast<uint32_t>(id_) << 16);