Changeset 925 for trunk/MagicSoft/Cosy/candrv

Timestamp:

09/07/01 12:44:16 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• canopen.h (modified) ( previous)
• nodedrv.cc (modified) (2 diffs)
• nodedrv.h (modified) (1 diff)

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -47 +47 @@
 void NodeDrv::HandleSDOError(LWORD_t data)
 {
-    lout << "Err: 0x";
-    lout << hex << setfill('0') << setw(4) << data;
-    lout << endl;;
+    lout << "Nodedrv: SDO Error: Entry not found in deictionary (data=0x";
+    lout << hex << setfill('0') << setw(4) << data << ")";
+    lout << endl;
 }
 
@@ -125 +125 @@
 }
 
-void NodeDrv::WaitForSdo(WORD_t idx, BYTE_t subidx, WORD_t timeout)
+void NodeDrv::WaitForSdo(WORD_t idx, BYTE_t subidx, WORDS_t timeout)
 {
     fNetwork->WaitForSdo(fId, idx, subidx, timeout);

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -65 +65 @@
 
     // void WaitForSdos();
-    void WaitForSdo(WORD_t idx, BYTE_t subidx=0, WORD_t timeout=500);
+    void WaitForSdo(WORD_t idx, BYTE_t subidx=0, WORDS_t timeout=500);
 
     void EnableCanMsg(BYTE_t fcode);