Changeset 926 for trunk/MagicSoft/Cosy/main

Timestamp:

09/10/01 14:32:27 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MCosy.cc (modified) (12 diffs)
• MCosy.h (modified) (1 diff)

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -125 +125 @@
 ZdAz MCosy::GetSePos()
 {
-    const int p0 = fAlt1->GetPos();
-    const int p1 = fAlt2->GetPos();
+    const int p0 = fZd1->GetPos();
+    const int p1 = fZd2->GetPos();
     const int p2 = fAz->GetPos();
 
@@ -362 +362 @@
     else
         if (fabs(vt->Az()) > 0.9*vraz)
+        {
+            lout << "Warning: Azimuth speed limit exceeded. Limiting speed to 90% max." << endl;
             vt->Az(0.9*vraz*sgn(vt->Az()));
+        }
 
     if (sgn(vt->Zd()) != sgn(vcalc.Zd()) &&
@@ -369 +372 @@
     else
         if (fabs(vt->Zd()) > 0.9*vrzd)
+        {
+            lout << "Warning: Altitude speed limit exceeded. Limiting speed to 90% max." << endl;
             vt->Zd(0.9*vrzd*sgn(vt->Zd()));
+        }
 }
 
@@ -568 +574 @@
     case WM_PRESET:
         cout << "WM_Preset: start." << endl;
-        fAlt1->SetPreset();
-        fAlt2->SetPreset();
+        fZd1->SetPreset();
+        fZd2->SetPreset();
         fAz->SetPreset();
         cout << "WM_Preset: done. (return 0xaffe)" << endl;
@@ -588 +594 @@
             cout << "Got  Zd: " << sepos.Zd() << " Az: " << sepos.Az() << endl;
 
-            fAlt1->SetPreset(za.Zd());
-            fAlt2->SetPreset(-za.Zd());
+            fZd1->SetPreset(za.Zd());
+            fZd2->SetPreset(-za.Zd());
             fAz->SetPreset(za.Az());
 
@@ -759 +765 @@
             do
             {
-                phca1 = fAlt1->PosHasChanged();
-                phca2 = fAlt2->PosHasChanged();
+                phca1 = fZd1->PosHasChanged();
+                phca2 = fZd2->PosHasChanged();
                 phcaz = fAz->PosHasChanged();
                 usleep(1);
@@ -786 +792 @@
             // FIXME: I cannot take the avarage
             //
-            time.Zd((fAlt1->GetMjd()+fAlt2->GetMjd())/2.0);
+            time.Zd((fZd1->GetMjd()+fZd2->GetMjd())/2.0);
             time.Az(fAz->GetMjd());
 
@@ -823 +829 @@
     // Update Gui, foremer MTGui.
     //
-    fAlt1->DisplayVal();
-    fAlt2->DisplayVal();
+    fZd1->DisplayVal();
+    fZd2->DisplayVal();
     fAz->DisplayVal();
 
@@ -874 +880 @@
     // Create Nodes
     //
-    fMac1=new Macs(1, lout);
-    fMac2=new Macs(2, lout);
-    fMac3=new Macs(3, lout);
-    fAlt1=new ShaftEncoder(4, lout);
-    fAlt2=new ShaftEncoder(5, lout);
-    fAz  =new ShaftEncoder(6, lout);
+    fMac1=new Macs(1, "Mac.1/Az",      lout);
+    fMac2=new Macs(2, "Mac.2/Zd",      lout);
+    fMac3=new Macs(3, "Mac.3/Az-Sync", lout);
+
+    fZd1=new ShaftEncoder(4, "SE.4/Zd1", lout);
+    fZd2=new ShaftEncoder(5, "SE.5/Zd2", lout);
+    fAz =new ShaftEncoder(6, "SE.6/Az",  lout);
 
     //
@@ -887 +894 @@
     SetNode(fMac2);
     SetNode(fMac3);
-    SetNode(fAlt1);
-    SetNode(fAlt2);
+    SetNode(fZd1);
+    SetNode(fZd2);
     SetNode(fAz);
 
@@ -899 +906 @@
 
     fAz->SetDisplay(fWin->GetLabel1());
-    fAlt1->SetDisplay(fWin->GetLabel2());
-    fAlt2->SetDisplay(fWin->GetLabel3());
+    fZd1->SetDisplay(fWin->GetLabel2());
+    fZd2->SetDisplay(fWin->GetLabel3());
 
     lout.SetOutputGui(fWin->GetLog(), kTRUE);
@@ -930 +937 @@
 
     delete fAz;
-    delete fAlt2;
-    delete fAlt1;
+    delete fZd2;
+    delete fZd1;
     delete fMac1;
     delete fMac2;

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -50 +50 @@
 
 private:
-    ShaftEncoder *fAlt1;
-    ShaftEncoder *fAlt2;
+    ShaftEncoder *fZd1;
+    ShaftEncoder *fZd2;
     ShaftEncoder *fAz;