Changeset 4076 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

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

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

@@ -2 +2 @@
 
 #include <iostream>
+
+#include "MString.h"
 
 using namespace std;
@@ -53 +55 @@
     }
 
-    cout << "Zd/Az: " << zd << "/" << az << "   ";
-    cout << "Ra/Dec: " << ra << "/" << dec << "   ";
-    cout << "Temp: " << temp << "'C   ";
-    cout << "Hum: " << hum << "%   ";
-    cout << "SolRad: " << solar << "W/m²   ";
-    cout << "Wind: " << wind << "km/h" << endl;
-
     fHumidity = hum;
     fTemperature = temp;
     fSolarRadiation = solar;
     fWindSpeed = wind;
+
+    cout << "Zd/Az: " << zd << "/" << az << "  ";
+    cout << "Ra/Dec: " << ra/15 << "h/" << dec << "  ";
+    cout << "SolRad: " << solar << "W/m²" << endl;
 
     fComStat = kCmdReceived;
@@ -86 +85 @@
 }
 
-bool MCeCoCom::Send(const char *str)
+bool MCeCoCom::Send(const char *cmd, const char *str)
 {
     MTime t;
@@ -100 +99 @@
     fT.GetTime(h2, m2, s2, ms2);
 
-    const char *msg =
-        Form("%s "
+    MString msg;
+    msg.Print("%s "
              "%02d %04d %02d %02d %02d %02d %02d %03d "
              "%02d %04d %02d %02d %02d %02d %02d %03d "
-             "%s\n", (const char*)fCommand,
+             "%s\n", cmd,
              fStatus,  y1, mon1, d1, h1, m1, s1, ms1,
              fComStat, y2, mon2, d2, h2, m2, s2, ms2,
@@ -113 +112 @@
     return rc;
 }
+
+TString MCeCoCom::GetWeather() const
+{
+    if (fSolarRadiation<0 || (double)MTime(-1)-(double)fT>11)
+        return "";
+
+    MString str;
+    return str.Print("Temp: %.1f'C  Hum: %.1f%%  Wind: %.1fkm/h",
+                     fTemperature, fHumidity, fWindSpeed);
+}
+
+Int_t MCeCoCom::GetWeatherStatus() const
+{
+    if (fSolarRadiation<0 || (double)MTime(-1)-(double)fT>11)
+        return 0;
+
+    Int_t rc = 0;
+    if (fHumidity>80)
+        rc++;
+    if (fWindSpeed>20)
+        rc++;
+    if (fWindSpeed>30)
+        rc++;
+    if (fWindSpeed>50)
+        rc++;
+
+    return rc;
+}

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -24 +24 @@
     };
 
-    TString fCommand;     // report string of the current system
+    //TString fCommand;     // report string of the current system
     MTime   fT;           // time of last report received
     char    fStatus;      // current status of this system
@@ -43 +43 @@
 public:
     MCeCoCom::MCeCoCom(const char *cmd, MLog &out=gLog)
-        : MTcpIpIO(out), fCommand(cmd), fStatus(0), fComStat(kNoCmdReceived)
+        : MTcpIpIO(out), /*fCommand(cmd),*/ fStatus(0), fComStat(kNoCmdReceived), fSolarRadiation(-1)
     {
     }
 
-    bool Send(const char *str);
+    bool Send(const char *cmd, const char *str);
     void SetStatus(Byte_t s) { fStatus=s; }
 
     Float_t GetHumidity() const { return fHumidity; }
     Float_t GetTemperature() const { return fTemperature; }
+    Float_t GetWindSpeed() const { return fWindSpeed; }
+
+    TString GetWeather() const;
+    Int_t   GetWeatherStatus() const;
 };
 

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);
+}

trunk/MagicSoft/Cosy/tcpip/MDriveCom.h

@@ -37 +37 @@
 
     bool SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er);
+    bool SendStatus(const char *stat);
 };
 

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -33 +33 @@
      */
 
-MTcpIpIO::MTcpIpIO(MLog &out) : MThread(false), Log(out), fRxSocket(NULL), fServSock(NULL)
+MTcpIpIO::MTcpIpIO(MLog &out)
+    : MThread(false), Log(out), fRxSocket(NULL), fServSock(NULL), fSendInterval(1000)
 {
     fTxSocket = new TSocket("ceco", 7304);
@@ -49 +50 @@
     // Now delete all TCP/IP objects
     //
-    cout << "Delete TxSocket " << fTxSocket << "..." << flush;
+    //cout << "Delete TxSocket " << fTxSocket << "..." << flush;
     delete fTxSocket;
-    cout << "Done." << endl;
+    //cout << "Done." << endl;
     if (fServSock)
     {
-        cout << "Delete ServSock " << fServSock << "..." << flush;
+        //cout << "Delete ServSock " << fServSock << "..." << flush;
         delete fServSock;
-        cout << "Done." << endl;
+        //cout << "Done." << endl;
     }
     if (fRxSocket)
     {
-        cout << "Delete RxSocket " << fRxSocket << "..." << flush;
+        //cout << "Delete RxSocket " << fRxSocket << "..." << flush;
         delete fRxSocket;
-        cout << "Done." << endl;
+        //cout << "Done." << endl;
     }
 }
@@ -68 +69 @@
 bool MTcpIpIO::Send(const char *msg)
 {
+    const MTime t(-1);
+
+    if ((double)t-(double)fTime<0.001*fSendInterval)
+        return true;
+
+    const Int_t rc = lout.IsOutputDeviceEnabled(MLog::eGui);
+    lout.DisableOutputDevice(MLog::eGui);
+    lout.Lock();
+    lout << msg << flush;
+    lout.UnLock();
+    if (rc)
+        lout.EnableOutputDevice(MLog::eGui);
+
+    fTime = t;
+
     if (!fTxSocket->IsValid())
         return false;
@@ -112 +128 @@
             switch (fServSock->GetErrorCode())
             {
-            case 0: cout << "No error." << endl; break;
+            case  0: cout << "No error." << endl; break;
             case -1: cout << "low level socket() call failed." << endl; break;
             case -2: cout << "low level bind() call failed." << endl; break;

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.h

@@ -7 +7 @@
 #ifndef COSY_Log
 #include "log.h"
+#endif
+#ifndef MARS_MTime
+#include "MTime.h"
 #endif
 
@@ -19 +22 @@
     TSocket       *fRxSocket;
     TServerSocket *fServSock;
+
+    MTime fTime;
+    Int_t fSendInterval; // [ms]
 
     void Clear();