Changeset 12591 for trunk/Cosy

Timestamp:

11/21/11 12:54:18 (13 years ago)

Author:

tbretz

Message:

Changed the starguider command to make it work with FACT; added the WM_LEDS to be able to set the FACT LED voltages; added the status to the reports; make stat1 and stat2 two bytes long when updating the GUI

File:

• trunk/Cosy/main/MCosy.cc (modified) (9 diffs)

trunk/Cosy/main/MCosy.cc

@@ -118 +118 @@
 ZdAz MCosy::GetSePos() const
 {
-    const Double_t pa = fMac1 ? (Double_t)fMac1->GetPdoPos2()/fMac1->GetPosRes()  : 0;
+    const Double_t pa = fMac1 ? (Double_t)fMac1->GetPdoPos2()/fMac1->GetPosRes() : 0;
     const Double_t p1 = fMac2 ? (Double_t)fMac2->GetPdoPos2()/fMac2->GetPosRes() : 0;
 
@@ -261 +261 @@
         pointing.Zd(-pointing.Zd());
         pointing.Az(pointing.Az()+180);
-        //gLog << "ZD=-ZD Az+=180" << endl;
     }
 
     const ZdAz se = GetSePos()*TMath::TwoPi();   // [rad]
     const ZdAz unbendedse = fBending.CorrectBack(se)*TMath::RadToDeg(); // ist pointing
-
-    //gLog << "Unbended: " << unbendedse.Zd() << " " << unbendedse.Az() << endl;
 
     do
@@ -275 +272 @@
             break;
 
-        //gLog << "AZ += " << TMath::Sign(360., d) << endl;
-
         pointing.Az(pointing.Az()+TMath::Sign(360., d));
+
     } while (1);
 
@@ -484 +480 @@
 Int_t MCosy::Proc(int msg, void *mp)
 {
+    cout << "*** Received " << hex << msg << endl;
     switch (msg)
     {
@@ -498 +495 @@
 
     case WM_TPOINT:
+#ifdef FACT
+        fStarguider->fTPoint->SetDown(kTRUE);
+#else
         {
             //cout << "WM_TPoint: start." << endl;
@@ -545 +545 @@
             //cout << "WM_TPoint: done. (return 0xaffe)" << endl;
         }
-        break;
-
+#endif
+        break;
     case WM_STARGTPOINT:
         if (fStarguider)
@@ -574 +574 @@
         }
         //cout << "WM_TrackPosition: done. (return 0xabcd)" << endl;
+        break;
+
+    case WM_LEDS:
+        {
+            if (!CheckNetwork())
+                return 0xebb0;
+
+            const Long_t *u = (Long_t*)mp;
+
+            fMac1->SetLedVoltage(u[0]);
+            fMac2->SetLedVoltage(u[1]);
+        }
         break;
 
@@ -898 +910 @@
     {
         tout.Start(999);
-        fCom->SendReport(fStatus, fRaDec, fHourAngle, fZdAzSoll, bendist, fTrackingError, armed,
-                         fStarguider ? fStarguider->GetStarguiderMode() : 0);
+        fCom->SendReport(fStatus, fMJD, fRaDec, fHourAngle, fZdAzSoll, bendist, fTrackingError, armed,
+                         fStarguider ? fStarguider->GetStarguiderMode() : 0, ((stat1&0xffff)<<16)|(stat2&0xffff));
     }
 
     fWin->UpdateWeather(*fCom);
     fWin->Update(bendist, fTrackingError, /*fVelocity, fOffset,*/
-                 fRaDec, fZdAzSoll, fStatus, ((stat1&0xff)<<8)|(stat2&0xff), HasConnection(), armed, statzd, stataz);
+                 fRaDec, fZdAzSoll, fStatus, ((stat1&0xffff)<<16)|(stat2&0xffff), HasConnection(), armed, statzd, stataz);
 
     gLog.UpdateGui();
@@ -993 +1005 @@
 MCosy::MCosy(MEnv &env, MDriveCom *com)
 : Network(), fObservatory(MObservatory::kMagic1), fStarguider(NULL),
-fMac1(0), fMac2(0), fStatus(MDriveCom::kStopped), fOutTp(0), fOutRep(0)
+fMac1(0), fMac2(0), fMJD(0), fStatus(MDriveCom::kStopped), fOutTp(0), fOutRep(0)
 {
     const Int_t id1 = env.GetValue("Az_Id", 1);