# HG changeset patch # User Edouard Tisserant # Date 1328315895 -3600 # Node ID d1ccff139c172ae2fb3471cb282241cdc0979ec2 # Parent e7a45c77d6ec7d667e608f7f38fc59adb95ac28e# Parent 4b64e17396afc577216321a5c8d7fc75f1c83e14 merge with CanFestival-3-asc diff -r e7a45c77d6ec -r d1ccff139c17 src/pdo.c --- a/src/pdo.c Sat Feb 04 01:33:16 2012 +0100 +++ b/src/pdo.c Sat Feb 04 01:38:15 2012 +0100 @@ -89,7 +89,7 @@ { MSG_ERR (0x1013, " Couldn't find mapped variable at index-subindex-size : ", - (UNS16) (*pMappingParameter)); + (UNS32) (*pMappingParameter)); return 0xFF; } /* copy bit per bit in little endian */ diff -r e7a45c77d6ec -r d1ccff139c17 src/sdo.c --- a/src/sdo.c Sat Feb 04 01:33:16 2012 +0100 +++ b/src/sdo.c Sat Feb 04 01:38:15 2012 +0100 @@ -1841,7 +1841,7 @@ CliNbr++; } /* end while */ if (!SDOfound) { - MSG_ERR(0x1AC9, "SDO. Error. No client found to communicate with node : ", nodeId); + MSG_WAR(0x1AC9, "SDO No preset client found to communicate with node : ", nodeId); return 0xFE; } MSG_WAR(0x3AD0," SDO client defined at index : ", 0x1280 + CliNbr);