# HG changeset patch # User greg # Date 1211896311 -7200 # Node ID 2ef560acfa8625cad8c85ed12fc1cd83eb678738 # Parent 7d3637f763bef83b780da6b28ced67e8e8e4f23f fix bug in exit function (add test to check if it is a master) diff -r 7d3637f763be -r 2ef560acfa86 examples/TestMasterMicroMod/TestMasterMicroMod.c --- a/examples/TestMasterMicroMod/TestMasterMicroMod.c Fri May 09 10:25:45 2008 +0200 +++ b/examples/TestMasterMicroMod/TestMasterMicroMod.c Tue May 27 15:51:51 2008 +0200 @@ -395,10 +395,12 @@ /*************************** EXIT *****************************************/ void Exit(CO_Data* d, UNS32 id) { - masterSendNMTstateChange(&TestMaster_Data, 0x02, NMT_Reset_Node); + if(strcmp(MasterBoard.baudrate, "none")){ + masterSendNMTstateChange(&TestMaster_Data, 0x02, NMT_Reset_Node); - //Stop master - setState(&TestMaster_Data, Stopped); + //Stop master + setState(&TestMaster_Data, Stopped); + } } /****************************************************************************/ /*************************** MAIN *****************************************/ diff -r 7d3637f763be -r 2ef560acfa86 examples/TestMasterSlave/TestMasterSlave.c --- a/examples/TestMasterSlave/TestMasterSlave.c Fri May 09 10:25:45 2008 +0200 +++ b/examples/TestMasterSlave/TestMasterSlave.c Tue May 27 15:51:51 2008 +0200 @@ -116,10 +116,13 @@ /*************************** EXIT *****************************************/ void Exit(CO_Data* d, UNS32 id) { - masterSendNMTstateChange(&TestMaster_Data, 0x02, NMT_Reset_Node); + if(strcmp(MasterBoard.baudrate, "none")){ + + masterSendNMTstateChange(&TestMaster_Data, 0x02, NMT_Reset_Node); - //Stop master - setState(&TestMaster_Data, Stopped); + //Stop master + setState(&TestMaster_Data, Stopped); + } } /****************************************************************************/ diff -r 7d3637f763be -r 2ef560acfa86 examples/TestMasterSlaveLSS/TestMasterSlaveLSS.c --- a/examples/TestMasterSlaveLSS/TestMasterSlaveLSS.c Fri May 09 10:25:45 2008 +0200 +++ b/examples/TestMasterSlaveLSS/TestMasterSlaveLSS.c Tue May 27 15:51:51 2008 +0200 @@ -125,6 +125,7 @@ /*************************** EXIT *****************************************/ void Exit(CO_Data* d, UNS32 id) { + if(strcmp(MasterBoard.baudrate, "none")){ eprintf("Finishing.\n"); masterSendNMTstateChange (&TestMaster_Data, 0x00, NMT_Stop_Node); @@ -132,7 +133,7 @@ // Stop master setState(&TestMaster_Data, Stopped); - + } } /****************************************************************************/