some more work on the api

lifx/integrationpluginlifx.cpp

@@ -63,6 +63,10 @@ void IntegrationPluginLifx::discoverThings(ThingDiscoveryInfo *info)
     }
 
     if (info->thingClassId() == colorBulbThingClassId) {
+    } else if () {
+
+    } else {
+
     }
 }
 

lifx/lifx.cpp

@@ -33,6 +33,10 @@
 #include "extern-plugininfo.h"
 
 #include <QColor>
+#include <QFile>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
 
 Lifx::Lifx(QObject *parent) :
     QObject(parent)
@@ -40,6 +44,36 @@ Lifx::Lifx(QObject *parent) :
     m_reconnectTimer = new QTimer(this);
     m_reconnectTimer->setSingleShot(true);
     connect(m_reconnectTimer, &QTimer::timeout, this, &Lifx::onReconnectTimer);
+    m_clientId = qrand();
+
+    QFile file;
+    file.setFileName("/tmp/products.json");
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qCWarning(dcLifx()) << "Could not open products file" << file.errorString();
+    }
+    QJsonDocument productsJson = QJsonDocument::fromJson(file.readAll());
+    file.close();
+
+    if (!productsJson.isArray()) {
+        qCWarning(dcLifx()) << "Products JSON is not a valid array";
+    }
+    QJsonArray productsArray = productsJson.array().first().toObject().value("products").toArray();
+    foreach (QJsonValue value, productsArray) {
+        QJsonObject object = value.toObject();
+        LifxProduct product;
+        product.pid = object["pid"].toInt();
+        product.name = object["name"].toString();
+        qCDebug(dcLifx()) << "Lifx product JSON, found product. PID:" << product.pid << "Name" << product.name;
+        QJsonObject features = object["features"].toObject();
+        product.color = features["color"].toBool();
+        product.infrared = features["infrared"].toBool();
+        product.matrix = features["matrix"].toBool();
+        product.multizone = features["multizone"].toBool();
+        product.minColorTemperature = features["temperature_range"].toArray().first().toInt();
+        product.maxColorTemperature = features["temperature_range"].toArray().last().toInt();
+        product.chain = features["chain"].toBool();
+        m_lifxProducts.insert(product.pid, product);
+    }
 }
 
 Lifx::~Lifx()
@@ -143,42 +177,56 @@ int Lifx::flash15s()
 
 void Lifx::sendMessage(const Lifx::Message &message)
 {
-    QByteArray data;
+    QByteArray header;
     // -- FRAME --
     // Protocol number: must be 1024 (decimal)
     quint16 protocol = 1024;
     protocol |= (0x0001 << 4); //Message includes a target address: must be one (1)
     protocol |= (message.frame.Tagged << 5);   // Determines usage of the Frame Address target field
     protocol &= ~(0x0003); // Message origin indicator: must be zero (0)
-    data.append(protocol >> 8);
+    header.append(protocol >> 8);
-    data.append(protocol & 0xff);
+    header.append(protocol & 0xff);
 
     //Source identifier: unique value set by the client, used by responses
-    data.append("nyma");
+    header.append(m_clientId);
 
     // -- FRAME ADDRESS --
     //Target - frame address starts with 64 bits
 
 
     //ADD RESERVED SECTION a reserved section of 48 bits (6 bytes)
-    data.append(6, '0');
+    header.append(6, 0x00); //that must be all zeros.
 
     //ADD ACK and RES
+    header.append(2, 0x01);
 
     //ADD SEQUENCE NUMBER 1Byte
-    data.append(m_sequenceNumber + 1);
+    header.append(m_sequenceNumber++);
+
+    //Protocol header. which begins with 64 reserved bits (8 bytes). Set these all to zero.
+    header.append(8, 0x00); //that must be all zeros.
 
     //ADD MESSAGE TYPE
+    header.append(static_cast<uint16_t>(LightMessages::SetColor));
+
+    // Finally another reserved field of 16 bits (2 bytes).
+    header.append(2, 0x00);
 
     //ADD SIZE
-    data.append(((static_cast<uint16_t>(data.length()+1) & 0xff00) >> 8));
+    header.append(((static_cast<uint16_t>(header.length()+1) & 0xff00) >> 8));
-    data.append((static_cast<uint16_t>(data.length()+1) & 0x00ff));
+    header.append((static_cast<uint16_t>(header.length()+1) & 0x00ff));
 
     //Finally another reserved field of 16 bits (2 bytes).
-    data.append(2, '0');
+    header.append(2, '0');
-    data = QByteArray::fromHex("0x310000340000000000000000000000000000000000000000000000000000000066000000005555FFFFFFFFAC0D00040000");
+
-    m_socket->writeDatagram(data, m_host, m_port);
+    QByteArray payload;
-    Q_UNUSED(message)
+
+    QByteArray message;
+    message.append(header);
+    message.append(payload);
+    message.append(message.length());
+    //header = QByteArray::fromHex("0x310000340000000000000000000000000000000000000000000000000000000066000000005555FFFFFFFFAC0D00040000");
+    m_socket->writeDatagram(message, m_host, m_port);
 }
 
 void Lifx::onStateChanged(QAbstractSocket::SocketState state)

lifx/lifx.h

@@ -111,6 +111,18 @@ public:
         SetInfrared = 122
     };
 
+    struct LifxProduct {
+      int pid;
+      QString name;
+      bool color;
+      bool infrared;
+      bool matrix;
+      bool multizone;
+      uint minColorTemperature;
+      uint maxColorTemperature;
+      bool chain;
+    };
+
     explicit Lifx(QObject *parent = nullptr);
     ~Lifx();
     bool enable();
@@ -124,11 +136,13 @@ public:
     int flash15s();
 
 private:
+    quint32 m_clientId = 0;
     QTimer *m_reconnectTimer = nullptr;
     QUdpSocket *m_socket = nullptr;
     QHostAddress m_host;
     quint16 m_port;
     quint8 m_sequenceNumber = 0;
+    QHash<int, LifxProduct> m_lifxProducts;
 
     void sendMessage(const Message &message);
 
@@ -139,7 +153,7 @@ private slots:
 
 signals:
     void connectionChanged(bool connected);
-    void devicesDiscovered(QHostAddress address, int port);
+    void deviceDiscovered(const QHostAddress &address, int port, const LifxProduct &product);
     //void requestExecuted(int requestId, bool success);
     //void errorReceived(int code, const QString &message);