Changeset 1953 for trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc (modified) (7 diffs)

trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc

@@ -40 +40 @@
             default:
                 lout << "?" << endl;
+                SetZombie();
                 return;
             }
         default:
             lout << "???" << endl;
+            SetZombie();
             return;
         }
@@ -88 +90 @@
 
     case 0x6502:
-        if (val==0)
-            val = 1;  // Single Turn = Multiturn with one turn
-        lout << "- Possible Turns: " << dec << val << endl;
+        //if (val==0)
+        //    val = 1;  // Single Turn = Multiturn with one turn
+        lout << "- Number of Revolutions: " << dec << val << endl;
         fTurns = val; 
         return;
@@ -105 +107 @@
     if (IsZombieNode())
     {
-        fLabel[0]->SetText(new TGString(""));
-        fLabel[1]->SetText(new TGString(""));
-        fLabel[2]->SetText(new TGString(""));
+        fLabel->SetText(new TGString(""));
         fUpdPos = ~fPos;
-        fUpdVel = ~fVel;
-        fUpdAcc = ~fAcc;
         return;
     }
@@ -116 +114 @@
     char text[21];
 
-    if (fPos!=fUpdPos && fLabel[0])
+    if (fPos!=fUpdPos && fLabel)
     {
         sprintf(text, "%ld", fPos);
-        fLabel[0]->SetText(new TGString(text));
+        fLabel->SetText(new TGString(text));
         fUpdPos = fPos;
-    }
-
-    if (fVel!=fUpdVel && fLabel[1])
-    {
-        sprintf(text, "%d", fVel);
-        fLabel[1]->SetText(new TGString(text));
-        fUpdVel = fVel;
-    }
-
-    if (fAcc!=fUpdAcc && fLabel[2])
-    {
-        sprintf(text, "%d", fAcc);
-        fLabel[2]->SetText(new TGString(text));
-        fUpdAcc = fAcc;
     }
 }
@@ -183 +167 @@
     fAcc = data[6] | (data[7]<<8);
 
-    const int uplim = 9*fTicks/10;
-    const int dnlim = 1*fTicks/10;
+    const int dnlim = fTicks/10;
+    const int uplim = fTurns*fTicks-dnlim;
 
     int turn = fTurn;
@@ -199 +183 @@
     fPos  = pos;
     fTurn = turn;
-
-    //fout << dec << (int)GetId() << " " << turn << " " << pos << endl;
 
     fTime.SetTimer(tv);
@@ -230 +212 @@
     RequestSDO(0x1000);
     WaitForSdo(0x1000);
-
     if (IsZombieNode())
-    {
-        lout << GetNodeName() << " - Init failed!" << endl;
-        return;
-    }
+        return;
 
     //