ETM-Schurig
/
nymea-zigbee
mirror of https://github.com/nymea/nymea-zigbee
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reenable default response

pull/6/head
Simon Stürz 2020-03-27 13:48:18 +01:00
parent 8d42cdb195
commit f9e0308618
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libnymea-zigbee/nxp/zigbeebridgecontrollernxp.cpp
View File

@ -555,6 +555,7 @@ ZigbeeInterfaceReply *ZigbeeBridgeControllerNxp::commandOnOffNoEffects(quint8 ad
stream << static_cast<quint8>(command);
ZigbeeInterfaceRequest request(ZigbeeInterfaceMessage(Zigbee::MessageTypeCluserOnOff, data));
request.setExpectedAdditionalMessageType(Zigbee::InterfaceMessageType::MessageTypeDefaultResponse);
request.setDescription("Send on/off cluster command");
request.setTimoutIntervall(5000);
@ -592,7 +593,7 @@ ZigbeeInterfaceReply *ZigbeeBridgeControllerNxp::commandMoveToLevel(quint8 addre
stream << transitionTime;
ZigbeeInterfaceRequest request(ZigbeeInterfaceMessage(Zigbee::MessageTypeMoveToLevelOnOff, data));
//request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setDescription(QString("Move to level on/off %1").arg(level));
request.setTimoutIntervall(5000);
@ -611,7 +612,7 @@ ZigbeeInterfaceReply *ZigbeeBridgeControllerNxp::commandMoveToColourTemperature(
stream << transitionTime;
ZigbeeInterfaceRequest request(ZigbeeInterfaceMessage(Zigbee::MessageTypeMoveToColorTemperature, data));
//request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setDescription(QString("Move to colour temperature %1").arg(colourTemperature));
request.setTimoutIntervall(5000);
@ -630,7 +631,7 @@ ZigbeeInterfaceReply *ZigbeeBridgeControllerNxp::commandMoveToColor(quint8 addre
stream << transitionTime;
ZigbeeInterfaceRequest request(ZigbeeInterfaceMessage(Zigbee::MessageTypeMoveToColor, data));
//request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setDescription(QString("Move to colour %1, %2").arg(x).arg(y));
request.setTimoutIntervall(5000);
@ -649,7 +650,7 @@ ZigbeeInterfaceReply *ZigbeeBridgeControllerNxp::commandMoveToHueSaturation(quin
stream << transitionTime;
ZigbeeInterfaceRequest request(ZigbeeInterfaceMessage(Zigbee::MessageTypeMoveToHueSaturation, data));
//request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setDescription(QString("Move to hue %1 saturation %2").arg(hue).arg(saturation));
request.setTimoutIntervall(5000);
@ -668,7 +669,7 @@ ZigbeeInterfaceReply *ZigbeeBridgeControllerNxp::commandMoveToHue(quint8 address
stream << transitionTime;
ZigbeeInterfaceRequest request(ZigbeeInterfaceMessage(Zigbee::MessageTypeMoveToHue, data));
//request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setDescription(QString("Move to hue %1").arg(hue));
request.setTimoutIntervall(5000);
@ -687,7 +688,7 @@ ZigbeeInterfaceReply *ZigbeeBridgeControllerNxp::commandMoveToSaturation(quint8
stream << transitionTime;
ZigbeeInterfaceRequest request(ZigbeeInterfaceMessage(Zigbee::MessageTypeMoveToSaturation, data));
//request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setExpectedAdditionalMessageType(Zigbee::MessageTypeDefaultResponse);
request.setDescription(QString("Move to saturation %1").arg(saturation));
request.setTimoutIntervall(5000);

16
libnymea-zigbee/nxp/zigbeenodeendpointnxp.cpp
View File

@ -84,6 +84,8 @@ ZigbeeNetworkReply *ZigbeeNodeEndpointNxp::configureReporting(ZigbeeCluster *clu
return;
}
// Fixme: read configure response
qCDebug(dcZigbeeController()) << reply->request().description() << "finished successfully";
finishNetworkReply(networkReply);
});
@ -126,6 +128,8 @@ ZigbeeNetworkReply *ZigbeeNodeEndpointNxp::factoryReset()
return;
}
// Fixme: read default response
qCDebug(dcZigbeeController()) << reply->request().description() << "finished successfully";
finishNetworkReply(networkReply);
});
@ -234,6 +238,8 @@ ZigbeeNetworkReply *ZigbeeNodeEndpointNxp::sendLevelCommand(ZigbeeCluster::Level
return;
}
// Fixme: read default response
qCDebug(dcZigbeeController()) << reply->request().description() << "finished successfully";
finishNetworkReply(networkReply);
});
@ -255,6 +261,8 @@ ZigbeeNetworkReply *ZigbeeNodeEndpointNxp::sendMoveToColorTemperature(quint16 co
return;
}
// Fixme: read default response
qCDebug(dcZigbeeController()) << reply->request().description() << "finished successfully";
finishNetworkReply(networkReply);
});
@ -280,6 +288,8 @@ ZigbeeNetworkReply *ZigbeeNodeEndpointNxp::sendMoveToColor(double x, double y, q
return;
}
// Fixme: read default response
qCDebug(dcZigbeeController()) << reply->request().description() << "finished successfully";
finishNetworkReply(networkReply);
});
@ -301,6 +311,8 @@ ZigbeeNetworkReply *ZigbeeNodeEndpointNxp::sendMoveToHueSaturation(quint8 hue, q
return;
}
// Fixme: read default response
qCDebug(dcZigbeeController()) << reply->request().description() << "finished successfully";
finishNetworkReply(networkReply);
});
@ -322,6 +334,8 @@ ZigbeeNetworkReply *ZigbeeNodeEndpointNxp::sendMoveToHue(quint8 hue, quint16 tra
return;
}
// Fixme: read default response
qCDebug(dcZigbeeController()) << reply->request().description() << "finished successfully";
finishNetworkReply(networkReply);
});
@ -343,6 +357,8 @@ ZigbeeNetworkReply *ZigbeeNodeEndpointNxp::sendMoveToSaturation(quint8 saturatio
return;
}
// Fixme: read default response
qCDebug(dcZigbeeController()) << reply->request().description() << "finished successfully";
finishNetworkReply(networkReply);
});

5
libnymea-zigbee/zigbeenodeendpoint.cpp
View File

@ -157,7 +157,10 @@ void ZigbeeNodeEndpoint::addOutputCluster(ZigbeeCluster *cluster)
ZigbeeNetworkReply *ZigbeeNodeEndpoint::createNetworkReply()
{
return new ZigbeeNetworkReply(this);
ZigbeeNetworkReply *reply = new ZigbeeNetworkReply(this);
// Make sure the reply will be deleted
connect(reply, &ZigbeeNetworkReply::finished, reply, &ZigbeeNetworkReply::deleteLater);
return reply;
}
void ZigbeeNodeEndpoint::finishNetworkReply(ZigbeeNetworkReply *reply, ZigbeeNetworkReply::Error error, Zigbee::ZigbeeStatus zigbeeStatus)