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

Merge PR #55: Fix a crash if the controller takes too long to start

pull/58/head
jenkins 2022-06-30 15:03:57 +02:00
parent 69d1709358 e9d594ee5b
commit 2883080413
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-zigbee/backends/ti/zigbeebridgecontrollerti.cpp
View File

@ -77,7 +77,7 @@ ZigbeeInterfaceTiReply* ZigbeeBridgeControllerTi::reset()
ZigbeeInterfaceTiReply *ZigbeeBridgeControllerTi::init() ZigbeeInterfaceTiReply *ZigbeeBridgeControllerTi::init()
{ {
ZigbeeInterfaceTiReply *initReply = new ZigbeeInterfaceTiReply(this, 10000); ZigbeeInterfaceTiReply *initReply = new ZigbeeInterfaceTiReply(this, 15000);
ZigbeeInterfaceTiReply *resetReply = reset(); ZigbeeInterfaceTiReply *resetReply = reset();
connect(resetReply, &ZigbeeInterfaceTiReply::finished, initReply, [=]() { connect(resetReply, &ZigbeeInterfaceTiReply::finished, initReply, [=]() {
@ -179,10 +179,10 @@ void ZigbeeBridgeControllerTi::initPhase2(ZigbeeInterfaceTiReply *initReply, int
qCDebug(dcZigbeeController()) << "Reading IEEE address"; qCDebug(dcZigbeeController()) << "Reading IEEE address";
ZigbeeInterfaceTiReply *getIeeeAddrReply = readNvItem(Ti::NvItemIdPanId); ZigbeeInterfaceTiReply *getIeeeAddrReply = readNvItem(Ti::NvItemIdPanId);
connect(getIeeeAddrReply, &ZigbeeInterfaceTiReply::finished, this, [=](){ connect(getIeeeAddrReply, &ZigbeeInterfaceTiReply::finished, initReply, [=](){
ZigbeeInterfaceTiReply *getExtAddrReply = sendCommand(Ti::SubSystemSys, Ti::SYSCommandGetExtAddress); ZigbeeInterfaceTiReply *getExtAddrReply = sendCommand(Ti::SubSystemSys, Ti::SYSCommandGetExtAddress);
connect(getExtAddrReply, &ZigbeeInterfaceTiReply::finished, this, [=](){ connect(getExtAddrReply, &ZigbeeInterfaceTiReply::finished, initReply, [=](){
if (getExtAddrReply->statusCode() != Ti::StatusCodeSuccess) { if (getExtAddrReply->statusCode() != Ti::StatusCodeSuccess) {
qCWarning(dcZigbeeController()) << "Call to getDeviceInfo failed:" << getExtAddrReply->statusCode(); qCWarning(dcZigbeeController()) << "Call to getDeviceInfo failed:" << getExtAddrReply->statusCode();
initReply->finish(getExtAddrReply->statusCode()); initReply->finish(getExtAddrReply->statusCode());