Changeset 8865 for trunk/MagicSoft/Cosy/main

Timestamp:

02/20/08 19:39:13 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

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

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -406 +406 @@
 
 //#ifdef EXPERT
-//    point.SetAccDec(0.4, 0.4);
-//    point.SetVelocity(0.2); // fast: 0.6, slow: 0.2
+    //point.SetPointAccDec(0.3, 0.3);
+    //point.SetPointVelocity(0.3);
 //#else
 
@@ -413 +413 @@
 //
     point.SetPointAccDec(0.2, 0.1);
-
     point.SetPointVelocity(0.1);
 
 
 //#endif
-
-//    point.SetPointAccDec(0.4, 0.4);
-//    point.SetPointVelocity(0.4);
-
 
 // original
@@ -428 +423 @@
 // test
 //    return point.SetPosition(dst, kTRUE);
-
-
-
 }
 
@@ -565 +557 @@
         fMac1->HandleError();
         fMac2->HandleError();
-        if (fMac3)
-            fMac3->HandleError();
+        //if (fMac3)
+        //    fMac3->HandleError();
         if (HasError() || HasZombie())
             return false;
@@ -700 +692 @@
         //cout << "WM_TrackPosition: done. (return 0xabcd)" << endl;
         return 0xabcd;
-/*
+
     case WM_ARM:
         //cout << "WM_Position: start." << endl;
         {
             if (!CheckNetwork())
-                return (void*)0xebb0;
-
-            const bool arm = *((bool*)mp);
-            if (arm)
-            {
+                return 0xebb0;
+
+            //const bool arm = *((bool*)mp);
+            //if (arm)
+            //{
                 fMac1->Arm();
                 fMac2->Arm();
-                cout << "ARMED" << endl;
-            }
-            else
-            {
-                fMac1->Disarm();
-                fMac2->Disarm();
-                cout << "DISARMED" << endl;
-            }
+                //cout << "ARMED" << endl;
+            //}
+            //else
+            //{
+            //    fMac1->Disarm();
+            //    fMac2->Disarm();
+                //cout << "DISARMED" << endl;
+            //}
         }
         //cout << "WM_Position: done. (return 0x7777)" << endl;
-        return (void*)0x9999;
-  */
+        return 0x9999;
+
     case WM_POSITION:
         //cout << "WM_Position: start." << endl;
@@ -963 +955 @@
     Bool_t mac1 = fMac1 && !fMac1->IsZombieNode();
     Bool_t mac2 = fMac2 && !fMac2->IsZombieNode();
-    Bool_t mac3 = fMac3 && !fMac3->IsZombieNode();
+    //Bool_t mac3 = fMac3 && !fMac3->IsZombieNode();
 
     Bool_t zd1  = fZd1  && !fZd1->IsZombieNode();
@@ -971 +963 @@
     Double_t x = 0;
     Double_t y = 0;
-    y = mac1 ? fMac1->GetRes() : (mac3 ? fMac3->GetRes() : env.GetValue("Az_ResRE[re/U_mot]", 1500));
+//    y = mac1 ? fMac1->GetRes() : (mac3 ? fMac3->GetRes() : env.GetValue("Az_ResRE[re/U_mot]", 1500));
+    y = mac1 ? fMac1->GetRes() : env.GetValue("Az_ResRE[re/U_mot]", 1500);
     x = mac2 ? fMac2->GetRes() : env.GetValue("Zd_ResRE[re/U_mot]", 1500);
     kResRE.Set(x,y);
@@ -1278 +1271 @@
     avail |= (fMac1 && !fMac1->IsZombieNode()) ? 0x01 : 0;
     avail |= (fMac2 && !fMac2->IsZombieNode()) ? 0x02 : 0;
-    avail |= (fMac3 && !fMac3->IsZombieNode()) ? 0x04 : 0;
+    //avail |= (fMac3 && !fMac3->IsZombieNode()) ? 0x04 : 0;
     avail |= (fZd1  && !fZd1->IsZombieNode())  ? 0x08 : 0;
     avail |= (fZd2  && !fZd2->IsZombieNode())  ? 0x10 : 0;
@@ -1284 +1277 @@
 //    avail |= (!(fStatus&MDriveCom::kError) && 1 ? 0x40 : 0;
 
+    Bool_t armed = kTRUE;
+
+    armed &= fMac1 && fMac1->IsArmed();
+    armed &= fMac2 && fMac2->IsArmed();
+
     if (HasError())
         SetStatus(MDriveCom::kError);
@@ -1296 +1294 @@
     fWin->UpdateWeather(*fCom);
     fWin->Update(bendist, fTrackingError, fVelocity, /*fOffset,*/
-                 fRaDec, fZdAzSoll, fStatus, avail);
+                 fRaDec, fZdAzSoll, fStatus, avail, armed);
 
     gLog.UpdateGui();
@@ -1497 +1495 @@
     fMac1=new Macs(id1, "Mac/Az");
     fMac2=new Macs(id3, "Mac/Zd");
-    if (id2>=0)
-        fMac3=new Macs(id2, "Mac/Az-Sync");
+    //if (id2>=0)
+    //    fMac3=new Macs(id2, "Mac/Az-Sync");
 
     fZd1=new ShaftEncoder(id4, "SE/Zd1");
@@ -1519 +1517 @@
     SetNode(fMac1);
     SetNode(fMac2);
-    if (id2>=0)
-        SetNode(fMac3);
+    //if (id2>=0)
+    //    SetNode(fMac3);
     SetNode(fZd1);
     SetNode(fZd2);
@@ -1618 +1616 @@
 MCosy::MCosy(MEnv &env, const char *addr, const char *pointing)
 : Network(), fObservatory(MObservatory::kMagic1), fStarguider(NULL),
-fZd1(0), fZd2(0), fAz(0), fMac1(0), fMac2(0), fMac3(0),
+fZd1(0), fZd2(0), fAz(0), fMac1(0), fMac2(0), /*fMac3(0),*/
 fBackground(kBgdNone), fTriggerDisplay(kFALSE), fStatus(MDriveCom::kStopped),
 fOutTp(0), fOutRep(0)
@@ -1721 +1719 @@
     delete fMac1;
     delete fMac2;
-    if (fMac3)
-        delete fMac3;
+    //if (fMac3)
+    //    delete fMac3;
 
     gLog << inf2 << "Deleting MGCosy." << endl;

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -87 +87 @@
     Macs *fMac1;
     Macs *fMac2;
-    Macs *fMac3;
+    //Macs *fMac3;
 
     MGCosy    *fWin;