Changeset 4865 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

09/05/04 18:56:47 (20 years ago)

Author:

rwagner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

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

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

@@ -90 +90 @@
 }
 
-bool MCeCoCom::Send(const char *cmd, const char *str)
+bool MCeCoCom::Send(const char *cmd, const char *str, bool force=kFALSE)
 {
     MTime t;
@@ -113 +113 @@
              str);
 
-    const bool rc = MTcpIpIO::Send(msg);
+    const bool rc = MTcpIpIO::Send(msg, force);
     fComStat = rc ? kNoCmdReceived : kComProblem;
     return rc;

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -49 +49 @@
     }
 
-    bool Send(const char *cmd, const char *str);
+    bool Send(const char *cmd, const char *str, bool force);
     void SetStatus(Byte_t s) { fStatus=s; }
 

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -182 +182 @@
     str += txt.Print("%08.3f", er.Az());
 
-    return Send("DRIVE-REPORT", str);
+    return Send("DRIVE-REPORT", str, kFALSE);
 }
 
 bool MDriveCom::SendStatus(const char *stat)
 {
-    return Send("DRIVE-STATUS", stat);
-}
+    return Send("DRIVE-STATUS", stat, kFALSE);
+}
+
+bool MDriveCom::SendStargReport(UInt_t stat, ZdAz miss)
+{
+   
+    // miss [rad]
+    const MTime t(-1);
+
+    miss *= kRad2Deg;
+
+    // Set status flag
+    if (stat&kError)
+        SetStatus(0);
+    if (stat&kStopped)
+        SetStatus(1);
+    if (stat&kStandby)
+        SetStatus(2);
+    if (stat&kMonitoring)
+        SetStatus(4);
+    
+    MString txt;
+
+    TString str;
+    str += txt.Print("%05.3f ", miss.Zd());
+    str += txt.Print("%05.3f", miss.Az());
+    
+    return Send("STARG-REPORT", str, kTRUE);
+
+}
+
+
+
+
+

trunk/MagicSoft/Cosy/tcpip/MDriveCom.h

@@ -31 +31 @@
         kTracking = 0x04,
         kStopping = 0x08,
-        kStopped  = 0x10
+        kStopped  = 0x10,
+        kStandby  = 0x20,
+        kMonitoring = 0x40
     };
-
+  
     MDriveCom(MsgQueue *q, MLog &out=gLog) : MCeCoCom("DRIVE-REPORT", out), fQueue(q) {}
 
     bool SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er);
+    bool SendStargReport(UInt_t stat, ZdAz miss);
     bool SendStatus(const char *stat);
 };
 
 #endif
+
+
+
+
+
+
+
+
+
+
+

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -67 +67 @@
 }
 
-bool MTcpIpIO::Send(const char *msg)
-{
+bool MTcpIpIO::Send(const char *msg, bool force=kFALSE)
+{
+
     const MTime t(-1);
 
-    if ((double)t-(double)fTime<0.001*fSendInterval)
-        return true;
+    if ((double)t-(double)fTime<0.001*fSendInterval && !force) 
+          return true;
+    
 
     if (lout.Lock("MTcpIpIO::Send"))
@@ -103 +105 @@
     cout << "Tx: " << msg << flush;
 #endif
+
     return true;
 }

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.h

@@ -32 +32 @@
     ~MTcpIpIO();
 
-    virtual bool Send(const char *msg);
+    virtual bool Send(const char *msg, bool force);
     virtual bool InterpreteStr(TString str);