Changeset 2278 for trunk/MagicSoft/Cosy/candrv

Timestamp:

07/15/03 15:05:21 (21 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)
• vmodican.cc (modified) (1 diff)

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -105 +105 @@
 
         case kSDO_TX_OK:     // answer to a SDO_TX message
-            fNodes[node]->HandleSDOOK(idx, subidx, tv);
+            fNodes[node]->HandleSDOOK(idx, subidx, data, tv);
             return;
 

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -144 +144 @@
 //
 // Print an "SDO idx/subidx set." from this device message.
-// This output is never redirected to the GUI
-//
-void NodeDrv::HandleSDOOK(WORD_t idx, BYTE_t subidx, timeval_t *tv)
+// This output is never redirected to the GUI.
+// In standard CANOpen operation data is meaningless (we are using
+// it in the 'non-standard' CANOpen communication with the MACS)
+//
+void NodeDrv::HandleSDOOK(WORD_t idx, BYTE_t subidx, LWORD_t data, timeval_t *tv)
 {
     const Bool_t gui = lout.IsOutputDeviceEnabled(MLog::eGui);

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -69 +69 @@
 
     virtual void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, timeval_t *tv);
-    virtual void HandleSDOOK(WORD_t idx, BYTE_t subidx, timeval_t *tv);
+    virtual void HandleSDOOK(WORD_t idx, BYTE_t subidx, LWORD_t data, timeval_t *tv);
     virtual void HandleSDOError(LWORD_t data);
 

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -950 +950 @@
         cout << "Cannot open device '" << dev << "'... exit." << endl;
         cout << strerror(errno) << endl;
+        return;
 //        exit(1);                       // open module
     }