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

Timestamp:

05/15/04 16:46:27 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -6 +6 @@
 #include "MAstro.h"
 #include "MCosy.h"
+#include "MString.h"
 
 using namespace std;
@@ -53 +54 @@
     }
 
-    lout << "CC-COMMAND: Track " << ra << "h " << dec << "deg '" << str 
-<< "'" << endl;
+    cout << "CC-COMMAND " << MTime(-1) << " RADEC " << ra << "h " << dec << "d '" << str << "'" << endl;
 
     ra *= 15; // h -> deg
@@ -60 +60 @@
     RaDec rd[2] = { RaDec(ra, dec), RaDec(ra, dec) };
 
-    cout << "MDriveCom - TRACK... start." << endl;
+    //cout << "MDriveCom - TRACK... start." << endl;
     fQueue->PostMsg(WM_TRACK, &rd, sizeof(rd));
-    cout << "MDriveCom - TRACK... done." << endl;
+    //cout << "MDriveCom - TRACK... done." << endl;
     return true;
 }
@@ -81 +81 @@
     }
 
-    lout << "CC-COMMAND: Move " << zd << "deg " << az << "deg" << endl;
+    cout << "CC-COMMAND " << MTime(-1) << " ZDAZ " << zd << "deg " << az << "deg" << endl;
 
     ZdAz za(zd, az);
 
-    cout << "MDriveCom - POSITION... start." << endl;
+    //cout << "MDriveCom - POSITION... start." << endl;
     fQueue->PostMsg(WM_POSITION, &za, sizeof(za));
-    cout << "MDriveCom - POSITION... done." << endl;
+    //cout << "MDriveCom - POSITION... done." << endl;
     return true;
 }
@@ -95 +95 @@
     if (cmd==(TString)"WAIT" && str.IsNull())
     {
-        cout << "MDriveCom - WAIT... start." << endl;
+        //cout << "MDriveCom - WAIT... start." << endl;
+        cout << "CC-COMMAND " << MTime(-1) << " WAIT" << endl;
         fQueue->PostMsg(WM_WAIT);
-        cout << "MDriveCom - WAIT... done." << endl;
+        //cout << "MDriveCom - WAIT... done." << endl;
         return true;
     }
@@ -103 +104 @@
     if (cmd==(TString)"STOP!" && str.IsNull())
     {
-        cout << "MDriveCom - STOP!... start." << endl;
-        lout << "CC-COMMAND: STOP!" << endl;       
+        //cout << "MDriveCom - STOP!... start." << endl;
+        cout << "CC-COMMAND " << MTime(-1) << " STOP!" << endl;
         fQueue->PostMsg(WM_STOP);
-        cout << "MDriveCom - STOP!... done." << endl;
+        //cout << "MDriveCom - STOP!... done." << endl;
         return true;
     }
@@ -124 +125 @@
     if (cmd.IsNull() && str.IsNull())
     {
-        cout << "Empty command (single '\\n') received." << endl;
+        cout << "CC-COMMAND " << MTime(-1) << " Empty command (single '\\n') received." << endl;
         return false;
     }
 
-    cout << "Unknown Command: '" << cmd << "':'" << str << "'" << endl;
+    cout << "CC-COMMAND " << MTime(-1) << " Syntax error: '" << cmd << "':'" << str << "'" << endl;
     return false;
 }
@@ -139 +140 @@
     MAstro::Deg2Dms(deg, sgn, d, m, s);
 
-    str += Form("%c %03d %02d %03d ", sgn, d, m, s);
+    MString txt;
+    str += txt.Print("%c %03d %02d %03d ", sgn, d, m, s);
 }
 
@@ -148 +150 @@
     // is [deg]
     // er [rad]
+    const MTime t(-1);
 
     rd *= kRad2Deg;
@@ -165 +168 @@
         SetStatus(4);
 
-    MTime t;
-    t.Now();
+    MString txt;
 
     TString str;
@@ -172 +174 @@
     Print(str, rd.Dec());   // Dec
     Print(str, 0);          // HA
-    str += Form("%12.6f ", t.GetMjd()); // mjd
+    str += txt.Print("%12.6f ", t.GetMjd()); // mjd
     Print(str, so.Zd());
     Print(str, so.Az());
     Print(str, is.Zd());
     Print(str, is.Az());
-    str += Form("%08.3f ", er.Zd());
-    str += Form("%08.3f", er.Az());
+    str += txt.Print("%08.3f ", er.Zd());
+    str += txt.Print("%08.3f", er.Az());
 
-    return Send(str);
+    return Send("DRIVE-REPORT", str);
 }
+
+bool MDriveCom::SendStatus(const char *stat)
+{
+    return Send("DRIVE-STATUS", stat);
+}