Changeset 4105 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

05/20/04 05:01:03 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

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

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

@@ -59 +59 @@
     fSolarRadiation = solar;
     fWindSpeed = wind;
+
+    if (fWindSpeed>30)
+        fAlarmCounter++;
+    else
+        fAlarmCounter=0;
 
     cout << "Zd/Az: " << zd << "/" << az << "  ";
@@ -131 +136 @@
     if (fHumidity>80)
         rc++;
+    if (fWindSpeed>10)
+        rc++;
     if (fWindSpeed>20)
         rc++;
     if (fWindSpeed>30)
         rc++;
-    if (fWindSpeed>50)
-        rc++;
 
     return rc;

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -31 +31 @@
     ComStatus_t fComStat; // communication status
 
-    Float_t fHumidity;       // [%]
-    Float_t fTemperature;    // [deg] celsius
-    Float_t fWindSpeed;      // [km/h]
-    Float_t fSolarRadiation; // [W/m^2] IR-Radiation
+    Float_t fHumidity;         // [%]
+    Float_t fTemperature;      // [deg] celsius
+    Float_t fWindSpeed;        // [km/h]
+    Float_t fSolarRadiation;   // [W/m^2] IR-Radiation
+
+    Int_t   fAlarmCounter;     // Counter for alarm cases
 
     virtual bool InterpreteCmd(TString cmd, TString str);
@@ -56 +58 @@
     TString GetWeather() const;
     Int_t   GetWeatherStatus() const;
+
+    Bool_t  HasAlarm() const { return fAlarmCounter>3; }
 };
 

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -156 +156 @@
     er *= kRad2Deg;
 
-    rd.Ra(rd.Ra()*24/360);
+    rd.Ra(rd.Ra()/15);
 
     // Set status flag

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -74 +74 @@
         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);
+    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;