Changeset 1953 for trunk/MagicSoft/Cosy/candrv

Timestamp:

04/12/03 19:06:27 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

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

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -97 +97 @@
 
         case kSDO_TX3:       // answer to 0x40 with 2 bytes of data
-            fNodes[node]->HandleSDO(idx, subidx, data>>16, tv);
+            fNodes[node]->HandleSDO(idx, subidx, data&0xffff, tv);
             return;
 
         case kSDO_TX1:       // answer to 0x40 with 1 byte  of data
-            fNodes[node]->HandleSDO(idx, subidx, data>>24, tv);
+            fNodes[node]->HandleSDO(idx, subidx, data&0xff, tv);
             return;
 

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -526 +526 @@
 void NodeDrv::StopGuarding()
 {
+    if (!fTimerOn)
+        return;
+
     fTimeout->TurnOff();
     fTimerOn = kFALSE;

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -880 +880 @@
 
     while (!Send(&msg));
-
+#ifdef EXPERT
     lout << "- CobId 0x" << hex << setfill('0') << setw(3) << cobid << " enabled." << endl;
+#endif
 }