Mercurial Mercurial > canfestival / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
examples/TestMasterSlave/TestMasterSlave.c
changeset 172 0248c2b148bb
parent 169 90c0a676e631
child 179 763b6d32c1a6 
--- a/examples/TestMasterSlave/TestMasterSlave.c	Thu Apr 19 09:54:34 2007 +0200
+++ b/examples/TestMasterSlave/TestMasterSlave.c	Tue Apr 24 13:26:03 2007 +0200
@@ -191,7 +191,6 @@
 	if(strcmp( SlaveBoard.baudrate, "none")){
 		
 		TestSlave_Data.heartbeatError = TestSlave_heartbeatError;
-		TestSlave_Data.SDOtimeoutError = TestSlave_SDOtimeoutError;
 		TestSlave_Data.initialisation = TestSlave_initialisation;
 		TestSlave_Data.preOperational = TestSlave_preOperational;
 		TestSlave_Data.operational = TestSlave_operational;
@@ -209,7 +208,6 @@
 	if(strcmp( MasterBoard.baudrate, "none")){
 		
 		TestMaster_Data.heartbeatError = TestMaster_heartbeatError;
-		TestMaster_Data.SDOtimeoutError = TestMaster_SDOtimeoutError;
 		TestMaster_Data.initialisation = TestMaster_initialisation;
 		TestMaster_Data.preOperational = TestMaster_preOperational;
 		TestMaster_Data.operational = TestMaster_operational;
@@ -234,9 +232,9 @@
 	StopTimerLoop();
 	
 	// Close CAN devices (and can threads)
-	if(SlaveBoard.baudrate) canClose(&TestSlave_Data);
+	if(strcmp( SlaveBoard.baudrate, "none")) canClose(&TestSlave_Data);
 fail_master:
-	if(MasterBoard.baudrate) canClose(&TestMaster_Data);	
+	if(strcmp( MasterBoard.baudrate, "none")) canClose(&TestMaster_Data);	
 fail_slave:
canfestival