Changeset 2384 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

10/15/03 17:28:35 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

• MCeCoCom.cc (modified) (1 diff)
• MCeCoCom.h (modified) (1 diff)
• MDriveCom.cc (modified) (2 diffs)
• MDriveCom.h (modified) (1 diff)
• MTcpIpIO.cc (modified) (8 diffs)
• MTcpIpIO.h (modified) (3 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

@@ -41 +41 @@
 
         // skip solar_irr_Wm2, wind_speed, UPS
-        float zd, az, dec, ra, temp, hum;
+                float zd, az, dec, ra, temp, hum;
         n=sscanf(str.Data(),
                  "%f %f %f %f %f %*f %*f %f %*f %n",

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -34 +34 @@
 
     bool InterpreteStr(TString str);
-    bool Send(const char *str);
 
 public:
-    MCeCoCom::MCeCoCom(const char *cmd)
-        : MTcpIpIO(), fCommand(cmd), fStatus(0), fComStat(kNoCmdReceived)
+    MCeCoCom::MCeCoCom(const char *cmd, MLog &out=gLog)
+        : MTcpIpIO(out), fCommand(cmd), fStatus(0), fComStat(kNoCmdReceived)
     {
     }
 
+    bool Send(const char *str);
     void SetStatus(Byte_t s) { fStatus=s; }
 };

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -2 +2 @@
 
 #include <iostream>
+
+#include "coord.h"
+#include "Slalib.h"
 
 using namespace std;
@@ -31 +34 @@
     return false;
 }
+
+void MDriveCom::Print(TString &str, Double_t deg) const
+{
+    Char_t sgn;
+    UShort_t d, m, s;
+
+    Slalib::Deg2Dms(deg, sgn, d, m, s);
+
+    str += Form("%c %03d %02d %03d ", sgn, d, m, s);
+}
+
+bool MDriveCom::SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er)
+{
+    // so [rad]
+    // is [deg]
+    // er [rad]
+
+    so *= kRad2Deg;
+    er *= kRad2Deg;
+
+    // Set status flag
+    if (stat&kError)
+        SetStatus(0);
+    if (stat&kStopped)
+        SetStatus(1);
+    if (stat&kStopping || stat&kMoving)
+        SetStatus(3);
+    if (stat&kTracking)
+        SetStatus(4);
+
+    Timer t;
+    t.Now();
+
+    TString str;
+    Print(str, rd.Ra());    // Ra
+    Print(str, rd.Dec());   // Dec
+    Print(str, 0);          // HA
+    str += Form("%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());
+
+    return Send(str);
+}

trunk/MagicSoft/Cosy/tcpip/MDriveCom.h

@@ -6 +6 @@
 #endif
 
+class RaDec;
+class ZdAz;
+
 class MDriveCom : public MCeCoCom
 {
 private:
     bool InterpreteCmd(TString cmd, TString str);
+    void Print(TString &str, Double_t deg) const;
 
 public:
-    MDriveCom() : MCeCoCom("DRIVE-REPORT") {}
+    enum
+    {
+        kError    = 0x01,
+        kMoving   = 0x02,
+        kTracking = 0x04,
+        kStopping = 0x08,
+        kStopped  = 0x10
+    };
+
+    MDriveCom(MLog &out=gLog) : MCeCoCom("DRIVE-REPORT", out) {}
+
+    bool SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er);
 };
 

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -31 +31 @@
      */
 
-MTcpIpIO::MTcpIpIO() : MThread(false), fRxSocket(NULL), fServSock(NULL)
+MTcpIpIO::MTcpIpIO(MLog &out) : MThread(false), Log(out), fRxSocket(NULL), fServSock(NULL)
 {
     fTxSocket = new TSocket("ceco", 7304);
@@ -38 +38 @@
 MTcpIpIO::~MTcpIpIO()
 {
+    cout << "Delete TxSocket..." << flush;
     delete fTxSocket;
+    cout << "Done." << endl;
+    if (fServSock)
+    {
+        cout << "Delete ServSock..." << flush;
+        delete fServSock;
+        cout << "Done." << endl;
+    }
+    if (fRxSocket)
+    {
+        cout << "Delete RxSocket..." << flush;
+        delete fRxSocket;
+        cout << "Done." << endl;
+    }
 }
 
@@ -68 +82 @@
 }
 
+void MTcpIpIO::Clear()
+{
+    char c;
+    while (fRxSocket->RecvRaw(&c, 1)>0 && !HasStopFlag())
+        usleep(1);
+}
+
 void *MTcpIpIO::Thread()
 {
@@ -87 +108 @@
             }
             delete fServSock;
+            fServSock=NULL;
             usleep(5000000);
             continue;
@@ -105 +127 @@
         {
             delete fServSock;
+            fServSock=NULL;
             continue;
         }
@@ -113 +136 @@
             delete fServSock;
             delete fRxSocket;
+            fServSock = NULL;
+            fRxSocket = NULL;
             continue;
         }
@@ -119 +144 @@
 
         fRxSocket->SetOption(kNoBlock, 1);
+
+        Clear();
 
         TString str;
@@ -160 +187 @@
         delete fServSock;
         delete fRxSocket;
+        fServSock = NULL;
+        fRxSocket = NULL;
     }
 

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.h

@@ -5 +5 @@
 #include "MThread.h"
 #endif
+#ifndef COSY_Log
+#include "log.h"
+#endif
 
 class TString;
@@ -10 +13 @@
 class TServerSocket;
 
-class MTcpIpIO : public MThread
+class MTcpIpIO : public MThread, public Log
 {
 private:
@@ -17 +20 @@
     TServerSocket *fServSock;
 
+    void Clear();
+
 public:
-    MTcpIpIO();
+    MTcpIpIO(MLog &out=gLog);
     ~MTcpIpIO();
 

trunk/MagicSoft/Cosy/tcpip/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I../base
+INCLUDES = -I. -I../base -I../catalog
 
 # @code