Changeset 2615 for trunk/MagicSoft/Cosy/devdrv

Timestamp:

12/07/03 14:48:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/devdrv

Files:

• macs.cc (modified) (6 diffs)
• macs.h (modified) (3 diffs)
• shaftencoder.cc (modified) (4 diffs)
• shaftencoder.h (modified) (3 diffs)

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -4 +4 @@
 #include <sys/time.h>   // timeval->tv_sec
 
-#include "timer.h"
 #include "network.h"
 #include "MLogManip.h"
@@ -32 +31 @@
 Macs::Macs(const BYTE_t nodeid, const char *name, MLog &out)
     : NodeDrv(nodeid, name, out), fMacId(2*nodeid+1),
-    fPos(0), fPosTime(0.0), fPdoPos(0), fPdoTime(0.0),
-    fPosActive(0), fRpmActive(0), fStatusPdo3(0xff)
+    fPos(0), fPdoPos(0), fPosActive(0), fRpmActive(0),
+    fStatusPdo3(0xff)
 {
 //    fTimeout = new TTimer(this, 100); //, kFALSE); // 100ms, asynchronous
@@ -87 +86 @@
 //        lout << "Actual Position: " << dec << (signed long)val << endl;
         fPos = (LWORDS_t)val;
-        fPosTime.SetTimer(tv);
+        fPosTime.Set(*tv);
         return;
 /*
@@ -576 +575 @@
     fStatus = data[3];
 
-    fPdoTime.SetTimer(tv);
+    fPdoTime.Set(*tv);
 }
 
@@ -735 +734 @@
         return;
 
-    Timer time;
+    MTime time;
     time.Now();
 
@@ -811 +810 @@
 }
 
-double Macs::GetTime()
-{
-    return fPosTime.Now();
-}
-
-double Macs::GetMjd()
-{
-    return fPosTime.GetMjd();
-}
-
-double Macs::GetPdoTime()
-{
-    return fPdoTime.Now();
-}
-
-double Macs::GetPdoMjd()
-{
-    return fPdoTime.GetMjd();
-}
-
 /*   0x2000 0 rw Maximum positioning error     */
 /*          1 rw Negative Software Endswitch   */

trunk/MagicSoft/Cosy/devdrv/macs.h

@@ -3 +3 @@
 
 #include "nodedrv.h"
-#include "base/timer.h"
+#include "MTime.h"
 
 class Macs : public NodeDrv
@@ -16 +16 @@
 
     LWORDS_t fPos;
-    Timer    fPosTime;
+    MTime    fPosTime;
 
     LWORD_t  fRes;      // Encoder resolution
 
     LWORDS_t fPdoPos;
-    Timer    fPdoTime;
+    MTime    fPdoTime;
 
     BYTE_t   fPosActive;
@@ -106 +106 @@
     BYTE_t GetStatus() const { return fStatus; }
 
-    double GetTime();
-    double GetMjd();
-
-    double GetPdoTime();
-    double GetPdoMjd();
-
     LWORDS_t GetPdoPos() const { return fPdoPos; }
 

trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc

@@ -1 +1 @@
 #include "shaftencoder.h"
 
-#include "base/timer.h"
 #include "network.h"
 
@@ -182 +181 @@
 
     fPos = pos;
-    fTime.SetTimer(tv);
+    fTime.Set(*tv);
     fPosHasChanged = true;
 }
@@ -198 +197 @@
 
     fPos=pos;
-    fTime.SetTimer(tv);
+    fTime.Set(*tv);
     fPosHasChanged=true;
 
@@ -234 +233 @@
     fTurn = turn;
 
-    fTime.SetTimer(tv);
+    fTime.Set(*tv);
     fPosHasChanged=true;
-}
-
-double ShaftEncoder::GetTime()
-{
-    return fTime.Now();
 }
 

trunk/MagicSoft/Cosy/devdrv/shaftencoder.h

@@ -2 +2 @@
 #define SHAFTENCODER_H
 
-#include "base/timer.h"
 #include "nodedrv.h"
+#include "MTime.h"
 
 class TGLabel;
@@ -24 +24 @@
     bool fPosHasChanged;  //!
 
-    Timer fTime;
+    MTime fTime;
 
     void HandlePDOType0(BYTE_t *data, timeval_t *tv);
@@ -54 +54 @@
     LWORD_t  GetPhysRes() { return fTicks; }
 
-    double GetTime();
     double GetMjd();