Changeset 8869 for trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

Timestamp:

02/21/08 22:03:06 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc (modified) (11 diffs)

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -61 +61 @@
 
     //cout << "MDriveCom - TRACK... start." << endl;
-    fQueue->PostMsg(WM_TRACK, &rd, sizeof(rd));
+    if (fQueue)
+        fQueue->PostMsg(WM_TRACK, &rd, sizeof(rd));
     //cout << "MDriveCom - TRACK... done." << endl;
     return true;
@@ -87 +88 @@
 
     //cout << "MDriveCom - TRACK... start." << endl;
-    fQueue->PostMsg(WM_GRB, &rd, sizeof(rd));
+    if (fQueue)
+        fQueue->PostMsg(WM_GRB, &rd, sizeof(rd));
     //cout << "MDriveCom - TRACK... done." << endl;
     return true;
@@ -112 +114 @@
 
     //cout << "MDriveCom - POSITION... start." << endl;
-    fQueue->PostMsg(WM_POSITION, &za, sizeof(za));
+    if (fQueue)
+        fQueue->PostMsg(WM_POSITION, &za, sizeof(za));
     //cout << "MDriveCom - POSITION... done." << endl;
     return true;
@@ -136 +139 @@
 
     //cout << "MDriveCom - TRACK... start." << endl;
-    fQueue->PostMsg(WM_PREPS, (void*)str.Data(), str.Length()+1);
+    if (fQueue)
+        fQueue->PostMsg(WM_PREPS, (void*)str.Data(), str.Length()+1);
     //cout << "MDriveCom - TRACK... done." << endl;
+    return true;
+}
+
+bool MDriveCom::CommandTPOINT(TString &str)
+{
+    cout << "CC-COMMAND " << MTime(-1) << " TPOIN " << str << endl;
     return true;
 }
@@ -166 +176 @@
     bool lock = str=="lock";
 
-    fQueue->PostMsg(WM_ARM, &lock, sizeof(lock));
+    if (fQueue)
+        fQueue->PostMsg(WM_ARM, &lock, sizeof(lock));
     return true;
 }
@@ -176 +187 @@
         //cout << "MDriveCom - WAIT... start." << endl;
         cout << "CC-COMMAND " << MTime(-1) << " WAIT" << endl;
-        fQueue->PostMsg(WM_WAIT);
+        if (fQueue)
+            fQueue->PostMsg(WM_WAIT);
         //cout << "MDriveCom - WAIT... done." << endl;
         return true;
@@ -185 +197 @@
         //cout << "MDriveCom - STOP!... start." << endl;
         cout << "CC-COMMAND " << MTime(-1) << " STOP!" << endl;
-        fQueue->PostMsg(WM_STOP);
+        if (fQueue)
+            fQueue->PostMsg(WM_STOP);
         //cout << "MDriveCom - STOP!... done." << endl;
         return true;
@@ -202 +215 @@
         return CommandPREPS(str);
 
+    if (cmd==(TString)"TPOIN")
+        return CommandTPOINT(str);
+
+    if (cmd==(TString)"ARM")
+        return CommandARM(str);
+
     if (cmd.IsNull() && str.IsNull())
     {
@@ -223 +242 @@
 }
 
-bool MDriveCom::SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er)
+bool MDriveCom::SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er, Bool_t armed)
 {
     // rd [rad]
@@ -259 +278 @@
     Print(str, is.Az());
     str += txt.Print("%08.3f ", er.Zd());
-    str += txt.Print("%08.3f", er.Az());
+    str += txt.Print("%08.3f ", er.Az());
+    str += armed ? "1 " : "0 ";
 
     return SendRep("DRIVE-REPORT", str, kFALSE);
@@ -303 +323 @@
     return SendRep("STARG-REPORT", str, kTRUE);
 }
+
+bool MDriveCom::SendTPoint(UInt_t stat)
+{
+    /*
+    // miss   [deg]
+    // nompos [deg]
+    const MTime t(-1);
+
+    miss *= 60;        // [arcmin]
+
+    // Set status flag
+    if (stat&kError)
+        SetStatus(0);
+    if (stat&kStandby)
+        SetStatus(2);
+    if (stat&kMonitoring)
+        SetStatus(4);
+    
+    MString txt;
+
+    TString str;
+    str += txt.Print("%05.3f ", miss.Zd());       //[arcmin]
+    str += txt.Print("%05.3f ", miss.Az());       //[arcmin]
+    Print(str, nompos.Zd());                      //[deg]
+    Print(str, nompos.Az());                      //[deg]
+    str += txt.Print("%05.1f ",   center.GetX()); //number
+    str += txt.Print("%05.1f ",   center.GetY()); //number
+    str += txt.Print("%04d ",   n);               //number of correleated stars
+    str += txt.Print("%03.1f ",  bright);
+    str += txt.Print("%12.6f ", t.GetMjd());      // mjd
+    str += txt.Print("%.1f ", x);
+    str += txt.Print("%.1f ", y);
+    str += txt.Print("%04d ", num);               //number of detected stars
+    */
+
+    return SendRep("TPOINT-REPORT", "", kTRUE);
+}