ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sumulation: Fix action simulation for simulated blinds

Browse Source
This commit is contained in:
Michael Zanetti 2018-12-18 01:06:41 +01:00
parent f811fe1722
commit 24fab3a633
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
simulation/devicepluginsimulation.cpp
View File

@ -57,6 +57,7 @@ DeviceManager::DeviceSetupStatus DevicePluginSimulation::setupDevice(Device *dev
qCDebug(dcSimulation()) << "Set up device" << device->name(); qCDebug(dcSimulation()) << "Set up device" << device->name();
if (device->deviceClassId() == garageGateDeviceClassId || if (device->deviceClassId() == garageGateDeviceClassId ||
device->deviceClassId() == extendedAwningDeviceClassId || device->deviceClassId() == extendedAwningDeviceClassId ||
device->deviceClassId() == extendedBlindDeviceClassId ||
device->deviceClassId() == rollerShutterDeviceClassId || device->deviceClassId() == rollerShutterDeviceClassId ||
device->deviceClassId() == fingerPrintSensorDeviceClassId) { device->deviceClassId() == fingerPrintSensorDeviceClassId) {
m_simulationTimers.insert(device, new QTimer(device)); m_simulationTimers.insert(device, new QTimer(device));
@ -419,14 +420,14 @@ DeviceManager::DeviceError DevicePluginSimulation::executeAction(Device *device,
if (device->deviceClassId() == extendedBlindDeviceClassId) { if (device->deviceClassId() == extendedBlindDeviceClassId) {
if (action.actionTypeId() == extendedBlindOpenActionTypeId) { if (action.actionTypeId() == extendedBlindOpenActionTypeId) {
qCDebug(dcSimulation()) << "Opening extended blind"; 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); m_simulationTimers.value(device)->start(500);
device->setStateValue(extendedBlindMovingStateTypeId, true); device->setStateValue(extendedBlindMovingStateTypeId, true);
return DeviceManager::DeviceErrorNoError; return DeviceManager::DeviceErrorNoError;
} }
if (action.actionTypeId() == extendedBlindCloseActionTypeId) { if (action.actionTypeId() == extendedBlindCloseActionTypeId) {
qCDebug(dcSimulation()) << "Closing extended blind"; 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); m_simulationTimers.value(device)->start(500);
device->setStateValue(extendedBlindMovingStateTypeId, true); device->setStateValue(extendedBlindMovingStateTypeId, true);
return DeviceManager::DeviceErrorNoError; return DeviceManager::DeviceErrorNoError;
@ -631,6 +632,15 @@ void DevicePluginSimulation::simulationTimerTimeout()
t->stop(); t->stop();
device->setStateValue(extendedAwningMovingStateTypeId, false); 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) { } else if (device->deviceClassId() == rollerShutterDeviceClassId) {
int currentValue = device->stateValue(rollerShutterPercentageStateTypeId).toInt(); int currentValue = device->stateValue(rollerShutterPercentageStateTypeId).toInt();
int targetValue = t->property("targetValue").toInt(); int targetValue = t->property("targetValue").toInt();

2
simulation/devicepluginsimulation.json
View File

@ -365,7 +365,7 @@
"name": "moving", "name": "moving",
"type": "bool", "type": "bool",
"defaultValue": false, "defaultValue": false,
"displayName": "mooving", "displayName": "moving",
"displayNameEvent": "moving changed" "displayNameEvent": "moving changed"
} }
], ],