Fix item updates in various scenarious

src/items/item.cpp

@@ -161,26 +161,34 @@ Item& Item::operator=(const ItemData& other)
 
 void Item::requestUpdate(ItemUpdateRequest update)
 {
-	if(!hasChanged(update.payload))
+	assert(update.type != ITEM_UPDATE_INVALID);
+	if(update.type != ITEM_UPDATE_LOADED && value_ == update.payload.getValue())
 		return;
 
 	if(update.type == ITEM_UPDATE_ACTOR && override_)
 		return;
 
-	if(update.type != ITEM_UPDATE_LOADED
-	   && (programMode == PROGRAM_MODE_PRIMARY || programMode == PROGRAM_MODE_HEADLESS_PRIMARY))
+	qDebug()<<"Item Update Request for"<<getName()<<" type "<<update.type<<" value "<<update.payload.getValue();
+
+	if(update.type != ITEM_UPDATE_LOADED &&
+		update.type != ITEM_UPDATE_BACKEND &&
+		(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(update.type != ITEM_UPDATE_LOADED)
 	{
+		value_ = update.payload.getValue();
+	}
+	else
+	{
+		name_ = update.payload.getName();
+		//itemId_ = update.payload.id();
+		hidden_ = update.payload.isHidden();
 		actors_.clear();
 		for(std::shared_ptr<Actor>& actor : update.newActors)
 			addActor(actor);
 	}
-
+	update.payload = *this;
 	updated(update);
 }
 
@@ -286,6 +294,7 @@ ItemUpdateRequest Item::createValueUpdateRequest(uint8_t value,
                                                  bool withActors)
 {
 	ItemUpdateRequest update;
+	update.type = type;
 	update.payload = *this;
 	update.payload.setValueData(value);
 	if(withActors)

src/items/item.h

@@ -19,7 +19,8 @@ typedef enum {
 	ITEM_UPDATE_ACTOR,
 	ITEM_UPDATE_REMOTE,
 	ITEM_UPDATE_LOADED,
-	ITEM_UPDATE_BACKEND
+	ITEM_UPDATE_BACKEND,
+	ITEM_UPDATE_INVALID
 } item_update_type_t;
 
 class ItemData
@@ -67,7 +68,7 @@ public:
 
 struct ItemUpdateRequest
 {
-	item_update_type_t type;
+	item_update_type_t type = ITEM_UPDATE_INVALID;
 	ItemData payload;
 	std::vector<std::shared_ptr<Actor> > newActors;
 };

src/items/itemstore.cpp

@@ -29,6 +29,7 @@ void ItemStore::addItem(const std::shared_ptr<Item>& item, item_update_type_t up
 		ItemUpdateRequest request = item->createValueUpdateRequest(item->getValue(),
 		                                                           updateType,
 		                                                           updateType == ITEM_UPDATE_LOADED);
+		request.newActors = item->getActors();
 		updateItem(request);
 	}
 }
@@ -56,6 +57,7 @@ void ItemStore::removeItem(const ItemData& item)
 
 void ItemStore::replaceItems(const std::vector<std::shared_ptr<Item>>& items)
 {
+	qDebug()<<__func__;
 	addItems(items, ITEM_UPDATE_LOADED);
 	std::vector<ItemData> deletedItems;
 	for(std::shared_ptr<Item> item : items_)
@@ -86,7 +88,6 @@ void ItemStore::updateItem(const ItemUpdateRequest& update)
 		if(items_[i]->operator==(update.payload))
 		{
 			items_[i]->requestUpdate(update);
-			qDebug() << "Item" << items_[i]->getName() << "updated";
 			itemUpdated(update);
 		}
 	}
@@ -106,7 +107,6 @@ void ItemStore::store(QJsonObject& json)
 
 void ItemStore::itemUpdateSlot(ItemUpdateRequest update)
 {
-	qDebug() << "Item" << update.payload.getName() << "updated from update slot";
 	itemUpdated(update);
 }
 

src/microcontroller.cpp

@@ -1,8 +1,5 @@
 #include "microcontroller.h"
 
-#include <chrono>
-#include <thread>
-
 void Microcontroller::relayToggle(int state, int relay)
 {
 	char buffer[8];
@@ -49,22 +46,34 @@ void Microcontroller::setAuxPwm(int duty)
 
 void Microcontroller::write(const QByteArray& buffer)
 {
-	if(_port != nullptr)
+	writeQue.enqueue(buffer);
+	if(!writeTimer.isActive())
 	{
-		_port->write(buffer);
-		_port->waitForBytesWritten(1000);
+		writeTimer.setInterval(0);
+		writeTimer.start();
 	}
-	std::this_thread::sleep_for(std::chrono::milliseconds(40));
 }
 
 void Microcontroller::write(char* buffer, const size_t length)
 {
-	if(_port != nullptr)
-	{
-		_port->write(buffer, length);
-		_port->waitForBytesWritten(1000);
+	write(QByteArray(buffer, length));
+}
+
+void Microcontroller::onWriteTimerTimeout()
+{
+	writeTimer.setInterval(50);
+	if(connected())
+	{
+		if(!writeQue.empty())
+		{
+			QByteArray data = writeQue.dequeue();
+			_port->write(data);
+		}
+		else
+		{
+			writeTimer.stop();
+		}
 	}
-	std::this_thread::sleep_for(std::chrono::milliseconds(40));
 }
 
 void Microcontroller::setPattern(int pattern)
@@ -82,8 +91,10 @@ void Microcontroller::startSunrise()
 
 bool Microcontroller::connected()
 {
-	if(_port != nullptr) return _port->isOpen();
-	else return false;
+	if(_port != nullptr)
+		return _port->isOpen();
+	else
+		return false;
 }
 
 void Microcontroller::refresh()
@@ -93,13 +104,17 @@ void Microcontroller::refresh()
 
 //housekeeping
 
-Microcontroller::Microcontroller(QIODevice* port)
+Microcontroller::Microcontroller(QIODevice* port): Microcontroller()
 {
 	setIODevice(port);
 }
 
 Microcontroller::Microcontroller()
 {
+	writeTimer.setInterval(50);
+	writeTimer.setSingleShot(false);
+	connect(&writeTimer, &QTimer::timeout, this, &Microcontroller::onWriteTimerTimeout);
+	qDebug()<<__func__<<writeTimer.isActive();
 }
 
 Microcontroller::~Microcontroller()

src/microcontroller.h

@@ -7,9 +7,9 @@
 #include <QString>
 #include <QRunnable>
 #include <QDebug>
-#include <QEventLoop>
 #include <QTimer>
-#include <QAbstractButton>
+#include <QByteArray>
+#include <QQueue>
 #include <vector>
 #include <memory>
 #include "items/item.h"
@@ -32,13 +32,12 @@ private:
 
 	bool listMode = false;
 
-	//uint8_t _auxState = 0;
-
 	QIODevice* _port = nullptr;
+	QQueue<QByteArray> writeQue;
+	QTimer writeTimer;
 
 	std::vector< std::shared_ptr<Item> > relayList;
 
-	QScopedPointer<QEventLoop> loop;
 	QString _buffer;
 
 	void processMicroReturn();
@@ -75,6 +74,7 @@ public slots:
 private slots:
 
 	void isReadyRead();
+	void onWriteTimerTimeout();
 
 signals:
 	void textRecived(const QString string);