Changeset 8840 for trunk

Timestamp:

01/30/08 15:41:38 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

• MCeCoCom.cc (modified) (3 diffs)
• MCeCoCom.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

@@ -2 +2 @@
 
 #include <iostream>
+
+#include "MLog.h"
 
 #include "MString.h"
@@ -7 +9 @@
 using namespace std;
 
+/*
+ // THIS COULD NEVER WORK BECAUSE IT IGNORES WHETHER
+ // WE SEND STARGUIDER OR DRIVE REPORTS!
+bool MCeCoCom::SendMsg(const char *msg, bool force=kFALSE)
+{
+    const MTime t(-1);
+
+    if ((double)t-(double)fTime<0.001*fSendInterval && !force) 
+          return true;
+
+    if (lout.Lock("MTcpIpIO::Send"))
+    {
+        //const Int_t rc = lout.IsOutputDeviceEnabled(MLog::eGui);
+        //lout.DisableOutputDevice(MLog::eGui);
+        lout << msg << flush;
+        lout.UnLock("MTcpIpIO::Send");
+        //if (rc)
+        //    lout.EnableOutputDevice(MLog::eGui);
+    }
+
+    fTime = t;
+
+    return Send(msg, strlen(msg));
+}
+*/
 bool MCeCoCom::InterpreteCmd(TString cmd, TString str)
 {
@@ -114 +141 @@
              str);
 
-    const bool rc = MTcpIpIO::Send(msg, force);
+    // Send report to CC
+    const bool rc = Send(msg, strlen(msg));
     fComStat = rc ? kNoCmdReceived : kComProblem;
+
+    // Write report to stream
+    if (fOut)
+        if (fOut->Lock("MTcpIpIO::Send"))
+        {
+            *fOut << msg << flush;
+            fOut->UnLock("MTcpIpIO::Send");
+        }
+
     return rc;
 }

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -24 +24 @@
     };
 
-    //TString fCommand;     // report string of the current system
+    MLog *fOut;           // Stream to which reports are written in addition
+
+//    Int_t fSendInterval; // [ms]
+//    MTime fTime;
+
     MTime   fT;           // time of last report received
     char    fStatus;      // current status of this system
@@ -44 +48 @@
 
 public:
-    MCeCoCom::MCeCoCom(const char *cmd, MLog &out=gLog)
-        : MTcpIpIO(out), /*fCommand(cmd),*/ fStatus(0), fComStat(kNoCmdReceived), fSolarRadiation(-1)
+    MCeCoCom(MLog *out)
+        : MTcpIpIO(7304, 7404), fOut(out), fStatus(0), fComStat(kNoCmdReceived),
+        fHumidity(0), fTemperature(0), fWindSpeed(0), fSolarRadiation(-1),
+        fAlarmCounter(0)
     {
     }
+    //virtual bool SendMsg(const char *msg, bool force);
 
     bool SendRep(const char *cmd, const char *str, bool force);