update ws2812

fix time tests

plugins/deviceplugins/ws2812/devicepluginws2812.cpp

@@ -38,6 +38,7 @@
     \quotefile plugins/deviceplugins/ws2812/devicepluginws2812.json
 */
 
+
 #include "devicepluginws2812.h"
 #include "plugin/device.h"
 #include "plugininfo.h"
@@ -199,7 +200,60 @@ DeviceManager::DeviceError DevicePluginWs2812::executeAction(Device *device, con
         return DeviceManager::DeviceErrorAsync;
 
 
-    } else if(action.actionTypeId() == maxPixActionTypeId) {
+    } else if(action.actionTypeId() == speedActionTypeId) {
+
+        QUrl url;
+        url.setScheme("coap");
+        url.setHost(device->paramValue("host").toString());
+        url.setPath("/a/speed");
+
+        int speed = action.param("speed").value().toInt();
+
+        qCDebug(dcWs2812) << "Set Speed:" << speed;
+
+        QByteArray message = QString("bpm=%1").arg(QString::number(speed)).toUtf8();
+        qCDebug(dcWs2812) << "Sending" << url.toString() << message;
+
+        CoapReply *reply = m_coap->post(CoapRequest(url), message);
+        if (reply->isFinished() && reply->error() != CoapReply::NoError) {
+            qCWarning(dcWs2812) << "CoAP reply finished with error" << reply->errorString();
+            setReachable(device, false);
+            reply->deleteLater();
+            return DeviceManager::DeviceErrorHardwareFailure;
+        }
+        m_setSpeed.insert(reply, action);
+        m_asyncActions.insert(action.id(), device);
+        return DeviceManager::DeviceErrorAsync;
+
+
+    }else if(action.actionTypeId() == brightnessActionTypeId) {
+
+        QUrl url;
+        url.setScheme("coap");
+        url.setHost(device->paramValue("host").toString());
+        url.setPath("/a/brightness");
+
+
+        int brightness = action.param("brightness").value().toInt();
+
+        qCDebug(dcWs2812) << "Set brightness:" << brightness;
+
+        QByteArray message = QString("percent=%1").arg(QString::number(brightness)).toUtf8();
+        qCDebug(dcWs2812) << "Sending" << url.toString() << message;
+
+        CoapReply *reply = m_coap->post(CoapRequest(url), message);
+        if (reply->isFinished() && reply->error() != CoapReply::NoError) {
+            qCWarning(dcWs2812) << "CoAP reply finished with error" << reply->errorString();
+            setReachable(device, false);
+            reply->deleteLater();
+            return DeviceManager::DeviceErrorHardwareFailure;
+        }
+        m_setBrightness.insert(reply, action);
+        m_asyncActions.insert(action.id(), device);
+        return DeviceManager::DeviceErrorAsync;
+
+
+    }else if(action.actionTypeId() == maxPixActionTypeId) {
 
         QUrl url;
         url.setScheme("coap");
@@ -232,13 +286,11 @@ DeviceManager::DeviceError DevicePluginWs2812::executeAction(Device *device, con
         return DeviceManager::DeviceErrorAsync;
 
 
-    } else if(action.actionTypeId() == effectModeActionTypeId) {
+    }else if(action.actionTypeId() == effectModeActionTypeId) {
-
-        //int effectmode = createSetColorRequest(action.param("color").value().value<QColor>());
 
         int effectmode = 0;
 
-        QString effectModeString = action.param("effect").value().toString();
+        QString effectModeString = action.param("effect mode").value().toString();
 
 
         QUrl url;
@@ -246,20 +298,10 @@ DeviceManager::DeviceError DevicePluginWs2812::executeAction(Device *device, con
         url.setHost(device->paramValue("host").toString());
         url.setPath("/a/effect");
 
-
-        /*"Off",
-        "Color On",
-        "Color Wave",
-        "Color Fade",
-        "Color Flash",
-        "Rainbow Wave",
-        "Rainbow Flash",
-        "Knight Rider",
-        "Fire"
-        */
-
         qCDebug(dcWs2812) << "Set effect mode to:" << effectModeString;
 
+
+        //TODO switch to enum
         if(effectModeString == "Off") {
             effectmode = 0;
         } else if (effectModeString == "Color On") {
@@ -278,6 +320,8 @@ DeviceManager::DeviceError DevicePluginWs2812::executeAction(Device *device, con
             effectmode = 7;
         }else if (effectModeString == "Fire") {
             effectmode = 8;
+        }else if (effectModeString == "Tricolore") {
+            effectmode = 9;
         }
 
         QByteArray payload = QString("mode=%1").arg(QString::number(effectmode)).toUtf8();
@@ -295,11 +339,44 @@ DeviceManager::DeviceError DevicePluginWs2812::executeAction(Device *device, con
         m_asyncActions.insert(action.id(), device);
         return DeviceManager::DeviceErrorAsync;
 
+    }else if(action.actionTypeId() == tcolor1ActionTypeId || action.actionTypeId() == tcolor2ActionTypeId || action.actionTypeId() == tcolor3ActionTypeId) {
+
+        QUrl url;
+        url.setScheme("coap");
+        url.setHost(device->paramValue("host").toString());
+        url.setPath("/a/tcolor");
+
+
+        /*
+         *          TODO
+         *          Current Implementation is just a temporary workaround
+         *
+         *
+         */
+
+        if(action.actionTypeId() == tcolor1ActionTypeId){
+            tColor1 = action.param("tricolore color 1").value().value<QColor>().toRgb();
+        } else if(action.actionTypeId() == tcolor2ActionTypeId){
+            tColor2 = action.param("tricolore color 2").value().value<QColor>().toRgb();
+        } else if(action.actionTypeId() == tcolor3ActionTypeId){
+            tColor3 = action.param("tricolore color 3").value().value<QColor>().toRgb();
+        }
+
+        QByteArray message = "color=" + tColor1.name().remove("#").toUtf8() + tColor2.name().remove("#").toUtf8() + tColor3.name().remove("#").toUtf8();
+        qCDebug(dcWs2812) << "Sending" << url.toString() << message;
+
+        CoapReply *reply = m_coap->post(CoapRequest(url), message);
+        if (reply->isFinished() && reply->error() != CoapReply::NoError) {
+            qCWarning(dcWs2812) << "CoAP reply finished with error" << reply->errorString();
+            setReachable(device, false);
+            reply->deleteLater();
+            return DeviceManager::DeviceErrorHardwareFailure;
+        }
+        m_setTColor.insert(reply, action);
+        m_asyncActions.insert(action.id(), device);
+        return DeviceManager::DeviceErrorAsync;
     }
 
-
-
-
     return DeviceManager::DeviceErrorActionTypeNotFound;
 }
 
@@ -344,7 +421,23 @@ void DevicePluginWs2812::updateColor(Device *device)
         reply->deleteLater();
         return;
     }
+    m_updateReplies.insert(reply, device);
+}
 
+void DevicePluginWs2812::updateTricolore(Device *device)
+{
+    qCDebug(dcWs2812) << "Update" << device->name() << "tricolore value";
+    QUrl url;
+    url.setScheme("coap");
+    url.setHost(device->paramValue("host").toString());
+    url.setPath("/a/tcolor");
+    CoapReply *reply = m_coap->get(CoapRequest(url));
+    if (reply->isFinished() && reply->error() != CoapReply::NoError) {
+        qCWarning(dcWs2812) << "CoAP reply finished with error" << reply->errorString();
+        setReachable(device, false);
+        reply->deleteLater();
+        return;
+    }
     m_updateReplies.insert(reply, device);
 }
 
@@ -404,9 +497,17 @@ void DevicePluginWs2812::enableNotifications(Device *device)
     url.setPath("/a/color");
     m_enableNotification.insert(m_coap->enableResourceNotifications(CoapRequest(url)), device);
 
+    url.setPath("/a/speed");
+    m_enableNotification.insert(m_coap->enableResourceNotifications(CoapRequest(url)), device);
+
+    url.setPath("/a/brightness");
+    m_enableNotification.insert(m_coap->enableResourceNotifications(CoapRequest(url)), device);
+
     url.setPath("/a/effect");
     m_enableNotification.insert(m_coap->enableResourceNotifications(CoapRequest(url)), device);
 
+    url.setPath("/a/tcolor");
+    m_enableNotification.insert(m_coap->enableResourceNotifications(CoapRequest(url)), device);
 }
 
 void DevicePluginWs2812::setReachable(Device *device, const bool &reachable)
@@ -423,6 +524,7 @@ void DevicePluginWs2812::setReachable(Device *device, const bool &reachable)
             updateColor(device);
             updateEffect(device);
             updateMaxPix(device);
+            updateTricolore(device);
 
             // Make sure the notifications are enabled
             enableNotifications(device);
@@ -495,12 +597,60 @@ void DevicePluginWs2812::coapReplyFinished(CoapReply *reply)
             device->setStateValue(batteryStateTypeId, reply->payload().toDouble());
         } else if (urlPath == "/a/color") {
             qCDebug(dcWs2812()) << "Updated color value:" << reply->payload();
-            device->setStateValue(effectColorStateTypeId, reply->payload());
+            device->setStateValue(effectColorStateTypeId, QVariant::fromValue(reply->payload()));
-        } else if (urlPath == "/p/maxpix") {
+        } else if (urlPath == "/a/effect") {
-            qCDebug(dcWs2812()) << "Updated max pix value:" << reply->payload();
+
-            device->setStateValue(maxPixStateTypeId, reply->payload());
+            qCDebug(dcWs2812()) << "Updated effect value:" << reply->payload();
+            int effectmode  =  reply->payload().toInt();
+            QString effectModeString;
+
+            switch (effectmode) {
+               case 0:
+                    effectModeString == "Off";
+                    break;
+                case 1:
+                     effectModeString == "Color On";
+                     break;
+                case 2:
+                     effectModeString == "Color Wave";
+                     break;
+                case 3:
+                     effectModeString == "Color Fade";
+                     break;
+                case 4:
+                     effectModeString == "Color Flash";
+                     break;
+                case 5:
+                     effectModeString == "Rainbow Wave";
+                     break;
+                case 6:
+                     effectModeString == "Rainbow Flash";
+                     break;
+                case 7:
+                     effectModeString == "Knight Rider";
+                     break;
+                case 8:
+                     effectModeString == "Fire";
+                     break;
+                case 9:
+                     effectModeString == "Tricolore";
+                     break;
+                default:
+                    effectModeString == "Off";
+            }
+            device->setStateValue(effectModeStateTypeId, effectModeString);
+        }else if (urlPath == "/a/brightness") {
+            qCDebug(dcWs2812()) << "Updated brightness value:" << reply->payload().toInt();
+            device->setStateValue(brightnessStateTypeId, reply->payload().toInt());
+        }else if (urlPath == "/a/speed") {
+            qCDebug(dcWs2812()) << "Updated speed value:" << reply->payload().toInt();
+            device->setStateValue(speedStateTypeId, reply->payload().toInt());
+        }else if (urlPath == "/p/maxpix") {
+            qCDebug(dcWs2812()) << "Updated max pix value:" << reply->payload().toInt();
+            device->setStateValue(maxPixStateTypeId, reply->payload().toInt());
         }
 
+
     } else if (m_setEffect.contains(reply)) {
         Action action = m_setEffect.take(reply);
         Device *device = m_asyncActions.take(action.id());
@@ -524,7 +674,7 @@ void DevicePluginWs2812::coapReplyFinished(CoapReply *reply)
         // Tell the user about the action execution result
         emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorNoError);
 
-    } else if (m_setColor.contains(reply)) {
+    }else if (m_setColor.contains(reply)) {
         Action action = m_setColor.take(reply);
         Device *device = m_asyncActions.take(action.id());
 
@@ -537,6 +687,36 @@ void DevicePluginWs2812::coapReplyFinished(CoapReply *reply)
             return;
         }
 
+        // Check CoAP status code
+        if (reply->statusCode() != CoapPdu::Content) {
+            qCWarning(dcWs2812) << "Set color status code error:" << reply;
+            reply->deleteLater();
+            emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorHardwareFailure);
+            return;
+        }
+        QString tcolor = action.param("color").value().toByteArray();
+
+        // Update the state here, so we don't have to wait for the notification
+        device->setStateValue(tcolor1StateTypeId, tcolor.left(6));
+        device->setStateValue(tcolor2StateTypeId, tcolor.mid(6,6));
+        device->setStateValue(tcolor3StateTypeId, tcolor.right(6));
+
+        // Tell the user about the action execution result
+        emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorNoError);
+
+    } else if (m_setTColor.contains(reply)) {
+        Action action = m_setTColor.take(reply);
+        Device *device = m_asyncActions.take(action.id());
+
+        // check CoAP reply error
+        if (reply->error() != CoapReply::NoError) {
+            qCWarning(dcWs2812) << "CoAP set color reply finished with error" << reply->errorString();
+            setReachable(device, false);
+            reply->deleteLater();
+            emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorHardwareFailure);
+            return;
+        }
+
         // Check CoAP status code
         if (reply->statusCode() != CoapPdu::Content) {
             qCWarning(dcWs2812) << "Set color status code error:" << reply;
@@ -550,7 +730,59 @@ void DevicePluginWs2812::coapReplyFinished(CoapReply *reply)
         // Tell the user about the action execution result
         emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorNoError);
 
-    }  else if (m_setPix.contains(reply)) {
+    }  else if (m_setBrightness.contains(reply)) {
+        Action action = m_setBrightness.take(reply);
+        Device *device = m_asyncActions.take(action.id());
+
+        // check CoAP reply error
+        if (reply->error() != CoapReply::NoError) {
+            qCWarning(dcWs2812) << "CoAP set brightness reply finished with error" << reply->errorString();
+            setReachable(device, false);
+            reply->deleteLater();
+            emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorHardwareFailure);
+            return;
+        }
+
+        // Check CoAP status code
+        if (reply->statusCode() != CoapPdu::Content) {
+            qCWarning(dcWs2812) << "Set brightness code error:" << reply;
+            reply->deleteLater();
+            emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorHardwareFailure);
+            return;
+        }
+
+        // Update the state here, so we don't have to wait for the notification
+        device->setStateValue(brightnessStateTypeId, action.param("brightness").value().toInt());
+        // Tell the user about the action execution result
+        emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorNoError);
+
+    }else if (m_setSpeed.contains(reply)) {
+        Action action = m_setSpeed.take(reply);
+        Device *device = m_asyncActions.take(action.id());
+
+        // check CoAP reply error
+        if (reply->error() != CoapReply::NoError) {
+            qCWarning(dcWs2812) << "CoAP set speed reply finished with error" << reply->errorString();
+            setReachable(device, false);
+            reply->deleteLater();
+            emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorHardwareFailure);
+            return;
+        }
+
+        // Check CoAP status code
+        if (reply->statusCode() != CoapPdu::Content) {
+            qCWarning(dcWs2812) << "Set speed code error:" << reply;
+            reply->deleteLater();
+            emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorHardwareFailure);
+            return;
+        }
+
+        // Update the state here, so we don't have to wait for the notification
+        device->setStateValue(speedStateTypeId, action.param("speed").value().toInt());
+        // Tell the user about the action execution result
+        emit actionExecutionFinished(action.id(), DeviceManager::DeviceErrorNoError);
+
+    }else if (m_setPix.contains(reply)) {
         Action action = m_setPix.take(reply);
         Device *device = m_asyncActions.take(action.id());
 
@@ -615,7 +847,52 @@ void DevicePluginWs2812::onNotificationReceived(const CoapObserveResource &resou
     if (resource.url().path() == "/s/battery") {
         device->setStateValue(batteryStateTypeId, payload.toDouble());
     }else if (resource.url().path() == "/a/color") {
-        device->setStateValue(effectColorStateTypeId, QColor(QString(payload)).toRgb());
+        device->setStateValue(effectColorStateTypeId, QVariant::fromValue(payload));
+    }else if (resource.url().path() == "/a/effect") {
+        int effectmode  =  payload.toInt();
+        QString effectModeString;
+
+        switch (effectmode) {
+           case 0:
+                effectModeString == "Off";
+                break;
+            case 1:
+                 effectModeString == "Color On";
+                 break;
+            case 2:
+                 effectModeString == "Color Wave";
+                 break;
+            case 3:
+                 effectModeString == "Color Fade";
+                 break;
+            case 4:
+                 effectModeString == "Color Flash";
+                 break;
+            case 5:
+                 effectModeString == "Rainbow Wave";
+                 break;
+            case 6:
+                 effectModeString == "Rainbow Flash";
+                 break;
+            case 7:
+                 effectModeString == "Knight Rider";
+                 break;
+            case 8:
+                 effectModeString == "Fire";
+                 break;
+            case 9:
+                 effectModeString == "Tricolore";
+                 break;
+            default:
+                effectModeString == "Off";
+        }
+
+
+        device->setStateValue(effectModeStateTypeId, effectModeString);
+    }else if (resource.url().path() == "/a/brightness") {
+        device->setStateValue(effectColorStateTypeId, payload.toInt());
+    }else if (resource.url().path() == "/a/speed") {
+        device->setStateValue(effectColorStateTypeId, payload.toInt());
     }else if (resource.url().path() == "/p/maxpix") {
         device->setStateValue(maxPixStateTypeId, payload.toInt());
     }

plugins/deviceplugins/ws2812/devicepluginws2812.h

@@ -26,6 +26,7 @@
 #include "types/action.h"
 #include "coap/coap.h"
 
+#include <QColor>
 #include <QHash>
 
 class DevicePluginWs2812 : public DevicePlugin
@@ -49,6 +50,7 @@ public:
     DeviceManager::DeviceError executeAction(Device *device, const Action &action) override;
 
 private:
+
     QPointer<Coap> m_coap;
     QHash<QNetworkReply *, DeviceClassId> m_asyncNodeScans;
     QHash<CoapReply *, Device *> m_enableNotification;
@@ -63,6 +65,9 @@ private:
     QHash<CoapReply *, Action> m_setColor;
     QHash<CoapReply *, Action> m_setEffect;
     QHash<CoapReply *, Action> m_setPix;
+    QHash<CoapReply *, Action> m_setBrightness;
+    QHash<CoapReply *, Action> m_setSpeed;
+    QHash<CoapReply *, Action> m_setTColor;
 
     void pingDevice(Device *device);
 
@@ -70,6 +75,7 @@ private:
     void updateColor(Device *device);
     void updateEffect(Device *device);
     void updateMaxPix(Device *device);
+    void updateTricolore(Device *device);
 
     void enableNotifications(Device *device);
 
@@ -78,6 +84,10 @@ private:
     bool deviceAlreadyAdded(const QHostAddress &address);
     Device *findDevice(const QHostAddress &address);
 
+    QColor tColor1;
+    QColor tColor2;
+    QColor tColor3;
+
 private slots:
     void coapReplyFinished(CoapReply *reply);
     void onNotificationReceived(const CoapObserveResource &resource, const int &notificationNumber, const QByteArray &payload);

plugins/deviceplugins/ws2812/devicepluginws2812.json

@@ -14,10 +14,10 @@
         {
             "name": "guh",
             "idName": "guh",
-            "id": "419435fa-58bf-4ba0-b6f5-156ce081bb68",
+            "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6",
             "deviceClasses": [
                 {
-                    "deviceClassId": "3242db46-5c6f-42d6-9001-753150763385",
+                    "deviceClassId": "3142db46-5c6f-42d6-9001-753150763385",
                     "name": "WS2812",
                     "idName": "ws2812",
                     "createMethods": ["discovery"],
@@ -57,41 +57,83 @@
                             "writable": true
 
                         },
+                        {
+                            "id": "01da8dbc-1ac8-4d18-bc17-fc4b4c591693",
+                            "idName": "brightness",
+                            "name": "brightness",
+                            "type": "int",
+                            "unit": "Percentage",
+                            "defaultValue": 0,
+                            "minValue": 0,
+                            "maxValue": 100,
+                            "writable": true
+                        },
                         {
                             "id": "ac372b72-c2ae-4f0f-9fca-bd7cf654603a",
                             "idName": "maxPix",
                             "name": "leds",
                             "type": "int",
-                            "unit": "None",
+                            "defaultValue": 240,
-                            "defaultValue": 0,
                             "minValue": 0,
                             "maxValue": 240,
                             "writable": true
-                        }
+                        },
-                    ],
+                        {
-                    "actionTypes": [
+                            "id": "e53ae524-ca10-49c5-b530-e414779ecc1d",
+                            "idName": "speed",
+                            "name": "speed",
+                            "type": "int",
+                            "defaultValue": 60,
+                            "minValue": 60,
+                            "maxValue": 240,
+                            "writable": true
+                        },
                         {
                             "id": "f4fe5d31-1edb-4944-9ddb-c89e7da8bee7",
                             "idName": "effectMode",
-                            "name": "set effect mode",
+                            "name": "effect mode",
-                            "paramTypes": [
+                            "type": "QString",
-                                {
+                            "writable": true,
-                                    "name": "effect",
+                            "possibleValues": [
-                                    "type": "QString",
+                                "Off",
-                                    "allowedValues": [
+                                "Color On",
-                                        "Off",
+                                "Color Wave",
-                                        "Color On",
+                                "Color Fade",
-                                        "Color Wave",
+                                "Color Flash",
-                                        "Color Fade",
+                                "Rainbow Wave",
-                                        "Color Flash",
+                                "Rainbow Flash",
-                                        "Rainbow Wave",
+                                "Knight Rider",
-                                        "Rainbow Flash",
+                                "Fire",
-                                        "Knight Rider",
+                                "Tricolore"
-                                        "Fire"
+                            ],
-                                    ],
+                            "defaultValue": "Off"
-                                    "defaultValue": "Off"
+                        },
-                                }
+                        {
-                            ]
+                            "id": "8fe2e42a-7b9d-4c76-ae77-355759c81350",
+                            "name": "tricolore color 1",
+                            "idName": "tcolor1",
+                            "type": "QColor",
+                            "defaultValue": "#000000",
+                            "writable": true
+
+                        },
+                        {
+                            "id": "dd4ad65b-007a-4eae-8ce0-b76d6cbf093e",
+                            "name": "tricolore color 2",
+                            "idName": "tcolor2",
+                            "type": "QColor",
+                            "defaultValue": "#000000",
+                            "writable": true
+
+                        },
+                        {
+                            "id": "97c83be0-7ba7-4758-b52b-d997a80bfbe5",
+                            "name": "tricolore color 3",
+                            "idName": "tcolor3",
+                            "type": "QColor",
+                            "defaultValue": "#000000",
+                            "writable": true
+
                         }
                     ]
                 }

tests/auto/timemanager/testtimemanager.cpp

@@ -427,8 +427,6 @@ void TestTimeManager::testCalendarDateTime()
     GuhCore::instance()->timeManager()->setTime(dateTime.addSecs((duration + 1) * 60));
     verifyRuleNotExecuted();
 
-    cleanupMockHistory();
-
     // REMOVE rule
     QVariantMap removeParams;
     removeParams.insert("ruleId", ruleId);
@@ -533,9 +531,9 @@ void TestTimeManager::testCalendarItemDaily_data()
     QTest::addColumn<QString>("time");
     QTest::addColumn<int>("duration");
 
+    QTest::newRow("daily - always") << createTimeDescriptorCalendar(createCalendarItem("08:00", 1440)) << "08:00" << 1440;
     QTest::newRow("daily") << createTimeDescriptorCalendar(createCalendarItem("06:55", 10, repeatingOptionDaily)) << "06:55" << 10;
     QTest::newRow("daily - jump date") << createTimeDescriptorCalendar(createCalendarItem("23:55", 10, repeatingOptionDaily)) << "23:55" << 10;
-    QTest::newRow("daily - always") << createTimeDescriptorCalendar(createCalendarItem("08:00", 1440)) << "08:00" << 1440;
 }
 
 void TestTimeManager::testCalendarItemDaily()
@@ -604,6 +602,7 @@ void TestTimeManager::testCalendarItemDaily()
             future = future.addDays(1);
         }
     }
+
     cleanupMockHistory();
 
     // REMOVE rule