Changeset 912 for trunk/MagicSoft/Cosy/devdrv

Timestamp:

08/17/01 15:12:57 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/devdrv

Files:

• macs.cc (modified) (1 diff)
• shaftencoder.cc (modified) (4 diffs)

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -419 +419 @@
 double Macs::GetTime()
 {
-    return fPosTime.GetTime();
+    return fPosTime.Now();
 }
 
 double Macs::GetMjd()
 {
-    return fPosTime.GetMjd();
+    return fPosTime.CalcMjd();
 }
 
 double Macs::GetPdoTime()
 {
-    return fPdoTime.GetTime();
+    return fPdoTime.Now();
 }
 
 double Macs::GetPdoMjd()
 {
-    return fPdoTime.GetMjd();
+    return fPdoTime.CalcMjd();
 }
 

trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc

@@ -32 +32 @@
     {
     case 0x1000:
-        cout << "Model: ";
+        lout << "- Model: ";
         switch (val&0xffff)
         {
         case 0x0196:
-            cout << "Shaft Encoder  Type: ";
+            lout << "Shaft Encoder  Type: ";
             switch ((val>>16)&0xff)
             {
             case 0x01:
-                cout << "Singleturn" << endl;
+                lout << "Singleturn" << endl;
                 return;
             case 0x02:
-                cout << "Multiturn" << endl;
+                lout << "Multiturn" << endl;
                 return;
             default:
-                cout << "?" << endl;
+                lout << "?" << endl;
                 return;
             }
         default:
-            cout << "???" << endl;
+            lout << "???" << endl;
             return;
         }
     case 0x100b:
-        cout << "Node ID: " << dec << val << endl;
+        lout << "Node ID: " << dec << val << endl;
         return;
 
     case 0x6000:
     case 0x6500:
-        cout << "Counting: " << (val&1   ?"anti-clockwise":"clockwise") << "  ";
-        cout << "HwTest: " <<   (val&2   ?"on":"off") << "  ";
-        cout << "Scaling: " <<  (val&4   ?"on":"off") << "  ";
-        cout << "Modulo: " <<   (val&4096?"on":"off") << endl;
+        lout << "- Counting: " << (val&1   ?"anti-clockwise":"clockwise") << "  ";
+        lout << "HwTest: " <<   (val&2   ?"on":"off") << "  ";
+        lout << "Scaling: " <<  (val&4   ?"on":"off") << "  ";
+        lout << "Modulo: " <<   (val&4096?"on":"off") << endl;
 
     case 0x6001:
-        cout << "Logical Ticks/Turn: " << dec << val << endl;
+        lout << "- Logical Ticks/Revolution: " << dec << val << endl;
         return;
 
     case 0x6004:
-        cout << "Position: " << dec << val << endl;
+        lout << "- Position: " << dec << val << endl;
         fPos  = val;
         fTurn = 0;
@@ -76 +76 @@
 
     case 0x6501:
-        cout << "Phys. Ticks/Turn: " << dec << val << endl;
+        lout << "- Phys. Ticks/Revolution: " << dec << val << endl;
         fTicks = val;
         return;
 
     case 0x6502:
-        cout << "Possible Turns: " << dec << val << endl;
+        lout << "- Possible Turns: " << dec << val << endl;
         fTurns = val ? val : 1; // Single Turn = Multiturn with one turn
         return;
@@ -209 +209 @@
 double ShaftEncoder::GetTime()
 {
-    return fTime.GetTime();
+    return fTime.Now();
 }
 
 double ShaftEncoder::GetMjd()
 {
-    return fTime.GetMjd();
+    return fTime.CalcMjd();
 }
 
@@ -228 +228 @@
     // Requesting and checking (FIXME) type of encoder
     //
-    lout << "- Requesting SDO 0x1000 of " << (int)GetId() << endl;
+    lout << "- Requesting Hardware Type (SDO 0x1000) of " << (int)GetId() << endl;
     RequestSDO(0x1000);
     WaitForSdo(0x1000);
 
     //
-    // Read physical ticks per turn
-    //
-    lout << "- Requesting SDO 0x6501 of " << (int)GetId() << endl;
+    // Read physical ticks per revolution
+    //
+    lout << "- Requesting physical ticks/revolution (SDO 0x6501) of " << (int)GetId() << endl;
     RequestSDO(0x6501);
     WaitForSdo(0x6501);
 
     //
-    // Read number of possible ticks per turn
-    //
-    lout << "- Requesting SDO 0x6502 of " << (int)GetId() << endl;
+    // Read number of possible ticks per revolution
+    //
+    lout << "- Requesting possible ticks/revolution (SDO 0x6502) of " << (int)GetId() << endl;
     RequestSDO(0x6502);
     WaitForSdo(0x6502);
 
     //
-    // Set logic ticks per turn = physical ticks per turn => scale factor = 1
+    // Set logic ticks/revolution = physical ticks/revolution => scale factor = 1
     //
     lout << "- Configuring SDO 0x6001 of " << (int)GetId() << endl;