Changeset 920 for trunk/MagicSoft/Cosy/devdrv

Timestamp:

08/29/01 16:44:38 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/devdrv

Files:

• DevdrvIncl.h (added)
• DevdrvLinkDef.h (added)
• macs.cc (modified) (1 diff)
• macs.h (modified) (1 diff)
• shaftencoder.cc (modified) (2 diffs)
• shaftencoder.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -7 +7 @@
 #include "network.h"
 
-Macs::Macs(BYTE_t nodeid, ostream &out=cout)
+Macs::Macs(BYTE_t nodeid, MLog &out)
     : NodeDrv(nodeid, out), fMacId(2*nodeid+1),
     fPos(0), fPosTime(0.0), fPdoPos(0), fPdoTime(0.0),

trunk/MagicSoft/Cosy/devdrv/macs.h

@@ -28 +28 @@
 
 public:
-    Macs(BYTE_t nodeid, ostream &out=cout);
+    Macs(BYTE_t nodeid, MLog &out=gLog);
     virtual ~Macs();
 

trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc

@@ -13 +13 @@
 #include <sys/resource.h>  // PRIO_PROCESS
 
-ShaftEncoder::ShaftEncoder(BYTE_t nodeid, ostream &out=cout) : NodeDrv(nodeid, out), fLabel(NULL)
+ShaftEncoder::ShaftEncoder(BYTE_t nodeid, MLog &out) : NodeDrv(nodeid, out), fLabel(NULL)
 {
 }
@@ -88 +88 @@
 void ShaftEncoder::DisplayVal()
 {
-    static LWORDS_t pos;   // ticks
-    static WORDS_t  vel;   // ticks per 5ms
-    static WORDS_t  acc;   // ticks per 25ms^2
-
     char text[21];
 
-    if (fPos!=pos)
+    if (fPos!=fUpdPos)
     {
         sprintf(text, "%ld", fPos);
         fLabel[0]->SetText(new TGString(text));
-    }
-
-    if (fVel!=vel)
+        fUpdPos = fPos;
+    }
+
+    if (fVel!=fUpdVel)
     {
         sprintf(text, "%d", fVel);
         fLabel[1]->SetText(new TGString(text));
-    }
-
-    if (fAcc!=acc)
+        fUpdVel = fVel;
+    }
+
+    if (fAcc!=fUpdAcc)
     {
         sprintf(text, "%d", fAcc);
         fLabel[2]->SetText(new TGString(text));
+        fUpdAcc = fAcc;
     }
 }

trunk/MagicSoft/Cosy/devdrv/shaftencoder.h

@@ -18 +18 @@
 
     TGLabel **fLabel;
+    LWORDS_t  fUpdPos;   // ticks
+    WORDS_t   fUpdVel;   // ticks per 5ms
+    WORDS_t   fUpdAcc;   // ticks per 25ms^2
 
     Timer fTime;
@@ -28 +31 @@
 
 public:
-    ShaftEncoder(BYTE_t nodeid, ostream &out=cout);
+    ShaftEncoder(BYTE_t nodeid, MLog &out=gLog);
     virtual ~ShaftEncoder();