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

improved device detection

Browse Source
This commit is contained in:
Bernhard Trinnes 2018-06-12 15:45:21 +02:00 committed by Michael Zanetti
parent c8c730fe00
commit f96b2ab3c8
1 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
unipi/devicepluginunipi.cpp
View File

@ -498,49 +498,67 @@ void DevicePluginUniPi::onWebSocketTextMessageReceived(QString message)
} }
if (obj["dev"] == "relay") { if (obj["dev"] == "relay") {
qCDebug(dcUniPi()) << "Relay:" << obj["dev"].toString() << "Circuit:" << obj["circuit"].toString() << "Value:" << obj["value"].toInt() << "Relay Type:" << obj["relay_type"].toInt() ; qCDebug(dcUniPi()) << "Relay:" << obj["dev"].toString() << "Circuit:" << obj["circuit"].toString() << "Value:" << obj["value"].toInt() << "Relay Type:" << obj["relay_type"].toString() ;
QString circuit = obj["circuit"].toString(); QString circuit = obj["circuit"].toString();
bool value = QVariant(obj["value"].toInt()).toBool(); bool value = QVariant(obj["value"].toInt()).toBool();
if (!m_relais.contains(circuit)) { if (obj["relay_type"].toString() == "physical") {
//New Device detected
m_relais.append(circuit);
} else {
foreach (Device *device, myDevices()) { if (!m_relais.contains(circuit)) {
if (device->deviceClassId() == relayOutputDeviceClassId) { //New Device detected
if (circuit == device->paramValue(relayOutputRelayNumberParamTypeId).toString()) { m_relais.append(circuit);
device->setStateValue(relayOutputRelayStatusStateTypeId, value); } else {
break;
} foreach (Device *device, myDevices()) {
} else if (device->deviceClassId() == shutterDeviceClassId) { if (device->deviceClassId() == relayOutputDeviceClassId) {
if (circuit == device->paramValue(shutterOutputOpenParamTypeId).toString()) { if (circuit == device->paramValue(relayOutputRelayNumberParamTypeId).toString()) {
if (value && device->stateValue(shutterStatusStateTypeId).toString().contains("stop")) { device->setStateValue(relayOutputRelayStatusStateTypeId, value);
device->setStateValue(shutterStatusStateTypeId, "open"); break;
} else if (!value && device->stateValue(shutterStatusStateTypeId).toString().contains("open")) { }
device->setStateValue(shutterStatusStateTypeId, "stop"); } else if (device->deviceClassId() == shutterDeviceClassId) {
} else { if (circuit == device->paramValue(shutterOutputOpenParamTypeId).toString()) {
qWarning(dcUniPi()) << "shutter" << device << "Output open:" << value << "Status: " << device->stateValue(shutterStatusStateTypeId).toString(); if (value && device->stateValue(shutterStatusStateTypeId).toString().contains("stop")) {
device->setStateValue(shutterStatusStateTypeId, "open");
} else if (!value && device->stateValue(shutterStatusStateTypeId).toString().contains("open")) {
device->setStateValue(shutterStatusStateTypeId, "stop");
} else {
qWarning(dcUniPi()) << "shutter" << device << "Output open:" << value << "Status: " << device->stateValue(shutterStatusStateTypeId).toString();
}
break;
}
if (circuit == device->paramValue(shutterOutputCloseParamTypeId).toString()) {
if (value && device->stateValue(shutterStatusStateTypeId).toString().contains("stop")) {
device->setStateValue(shutterStatusStateTypeId, "close");
} else if (!value && device->stateValue(shutterStatusStateTypeId).toString().contains("close")) {
device->setStateValue(shutterStatusStateTypeId, "stop");
} else {
qWarning(dcUniPi()) << "shutter" << device << "Output close:" << value << "Status: " << device->stateValue(shutterStatusStateTypeId).toString();
}
break;
} }
break; } else if (device->deviceClassId() == lightDeviceClassId) {
} if (circuit == device->paramValue(lightOutputParamTypeId).toString()) {
if (circuit == device->paramValue(shutterOutputCloseParamTypeId).toString()) { device->setStateValue(lightPowerStateTypeId, value);
if (value && device->stateValue(shutterStatusStateTypeId).toString().contains("stop")) { break;
device->setStateValue(shutterStatusStateTypeId, "close");
} else if (!value && device->stateValue(shutterStatusStateTypeId).toString().contains("close")) {
device->setStateValue(shutterStatusStateTypeId, "stop");
} else {
qWarning(dcUniPi()) << "shutter" << device << "Output close:" << value << "Status: " << device->stateValue(shutterStatusStateTypeId).toString();
} }
break;
} }
}
}
} else if (obj["relay_type"].toString() == "digtial") {
if (!m_digitalOutputs.contains(obj["circuit"].toString())){
//New Device detected
m_digitalOutputs.append(obj["circuit"].toString());
} else {
} else if (device->deviceClassId() == lightDeviceClassId) { foreach (Device *device, myDevices()) {
if (circuit == device->paramValue(lightOutputParamTypeId).toString()) { if (device->deviceClassId() == digitalOutputDeviceClassId) {
device->setStateValue(lightPowerStateTypeId, value); if (obj["circuit"] == device->paramValue(digitalOutputDigitalOutputNumberParamTypeId).toString()) {
break; device->setStateValue(digitalOutputDigitalOutputStatusStateTypeId, QVariant(obj["value"].toInt()).toBool());
break;
}
} }
} }
} }