Changeset 14622 for trunk/FACT++

Timestamp:

11/14/12 10:06:21 (12 years ago)

Author:

tbretz

Message:

Added PWR_CONTROL, AGILENT_CONTROL and LID_CONTROL.

File:

• trunk/FACT++/src/smartfact.cc (modified) (9 diffs)

trunk/FACT++/src/smartfact.cc

@@ -1 @@
-#ifdef HAVE_LIBNOVA
+#ifdef HAVE_NOVA
 #include <libnova/solar.h>
 #include <libnova/lunar.h>
@@ -19 +19 @@
 #include "Configuration.h"
 #include "Console.h"
-#include "Converter.h"
 #include "PixelMap.h"
 #include "DimWriteStatistics.h"
@@ -547 +546 @@
     DimDescribedState fDimFadControl;
     DimDescribedState fDimFscControl;
+    DimDescribedState fDimAgilentControl;
+    DimDescribedState fDimPwrControl;
+    DimDescribedState fDimLidControl;
     DimDescribedState fDimRateControl;
     DimDescribedState fDimRateScan;
@@ -1834 +1836 @@
     int Print() const
     {
-        Out() << fDimDNS          << endl;
-        Out() << fDimMcp          << endl;
-        Out() << fDimControl      << endl;
-        Out() << fDimDataLogger   << endl;
-        Out() << fDimDriveControl << endl;
-        Out() << fDimTimeCheck    << endl;
-        Out() << fDimFadControl   << endl;
-        Out() << fDimFtmControl   << endl;
-        Out() << fDimBiasControl  << endl;
-        Out() << fDimFeedback     << endl;
-        Out() << fDimRateControl  << endl;
-        Out() << fDimFscControl   << endl;
-        Out() << fDimMagicWeather << endl;
-        Out() << fDimTngWeather   << endl;
-        Out() << fDimRateScan     << endl;
-        Out() << fDimChat         << endl;
-        Out() << fDimSkypeClient  << endl;
+        Out() << fDimDNS            << endl;
+        Out() << fDimMcp            << endl;
+        Out() << fDimControl        << endl;
+        Out() << fDimDataLogger     << endl;
+        Out() << fDimDriveControl   << endl;
+        Out() << fDimTimeCheck      << endl;
+        Out() << fDimFadControl     << endl;
+        Out() << fDimFtmControl     << endl;
+        Out() << fDimBiasControl    << endl;
+        Out() << fDimFeedback       << endl;
+        Out() << fDimRateControl    << endl;
+        Out() << fDimFscControl     << endl;
+        Out() << fDimAgilentControl << endl;
+        Out() << fDimPwrControl     << endl;
+        Out() << fDimLidControl     << endl;
+        Out() << fDimMagicWeather   << endl;
+        Out() << fDimTngWeather     << endl;
+        Out() << fDimRateScan       << endl;
+        Out() << fDimChat           << endl;
+        Out() << fDimSkypeClient    << endl;
 
         return GetCurrentState();
@@ -2113 +2118 @@
         {
             const mysqlpp::StoreQueryResult res =
-                Database(fDatabase).query("SELECT fSourceName, fRightAscension, fDeclination FROM source").store();
+                Database(fDatabase).query("SELECT fSourceName, fRightAscension, fDeclination FROM source WHERE fSourceTypeKEY=1").store();
 
             out  << HTML::kWhite << '\t';
@@ -2266 +2271 @@
                            "<b><#darkred>DIM network not available</#></b>");
         newerr |= SetError(!fDimControl.online(),
-                           "<b>dimctrl offline</b>");
+                           "<b>no dimctrl server available</b>");
         newerr |= SetError(fDimDataLogger.state()<20 || fDimDataLogger.state()>40,
                            "<b>datalogger not ready</b>");
@@ -2713 +2718 @@
             out << HTML::kGreen << '\t' << fDimDNS.version() << '\n';
 
-            out << GetStateHtml(fDimControl,      0);
-            out << GetStateHtml(fDimMcp,          4);
-            out << GetStateHtml(fDimDataLogger,   1);
-            out << GetStateHtml(fDimDriveControl, 2);
-            out << GetStateHtml(fDimTimeCheck,    1);
+            out << GetStateHtml(fDimControl,        0);
+            out << GetStateHtml(fDimMcp,            4);
+            out << GetStateHtml(fDimDataLogger,     1);
+            out << GetStateHtml(fDimDriveControl,   2);
+            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(fDimRateScan,     4);
-            out << GetStateHtml(fDimMagicWeather, 2);
-            out << GetStateHtml(fDimTngWeather,   2);
-            out << GetStateHtml(fDimChat,         0);
-            out << GetStateHtml(fDimSkypeClient,  1);
+            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(fDimChat,           0);
+            out << GetStateHtml(fDimSkypeClient,    1);
 
             string col = HTML::kRed;
@@ -2777 +2785 @@
         fFreeSpace(UINT64_MAX),
         // ---
-        fDimMcp         ("MCP"),
-        fDimDataLogger  ("DATA_LOGGER"),
-        fDimDriveControl("DRIVE_CONTROL"),
-        fDimTimeCheck   ("TIME_CHECK"),
-        fDimMagicWeather("MAGIC_WEATHER"),
-        fDimTngWeather  ("TNG_WEATHER"),
-        fDimFeedback    ("FEEDBACK"),
-        fDimBiasControl ("BIAS_CONTROL"),
-        fDimFtmControl  ("FTM_CONTROL"),
-        fDimFadControl  ("FAD_CONTROL"),
-        fDimFscControl  ("FSC_CONTROL"),
-        fDimRateControl ("RATE_CONTROL"),
-        fDimRateScan    ("RATE_SCAN"),
-        fDimChat        ("CHAT"),
-        fDimSkypeClient ("SKYPE_CLIENT")
+        fDimMcp           ("MCP"),
+        fDimDataLogger    ("DATA_LOGGER"),
+        fDimDriveControl  ("DRIVE_CONTROL"),
+        fDimTimeCheck     ("TIME_CHECK"),
+        fDimMagicWeather  ("MAGIC_WEATHER"),
+        fDimTngWeather    ("TNG_WEATHER"),
+        fDimFeedback      ("FEEDBACK"),
+        fDimBiasControl   ("BIAS_CONTROL"),
+        fDimFtmControl    ("FTM_CONTROL"),
+        fDimFadControl    ("FAD_CONTROL"),
+        fDimFscControl    ("FSC_CONTROL"),
+        fDimAgilentControl("AGILENT_CONTROL"),
+        fDimPwrControl    ("PWR_CONTROL"),
+        fDimLidControl    ("LID_CONTROL"),
+        fDimRateControl   ("RATE_CONTROL"),
+        fDimRateScan      ("RATE_SCAN"),
+        fDimChat          ("CHAT"),
+        fDimSkypeClient   ("SKYPE_CLIENT")
     {
         fDimDNS.Subscribe(*this);
@@ -2806 +2817 @@
         fDimFadControl.Subscribe(*this);
         fDimFscControl.Subscribe(*this);
+        fDimAgilentControl.Subscribe(*this);
+        fDimPwrControl.Subscribe(*this);
+        fDimLidControl.Subscribe(*this);
         fDimRateControl.Subscribe(*this);
         fDimRateScan.Subscribe(*this);