Changeset 4105 for trunk/MagicSoft/Cosy/candrv

Timestamp:

05/20/04 05:01:03 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

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

trunk/MagicSoft/Cosy/candrv/network.h ¶

@@ -1 @@
-#ifndef NETWORK_H
-#define NETWORK_H
+#ifndef COSY_Network
+#define COSY_Network
 
+#ifndef COSY_CanOpen
 #include "canopen.h"
+#endif
+#ifndef COSY_NodeDrv
 #include "nodedrv.h"
+#endif
 
 class Network : public CanOpen

trunk/MagicSoft/Cosy/candrv/nodedrv.cc ¶

@@ -48 +48 @@
 #include <iostream.h>
 
-#include <TTimer.h>
+//#include <TTimer.h>
 
 #include "MTime.h"
@@ -530 +530 @@
             const Double_t t0 = t+fGuardTime;
 
-            while (!HasStopFlag() && t<t0 && t<fTimeoutTime)
+            while (!HasStopFlag() && (double)t<t0 && (double)t<fTimeoutTime)
             {
                 usleep(5);
@@ -540 +540 @@
             //cout << "-g-> " << (Long_t)((t-t0)*1000)<< endl;
 
-            if (t<fTimeoutTime)
+            if ((double)t<fTimeoutTime)
                 continue;
 

trunk/MagicSoft/Cosy/candrv/nodedrv.h ¶

@@ -1 @@
-#ifndef NODEDRV_H
-#define NODEDRV_H
+#ifndef COSY_NodeDrv
+#define COSY_NodeDrv
 
+#ifndef ROOT_TString
 #include <TString.h>
+#endif
 
+#ifndef COSY_Log
 #include "log.h"
+#endif
 
 #ifdef __CINT__

trunk/MagicSoft/Cosy/candrv/vmodican.cc ¶

@@ -934 +934 @@
 //  and switch the can bus communication on
 //
-VmodIcan::VmodIcan(const char *dev, const int baud, MLog &out) : Log(out), MThread(false, 10)//: CanDriver(dev, baud)
+VmodIcan::VmodIcan(const char *dev, const int baud, MLog &out) : Log(out), MThread(false, 1)//: CanDriver(dev, baud)
 {
     //

trunk/MagicSoft/Cosy/candrv/vmodican.h ¶

@@ -1 @@
-#ifndef VMODICAN_H
-#define VMODICAN_H
+#ifndef COSY_VmodIcan
+#define COSY_VmodIcan
 
 #include <pthread.h>
@@ -16 +16 @@
 #endif
 
+#ifndef COSY_MThread
 #include "MThread.h"
+#endif
 
 class Message;