Changeset 8863 for trunk/MagicSoft/Cosy/candrv

Timestamp:

02/15/08 21:42:55 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• network.cc (modified) (1 diff)
• nodedrv.cc (modified) (1 diff)
• nodedrv.h (modified) (1 diff)

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -111 +111 @@
 
         case kSDO_TX_ERROR:  // error message (instead of 0x60)
-            fNodes[node]->HandleSDOError(data);
+            fNodes[node]->HandleSDOError(idx, subidx);
             return;
         }

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -167 +167 @@
 // Print an error message with the corresponding data from this device.
 //
-void NodeDrv::HandleSDOError(LWORD_t data)
-{
-    gLog << warn << "WARNING - Nodedrv::HandleSDOError: Entry not found in dictionary (data=0x";
-    gLog << hex << setfill('0') << setw(4) << data << ")";
+void NodeDrv::HandleSDOError(WORD_t idx, BYTE_t subidx)
+{
+    gLog << warn << "WARNING - Nodedrv::HandleSDOError: Node #" << dec << (int)fId << ": Entry not found in dictionary (idx=0x";
+    gLog << hex << setfill('0') << setw(4) << idx << "/" << (int)subidx << dec << ")";
     gLog << endl;
 }

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -67 +67 @@
     virtual void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, const timeval_t &tv);
     virtual void HandleSDOOK(WORD_t idx, BYTE_t subidx, LWORD_t data, const timeval_t &tv);
-    virtual void HandleSDOError(LWORD_t data);
+    virtual void HandleSDOError(WORD_t idx, BYTE_t subidx);
 
     virtual void HandlePDO1(const BYTE_t *data, const timeval_t &tv) {}