LSS patch from Edward. Now, SetNodeId is not called from nmtslave anymore in case...

diff --git a/src/nmtSlave.c b/src/nmtSlave.c
index ac79788a76e1668a8166cf7b43018d2583616880..dd7210055fd5ef30c4fc45e584cae7c8337ca468 100644 (file)
--- a/src/nmtSlave.c
+++ b/src/nmtSlave.c
@@ -82,8 +82,10 @@ void proceedNMTstateChange(CO_Data* d, Message *m)
          if(d->NMT_Slave_Communications_Reset_Callback != NULL)
             d->NMT_Slave_Communications_Reset_Callback(d);
 #ifdef CO_ENABLE_LSS
-               if(getNodeId(d)!=d->lss_transfer.nodeID && getNodeId(d)>0 && getNodeId(d)<=127)
-                       setNodeId(d, d->lss_transfer.nodeID);
+         // LSS changes NodeId here in case lss_transfer.nodeID
+         // doesn't match current getNodeId()
+         if(newNodeId!=d->lss_transfer.nodeID && newNodeId>0 && newNodeId<=127 )
+            newNodeId = d->lss_transfer.nodeID;
 #endif
         setState(d,Initialisation);
         break;