Fixed example TestMasterSlaveLSS in Master.c missing argument in writeNetworkDictCallBack
authorMongo
Tue, 27 Mar 2012 15:16:26 +0200
changeset 717 cfb4f62f35af
parent 711 4b64e17396af
child 718 0b33d9cdbdeb
Fixed example TestMasterSlaveLSS in Master.c missing argument in writeNetworkDictCallBack
Fixed comments in sdo.c
examples/TestMasterSlaveLSS/Master.c
src/sdo.c
--- a/examples/TestMasterSlaveLSS/Master.c	Wed Feb 01 15:55:45 2012 +0100
+++ b/examples/TestMasterSlaveLSS/Master.c	Tue Mar 27 15:16:26 2012 +0200
@@ -41,7 +41,7 @@
 {
 	UNS32 PDO1_COBID = 0x0182; 
 	UNS32 PDO2_COBID = 0x0183;
-	UNS8 size = sizeof(UNS32); 
+	UNS32 size = sizeof(UNS32); 
 	
 	eprintf("TestMaster_initialisation\n");
 
@@ -78,7 +78,7 @@
 {
 	UNS32 abortCode;	
 	if(getWriteResultNetworkDict (d, nodeId, &abortCode) != SDO_FINISHED)
-		eprintf("Master : Failed in initializing slave %2.2x, step %d, AbortCode :%4.4x \n", nodeId, init_step, abortCode);
+		eprintf("Master : Failed in initializing slave %2.2x, AbortCode :%4.4x \n", nodeId, abortCode);
 
 	/* Finalise last SDO transfer with this node */
 	closeSDOtransfer(&TestMaster_Data, nodeId, SDO_CLIENT);
@@ -126,7 +126,8 @@
 					1, /*UNS8 count*/
 					0, /*UNS8 dataType*/
 					&Transmission_Type,/*void *data*/
-					CheckSDOAndContinue); /*SDOCallback_t Callback*/
+					CheckSDOAndContinue, /*SDOCallback_t Callback*/
+                    0); /*UNS8 useBlockMode*/
 					break;
 		case 2: /* Second step : Set the new heartbeat producer time in the slave */
 		{
@@ -141,7 +142,8 @@
 					2, /*UNS8 count*/
 					0, /*UNS8 dataType*/
 					&Slave_Prod_Heartbeat_T,/*void *data*/
-					CheckSDOAndContinue); /*SDOCallback_t Callback*/
+					CheckSDOAndContinue, /*SDOCallback_t Callback*/
+                    0); /*UNS8 useBlockMode*/
 					break;
 					
 			/* Set the new heartbeat consumer time in the master*/
--- a/src/sdo.c	Wed Feb 01 15:55:45 2012 +0100
+++ b/src/sdo.c	Tue Mar 27 15:16:26 2012 +0200
@@ -1992,6 +1992,7 @@
  ** @param count
  ** @param dataType
  ** @param data
+ ** @param useBlockMode
  **
  ** @return
  **/
@@ -2012,6 +2013,7 @@
  ** @param dataType
  ** @param data
  ** @param Callback
+ ** @param useBlockMode
  **
  ** @return
  **/
@@ -2079,6 +2081,7 @@
  ** @param subIndex
  ** @param dataType
  ** @param Callback
+ ** @param useBlockMode
  **
  ** @return
  **/
@@ -2156,6 +2159,7 @@
  ** @param index
  ** @param subIndex
  ** @param dataType
+ ** @param useBlockMode
  **
  ** @return
  **/
@@ -2173,6 +2177,7 @@
  ** @param subIndex
  ** @param dataType
  ** @param Callback
+ ** @param useBlockMode
  **
  ** @return
  **/