Changeset 16782

Timestamp:

06/10/13 11:34:38 (12 years ago)

Author:

tbretz

Message:

Added MagicLidar and Temperature to status page; replaced some numerical states with their enum counterparts.

Location:

trunk/FACT++

Files:

• src/smartfact.cc (modified) (6 diffs)
• www/smartfact/struct/status.page (modified) (1 diff)

trunk/FACT++/src/smartfact.cc

@@ -28 +28 @@
 #include "HeadersFSC.h"
 #include "HeadersMCP.h"
+#include "HeadersLid.h"
 #include "HeadersDrive.h"
 #include "HeadersPower.h"
+#include "HeadersAgilent.h"
 #include "HeadersFeedback.h"
 #include "HeadersRateScan.h"
 #include "HeadersRateControl.h"
+#include "HeadersTNGWeather.h"
+#include "HeadersMagicLidar.h"
 #include "HeadersMagicWeather.h"
+#include "HeadersTemperature.h"
 
 #include <boost/filesystem.hpp>
@@ -525 +530 @@
     DimDescribedState fDimTimeCheck;
     DimDescribedState fDimMagicWeather;
+    DimDescribedState fDimMagicLidar;
     DimDescribedState fDimTngWeather;
+    DimDescribedState fDimTemperature;
     DimDescribedState fDimFeedback;
     DimDescribedState fDimBiasControl;
@@ -1850 +1857 @@
         Out() << fDimMagicWeather   << endl;
         Out() << fDimTngWeather     << endl;
+        Out() << fDimMagicLidar     << endl;
+        Out() << fDimTemperature    << endl;
         Out() << fDimRateScan       << endl;
         Out() << fDimChat           << endl;
@@ -2746 +2755 @@
 
             out << GetStateHtml(fDimControl,        0);
-            out << GetStateHtml(fDimMcp,            4);
+            out << GetStateHtml(fDimMcp,            MCP::State::kConnected);
             out << GetStateHtml(fDimDataLogger,     1);
-            out << GetStateHtml(fDimDriveControl,   2);
+            out << GetStateHtml(fDimDriveControl,   Drive::State::kConnected);
             out << GetStateHtml(fDimTimeCheck,      1);
-            out << GetStateHtml(fDimFadControl,   FAD::State::kConnected);
-            out << GetStateHtml(fDimFtmControl,   FTM::State::kConnected);
-            out << GetStateHtml(fDimBiasControl,  BIAS::State::kConnected);
-            out << GetStateHtml(fDimFeedback,       4);
-            out << GetStateHtml(fDimRateControl,    4);
-            out << GetStateHtml(fDimFscControl,     2);
-            out << GetStateHtml(fDimAgilentControl, 3);
-            out << GetStateHtml(fDimPwrControl,     3);
-            out << GetStateHtml(fDimLidControl,     2);
-            out << GetStateHtml(fDimRateScan,       4);
-            out << GetStateHtml(fDimMagicWeather,   2);
-            out << GetStateHtml(fDimTngWeather,     2);
+            out << GetStateHtml(fDimFadControl,     FAD::State::kConnected);
+            out << GetStateHtml(fDimFtmControl,     FTM::State::kConnected);
+            out << GetStateHtml(fDimBiasControl,    BIAS::State::kConnected);
+            out << GetStateHtml(fDimFeedback,       Feedback::State::kConnectedFSC);
+            out << GetStateHtml(fDimRateControl,    RateControl::State::kConnected);
+            out << GetStateHtml(fDimFscControl,     FSC::State::kConnected);
+            out << GetStateHtml(fDimAgilentControl, Agilent::State::kVoltageOff);
+            out << GetStateHtml(fDimPwrControl,     Power::State::kSystemOff);
+            out << GetStateHtml(fDimLidControl,     Lid::State::kConnected);
+            out << GetStateHtml(fDimRateScan,       RateScan::State::kConnected);
+            out << GetStateHtml(fDimMagicWeather,   MagicWeather::State::kConnected);
+            out << GetStateHtml(fDimTngWeather,     TNGWeather::State::kConnected);
+            out << GetStateHtml(fDimMagicLidar,     MagicLidar::State::kConnected);
+            out << GetStateHtml(fDimTemperature,    Temperature::State::kValid);
             out << GetStateHtml(fDimChat,           0);
             out << GetStateHtml(fDimSkypeClient,    1);
@@ -2817 +2828 @@
         fDimTimeCheck     ("TIME_CHECK"),
         fDimMagicWeather  ("MAGIC_WEATHER"),
+        fDimMagicLidar    ("MAGIC_LIDAR"),
         fDimTngWeather    ("TNG_WEATHER"),
+        fDimTemperature   ("TEMPERATURE"),
         fDimFeedback      ("FEEDBACK"),
         fDimBiasControl   ("BIAS_CONTROL"),
@@ -2838 +2851 @@
         fDimTimeCheck.Subscribe(*this);
         fDimMagicWeather.Subscribe(*this);
+        fDimMagicLidar.Subscribe(*this);
         fDimTngWeather.Subscribe(*this);
+        fDimTemperature.Subscribe(*this);
         fDimFeedback.Subscribe(*this);
         fDimBiasControl.Subscribe(*this);

trunk/FACT++/www/smartfact/struct/status.page

@@ -18 +18 @@
 |Magic Weather|$0|
 |TNG Weather|$0|
+|Magic Lidar|$0|
+|Temperature|$0|
 |Chat server|$0|chat
 |Skype client|$0|