From 24fab3a633f14be41f29594bd68140f8cabdfd6d Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 18 Dec 2018 01:06:41 +0100
Subject: [PATCH] Sumulation: Fix action simulation for simulated blinds

---
 simulation/devicepluginsimulation.cpp  | 14 ++++++++++++--
 simulation/devicepluginsimulation.json |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/simulation/devicepluginsimulation.cpp b/simulation/devicepluginsimulation.cpp
index f18c70ab..bd20447b 100644
--- a/simulation/devicepluginsimulation.cpp
+++ b/simulation/devicepluginsimulation.cpp
@@ -57,6 +57,7 @@ DeviceManager::DeviceSetupStatus DevicePluginSimulation::setupDevice(Device *dev
     qCDebug(dcSimulation()) << "Set up device" << device->name();
     if (device->deviceClassId() == garageGateDeviceClassId ||
             device->deviceClassId() == extendedAwningDeviceClassId ||
+            device->deviceClassId() == extendedBlindDeviceClassId ||
             device->deviceClassId() == rollerShutterDeviceClassId ||
             device->deviceClassId() == fingerPrintSensorDeviceClassId) {
         m_simulationTimers.insert(device, new QTimer(device));
@@ -419,14 +420,14 @@ DeviceManager::DeviceError DevicePluginSimulation::executeAction(Device *device,
     if (device->deviceClassId() == extendedBlindDeviceClassId) {
         if (action.actionTypeId() == extendedBlindOpenActionTypeId) {
             qCDebug(dcSimulation()) << "Opening extended blind";
-            m_simulationTimers.value(device)->setProperty("targetValue", 100);
+            m_simulationTimers.value(device)->setProperty("targetValue", 0);
             m_simulationTimers.value(device)->start(500);
             device->setStateValue(extendedBlindMovingStateTypeId, true);
             return DeviceManager::DeviceErrorNoError;
         }
         if (action.actionTypeId() == extendedBlindCloseActionTypeId) {
             qCDebug(dcSimulation()) << "Closing extended blind";
-            m_simulationTimers.value(device)->setProperty("targetValue", 0);
+            m_simulationTimers.value(device)->setProperty("targetValue", 100);
             m_simulationTimers.value(device)->start(500);
             device->setStateValue(extendedBlindMovingStateTypeId, true);
             return DeviceManager::DeviceErrorNoError;
@@ -631,6 +632,15 @@ void DevicePluginSimulation::simulationTimerTimeout()
             t->stop();
             device->setStateValue(extendedAwningMovingStateTypeId, false);
         }
+    } else if (device->deviceClassId() == extendedBlindDeviceClassId) {
+        int currentValue = device->stateValue(extendedBlindPercentageStateTypeId).toInt();
+        int targetValue = t->property("targetValue").toInt();
+        int newValue = targetValue > currentValue ? qMin(targetValue, currentValue + 5) : qMax(targetValue, currentValue - 5);
+        device->setStateValue(extendedBlindPercentageStateTypeId, newValue);
+        if (newValue == targetValue) {
+            t->stop();
+            device->setStateValue(extendedBlindMovingStateTypeId, false);
+        }
     } else if (device->deviceClassId() == rollerShutterDeviceClassId) {
         int currentValue = device->stateValue(rollerShutterPercentageStateTypeId).toInt();
         int targetValue = t->property("targetValue").toInt();
diff --git a/simulation/devicepluginsimulation.json b/simulation/devicepluginsimulation.json
index 2122dfde..8c5fe53d 100644
--- a/simulation/devicepluginsimulation.json
+++ b/simulation/devicepluginsimulation.json
@@ -365,7 +365,7 @@
                             "name": "moving",
                             "type": "bool",
                             "defaultValue": false,
-                            "displayName": "mooving",
+                            "displayName": "moving",
                             "displayNameEvent": "moving changed"
                         }
                     ],