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

Continue refactor

Browse source
This commit is contained in:
Carl Philipp Klemm 2026-03-30 18:25:25 +02:00
parent 18cf2b01bd
commit 219fbfb4c7
14 changed files with 104 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/actors/actor.cpp
View file

@ -21,7 +21,10 @@ void Actor::performAction()
{
if(active)
{
sigValue(triggerValue);
ItemUpdateRequest request;
request.type = ITEM_UPDATE_ACTOR;
request.payload = ItemData(QRandomGenerator::global()->generate(), "Item", triggerValue);
sigItemUpdate(request);
}
}
@ -86,9 +89,9 @@ uint8_t Actor::getTriggerValue()
return triggerValue;
}
void Actor::onValueChanged(uint8_t value)
void Actor::onItemUpdated(ItemUpdateRequest update)
{
(void)value;
(void) update;
}
std::shared_ptr<Actor> Actor::createActor(const QString& type)
@ -112,9 +115,7 @@ std::shared_ptr<Actor> Actor::loadActor(const QJsonObject &json)
return actor;
}
void Actor::setValue(uint8_t value)
void Actor::enactValue(uint8_t value)
{
Item::setValue(value);
setActive(value);
}

11
src/actors/actor.h
View file

@ -19,18 +19,17 @@ protected:
bool exausted = false;
void performAction();
virtual void enactValue(uint8_t value) override;
signals:
void sigValue(uint8_t value);
void sigItemUpdate(ItemUpdateRequest update);
public slots:
virtual void makeActive();
virtual void makeInactive();
virtual void setActive(uint8_t state);
virtual void onValueChanged(uint8_t state);
virtual void setValue(uint8_t value);
virtual void onItemUpdated(ItemUpdateRequest update);
public:
Actor(QObject* parent = nullptr);
@ -46,8 +45,8 @@ public:
static std::shared_ptr<Actor> createActor(const QString& type);
virtual void store(QJsonObject& json);
virtual void load(const QJsonObject& json, const bool preserve = false);
virtual void store(QJsonObject& json) override;
virtual void load(const QJsonObject& json, const bool preserve = false) override;
static std::shared_ptr<Actor> loadActor(const QJsonObject& json);
};

2
src/items/fixeditemsource.cpp
View file

@ -10,5 +10,5 @@ FixedItemSource::FixedItemSource(Microcontroller* micro, QObject *parent):
void FixedItemSource::refresh()
{
gotItems({powerItem, rgbItem, auxItem});
gotItems({powerItem, rgbItem, auxItem}, ITEM_UPDATE_BACKEND);
}

76
src/items/item.cpp
View file

@ -34,6 +34,11 @@ uint8_t ItemData::getValue() const
return value_;
}
void ItemData::setValueData(uint8_t value)
{
value_ = value;
}
uint32_t ItemData::id() const
{
return itemId_;
@ -156,41 +161,27 @@ Item& Item::operator=(const ItemData& other)
void Item::requestUpdate(ItemUpdateRequest update)
{
if(!hasChanged(update.data))
if(!hasChanged(update.payload))
return;
if(update.type == ITEM_UPDATE_USER || (update.type == ITEM_UPDATE_ACTOR && !override_) || update.type == ITEM_UPDATE_REMOTE)
if(update.type == ITEM_UPDATE_ACTOR && override_)
return;
if(update.type != ITEM_UPDATE_LOADED
&& (programMode == PROGRAM_MODE_PRIMARY || programMode == PROGRAM_MODE_HEADLESS_PRIMARY))
enactValue(update.payload.getValue());
*this = update.payload;
update.payload = *this;
if(update.type == ITEM_UPDATE_LOADED)
{
if(programMode == PROGRAM_MODE_PRIMARY || programMode == PROGRAM_MODE_HEADLESS_PRIMARY)
enactValue(update.data.getValue());
*this = update.data;
update.data = *this;
actors_.clear();
for(std::shared_ptr<Actor>& actor : update.newActors)
addActor(actor);
}
updated(update);
}
}
void Item::actorSetValue(uint8_t value)
{
if(!override_ && (programMode == PROGRAM_MODE_PRIMARY || programMode == PROGRAM_MODE_HEADLESS_PRIMARY))
setValue(value);
}
void Item::setValue(uint8_t value)
{
qDebug()<<__func__;
informValue(value);
updated(*this);
if(programMode == PROGRAM_MODE_PRIMARY || programMode == PROGRAM_MODE_HEADLESS_PRIMARY)
enactValue(value);
}
void Item::informValue(uint8_t value)
{
if(value_ != value)
{
value_ = value;
valueChanged(value_);
}
}
void Item::enactValue(uint8_t value)
@ -203,8 +194,8 @@ void Item::addActor(std::shared_ptr<Actor> actor)
actor->setParent(this);
actors_.push_back(actor);
if(programMode == PROGRAM_MODE_PRIMARY || programMode == PROGRAM_MODE_HEADLESS_PRIMARY)
connect(actor.get(), &Actor::sigValue, this, &Item::actorSetValue);
connect(this, &Item::valueChanged, actor.get(), &Actor::onValueChanged);
connect(actor.get(), &Actor::sigItemUpdate, this, &Item::requestUpdate);
connect(this, &Item::updated, actor.get(), &Actor::onItemUpdated);
std::shared_ptr<SensorActor> sensorActor = std::dynamic_pointer_cast<SensorActor>(actor);
if(sensorActor)
@ -263,14 +254,6 @@ void Item::setActorsActive(bool in)
in ? actors_[i]->makeActive() : actors_[i]->makeInactive();
}
void Item::mergeLoaded(Item& item)
{
name_ = item.name_;
actors_.clear();
for(std::shared_ptr<Actor> actor : item.actors_)
addActor(actor);
}
std::shared_ptr<Item> Item::loadItem(const QJsonObject& json)
{
std::shared_ptr<Item> newItem = nullptr;
@ -298,3 +281,14 @@ std::shared_ptr<Item> Item::loadItem(const QJsonObject& json)
return newItem;
}
ItemUpdateRequest Item::createValueUpdateRequest(uint8_t value,
item_update_type_t type,
bool withActors)
{
ItemUpdateRequest update;
update.payload = *this;
update.payload.setValueData(value);
if(withActors)
update.newActors = actors_;
return update;
}

15
src/items/item.h
View file

@ -17,7 +17,9 @@ typedef enum {
typedef enum {
ITEM_UPDATE_USER = 0,
ITEM_UPDATE_ACTOR,
ITEM_UPDATE_REMOTE
ITEM_UPDATE_REMOTE,
ITEM_UPDATE_LOADED,
ITEM_UPDATE_BACKEND
} item_update_type_t;
class ItemData
@ -52,6 +54,7 @@ public:
bool hasChanged(const ItemData& other);
void setName(QString name);
uint8_t getValue() const;
void setValueData(uint8_t value);
bool getLoaded() const;
void setLoaded(bool loaded);
bool isHidden() const;
@ -65,8 +68,8 @@ public:
struct ItemUpdateRequest
{
item_update_type_t type;
ItemData data;
bool valueOnly;
ItemData payload;
std::vector<std::shared_ptr<Actor> > newActors;
};
@ -81,7 +84,7 @@ signals:
void updated(ItemUpdateRequest update);
public slots:
void requestUpdate(ItemUpdateRequest update);
virtual void requestUpdate(ItemUpdateRequest update);
public:
@ -100,7 +103,9 @@ public:
void setActorsActive(bool in);
void setOverride(const bool in);
bool getOverride();
void mergeLoaded(Item& item);
ItemUpdateRequest createValueUpdateRequest(uint8_t value,
item_update_type_t type,
bool withActors = false);
virtual void store(QJsonObject& json);
virtual void load(const QJsonObject& json, const bool preserve = false);

2
src/items/itemloadersource.cpp
View file

@ -25,7 +25,7 @@ void ItemLoaderSource::refresh()
qDebug()<<"Loaded item"<<newItem->getName();
}
}
gotItems(items);
gotItems(items, ITEM_UPDATE_LOADED);
}
void ItemLoaderSource::updateJson(const QJsonObject& json)

4
src/items/itemsource.h
View file

@ -17,9 +17,9 @@ public slots:
virtual void refresh() = 0;
signals:
void gotItems(std::vector<std::shared_ptr<Item>> items, bool inform = true);
void gotItems(std::vector<std::shared_ptr<Item>> items, item_update_type_t updateType);
void requestReplaceItems(std::vector<std::shared_ptr<Item>> items);
void updateItems(std::vector<ItemData> items, bool inform = true);
void updateItems(std::vector<ItemUpdateRequest> updates);
};
#endif // ITEMSOURCE_H

57
src/items/itemstore.cpp
View file

@ -6,7 +6,7 @@ ItemStore::ItemStore(QObject *parent): QObject(parent)
{
}
void ItemStore::addItem(std::shared_ptr<Item> item, bool inform)
void ItemStore::addItem(const std::shared_ptr<Item>& item, item_update_type_t updateType)
{
std::shared_ptr<Item> matched = nullptr;
for(unsigned i = 0; i < items_.size(); i++ )
@ -26,17 +26,18 @@ void ItemStore::addItem(std::shared_ptr<Item> item, bool inform)
}
else
{
if(item->getLoaded())
matched->mergeLoaded(*item);
else if(item->getValue() != matched->getValue())
updateItem(*item, inform);
ItemUpdateRequest request = item->createValueUpdateRequest(item->getValue(),
updateType,
updateType == ITEM_UPDATE_LOADED);
updateItem(request);
}
}
void ItemStore::addItems(const std::vector<std::shared_ptr<Item>>& itemIn, bool inform)
void ItemStore::addItems(const std::vector<std::shared_ptr<Item>>& itemIn,
item_update_type_t updateType)
{
for(unsigned j = 0; j < itemIn.size(); j++)
addItem(itemIn[j], inform);
addItem(itemIn[j], updateType);
}
void ItemStore::removeItem(const ItemData& item)
@ -55,7 +56,7 @@ void ItemStore::removeItem(const ItemData& item)
void ItemStore::replaceItems(const std::vector<std::shared_ptr<Item>>& items)
{
addItems(items, true);
addItems(items, ITEM_UPDATE_LOADED);
std::vector<ItemData> deletedItems;
for(std::shared_ptr<Item> item : items_)
{
@ -72,33 +73,21 @@ void ItemStore::clear()
items_.clear();
}
void ItemStore::updateItems(std::vector<ItemData> items, bool inform)
void ItemStore::updateItems(const std::vector<ItemUpdateRequest>& updates)
{
for(const ItemData& item : items)
updateItem(item, inform);
for(const ItemUpdateRequest& update : updates)
updateItem(update);
}
void ItemStore::updateItem(const ItemData& item, bool inform)
void ItemStore::updateItem(const ItemUpdateRequest& update)
{
for(unsigned i = 0; i < items_.size(); i++ )
{
if(items_[i]->operator==(item))
if(items_[i]->operator==(update.payload))
{
if(items_[i]->hasChanged(item))
{
if(items_[i]->getValue() != item.getValue())
{
items_[i]->setLoaded(false);
if(inform)
items_[i]->informValue(item.getValue());
else
items_[i]->setValue(item.getValue());
}
qDebug()<<"Item"<<items_[i]->getName()<<"updated"<<(inform ? "with inform" : "");
if(!inform)
itemUpdated(items_[i]);
}
items_[i]->requestUpdate(update);
qDebug() << "Item" << items_[i]->getName() << "updated";
itemUpdated(update);
}
}
}
@ -115,16 +104,10 @@ void ItemStore::store(QJsonObject& json)
json["Items"] = itemsArray;
}
void ItemStore::itemUpdateSlot(ItemData data)
void ItemStore::itemUpdateSlot(ItemUpdateRequest update)
{
for(std::shared_ptr<Item>& item: items_)
{
if(*item == data)
{
qDebug()<<"Item"<<data.getName()<<"updated from update slot";
itemUpdated(std::weak_ptr<Item>(item));
}
}
qDebug() << "Item" << update.payload.getName() << "updated from update slot";
itemUpdated(update);
}
std::shared_ptr<Item> ItemStore::getItem(uint32_t id)

12
src/items/itemstore.h
View file

@ -33,21 +33,21 @@ signals:
void itemDeleted(ItemData item);
void itemAdded(std::weak_ptr<Item> Item);
void itemUpdated(std::weak_ptr<Item> Item);
void itemUpdated(ItemUpdateRequest update);
void sigRefresh();
public slots:
void removeItem(const ItemData& item);
void addItem(std::shared_ptr<Item> item, bool inform = true);
void addItems(const std::vector<std::shared_ptr<Item>>& itemsIn, bool inform = true);
void addItem(const std::shared_ptr<Item>& item, item_update_type_t updateType);
void addItems(const std::vector<std::shared_ptr<Item>>& itemsIn, item_update_type_t updateType);
void replaceItems(const std::vector<std::shared_ptr<Item>>& items);
void updateItems(std::vector<ItemData> items, bool inform = true);
void updateItem(const ItemData& item, bool inform = true);
void updateItems(const std::vector<ItemUpdateRequest>& updates);
void updateItem(const ItemUpdateRequest& update);
void refresh();
private slots:
void itemUpdateSlot(ItemData data);
void itemUpdateSlot(ItemUpdateRequest update);
};
extern ItemStore globalItems;

10
src/items/relay.cpp
View file

@ -23,16 +23,6 @@ void Relay::enactValue(uint8_t value)
}
}
void Relay::on()
{
setValue(true);
}
void Relay::off()
{
setValue(false);
}
void Relay::toggle()
{
value_ ? off() : on();

6
src/items/relay.h
View file

@ -4,7 +4,6 @@
#include<stdint.h>
#include<QObject>
#include "sensors/sensor.h"
#include "item.h"
class Microcontroller;
@ -21,11 +20,6 @@ private:
protected:
virtual void enactValue(uint8_t value) override;
public slots:
void on();
void off();
void toggle();
public:
Relay(uint8_t id = 0, QString name = "", uint16_t address = 0, bool state = false, QObject* parent = nullptr);

7
src/microcontroller.cpp
View file

@ -142,7 +142,7 @@ void Microcontroller::processList(const QString& buffer)
else if(buffer.contains("EOL"))
{
listMode = false;
gotItems(relayList);
gotItems(relayList, ITEM_UPDATE_BACKEND);
relayList.clear();
}
else listMode = false;
@ -150,7 +150,10 @@ void Microcontroller::processList(const QString& buffer)
void Microcontroller::processRelayState(const QString& buffer)
{
updateItems({static_cast<ItemData>(*processRelayLine(buffer))});
ItemUpdateRequest update;
update.type = ITEM_UPDATE_BACKEND;
update.payload = static_cast<ItemData>(*processRelayLine(buffer));
updateItems({update});
}
void Microcontroller::processSensorState(const QString& buffer)

2
src/service/tcpclient.cpp
View file

@ -47,7 +47,7 @@ void TcpClient::processIncomeingJson(const QByteArray& jsonbytes)
}
}
if(!items.empty())
gotItems(items, true);
gotItems(items, ITEM_UPDATE_REMOTE);
}
else
{

14
src/ui/itemwidget.cpp
View file

@ -59,17 +59,27 @@ void ItemWidget::deleteItem()
void ItemWidget::moveToValue(int value)
{
if(auto workingItem = item_.lock())
workingItem->setValue(value);
{
ItemUpdateRequest request = workingItem->createValueUpdateRequest(value, ITEM_UPDATE_USER);
workingItem->requestUpdate(request);
}
else
{
disable();
}
}
void ItemWidget::moveToState(bool state)
{
if(auto workingItem = item_.lock())
workingItem->setValue(state);
{
ItemUpdateRequest request = workingItem->createValueUpdateRequest(state, ITEM_UPDATE_USER);
workingItem->requestUpdate(request);
}
else
{
disable();
}
}
void ItemWidget::disable()