From: greg <greg>
Date: Tue, 27 May 2008 13:51:51 +0000 (+0000)
Subject: fix bug in exit function
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/CanFestival-3.git/commitdiff_plain/2fcb3805d821a0624e54892802a654335be768d1

fix bug in exit function
(add test to check if it is a master)
---

diff --git a/examples/TestMasterMicroMod/TestMasterMicroMod.c b/examples/TestMasterMicroMod/TestMasterMicroMod.c
index 3553992..1d7e297 100644
--- a/examples/TestMasterMicroMod/TestMasterMicroMod.c
+++ b/examples/TestMasterMicroMod/TestMasterMicroMod.c
@@ -395,10 +395,12 @@ void InitNodes(CO_Data* d, UNS32 id)
 /***************************  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 --git a/examples/TestMasterSlave/TestMasterSlave.c b/examples/TestMasterSlave/TestMasterSlave.c
index 021e39a..c8236d4 100644
--- a/examples/TestMasterSlave/TestMasterSlave.c
+++ b/examples/TestMasterSlave/TestMasterSlave.c
@@ -116,10 +116,13 @@ void InitNodes(CO_Data* d, UNS32 id)
 /***************************  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 --git a/examples/TestMasterSlaveLSS/TestMasterSlaveLSS.c b/examples/TestMasterSlaveLSS/TestMasterSlaveLSS.c
index fa8136f..ec21d33 100644
--- a/examples/TestMasterSlaveLSS/TestMasterSlaveLSS.c
+++ b/examples/TestMasterSlaveLSS/TestMasterSlaveLSS.c
@@ -125,6 +125,7 @@ void InitNodes(CO_Data* d, UNS32 id)
 /***************************  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 @@ void Exit(CO_Data* d, UNS32 id)
 
 	// Stop master
 	setState(&TestMaster_Data, Stopped);
-
+	}
 }
 
 /****************************************************************************/