Changeset 13869

Timestamp:

05/24/12 14:46:14 (13 years ago)

Author:

tbretz

Message:

Fixed the reports; set the default request interval to 300s

File:

• trunk/FACT++/src/tngweather.cc (modified) (7 diffs)

trunk/FACT++/src/tngweather.cc

@@ -32 +32 @@
 {
     DimWeather() { memset(this, 0, sizeof(DimWeather)); }
-
-    uint16_t fStatus;
 
     float fTemp10M;
@@ -174 +172 @@
                     w.fWindDirection = stof(obj);
                 if (id=="windSpeed")
-                    w.fWindSpeed = stof(obj);
+                    w.fWindSpeed = stof(obj)*3.6;
                 if (id=="hum")
                     w.fHumidity = stof(obj);
@@ -355 +353 @@
 {
 private:
-
     DimDescribedService fDimWeather;
+    DimDescribedService fDimAtmosphere;
+
+    double dust;
 
     virtual void UpdateWeather(const Time &t, const DimWeather &data)
@@ -362 +362 @@
         fDimWeather.setData(&data, sizeof(DimWeather));
         fDimWeather.Update(t);
+
+        if (dust==data.fDustTotal)
+            return;
+
+        fDimAtmosphere.setData(&data.fDustTotal, sizeof(float));
+        fDimAtmosphere.Update(t);
+
+        dust = data.fDustTotal;
     }
 
@@ -367 +375 @@
     ConnectionDimWeather(ba::io_service& ioservice, MessageImp &imp) :
         ConnectionWeather(ioservice, imp),
-        fDimWeather("TNG_WEATHER/DATA", "S:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1",
-                     "|stat:Status"
+        fDimWeather("TNG_WEATHER/DATA", "F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1",
                      "|T_10M[deg C]:Temperature 10m above ground"
                      "|T_5M[deg C]:Temperature 5m above ground"
@@ -376 +383 @@
                      "|H[%]:Humidity"
                      "|P[mbar]:Air pressure"
-                     "|v[m/s]:Wind speed"
+                     "|v[km/h]:Wind speed"
                      "|d[deg]:Wind direction (N-E)"
                      "|DeltaM1"
                      "|Dust[ug/m^3]:Dust (total)"
-                     "|Seeing[W/m^2]:Seeing")
+                     "|Seeing[W/m^2]:Seeing"),
+        fDimAtmosphere("TNG_WEATHER/DUST", "F:1",
+                       "|Dust[ug/m^3]:Dust (total)"),
+        dust(-1)
     {
     }
@@ -532 +542 @@
         ("url,u",  var<string>("/weather/rss/"),  "File name and path to load")
         ("quiet,q", po_bool(true),  "Disable printing contents of all received messages (except dynamic data) in clear text.")
-        ("interval,i", var<uint16_t>(120), "Interval between two updates on the server in seconds")
+        ("interval,i", var<uint16_t>(300), "Interval between two updates on the server in seconds")
         ("debug-tx", po_bool(), "Enable debugging of ethernet transmission.")
         ;