Changeset 17934 for trunk

Timestamp:

07/27/14 11:45:39 (10 years ago)

Author:

tbretz

Message:

Added sqmctrl

File:

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

trunk/FACT++/src/smartfact.cc

@@ -28 +28 @@
 #include "HeadersFSC.h"
 #include "HeadersGPS.h"
+#include "HeadersSQM.h"
 #include "HeadersMCP.h"
 #include "HeadersLid.h"
@@ -536 +537 @@
     DimDescribedState fDimFscControl;
     DimDescribedState fDimGpsControl;
+    DimDescribedState fDimSqmControl;
     DimDescribedState fDimAgilentControl24;
     DimDescribedState fDimAgilentControl50;
@@ -1834 +1836 @@
 
         ofstream(fPath+"/gps.data") << out.str();
+
+        return GetCurrentState();
+    }
+
+    int HandleSqmData(const EventImp &d)
+    {
+        if (!CheckDataSize(d, "SqmControl:Data", sizeof(SQM::Data)))
+            return GetCurrentState();
+
+        const SQM::Data &data = d.Ref<SQM::Data>();
+
+        ostringstream out;
+
+        out << fixed;
+        out << d.GetJavaDate() << '\n';
+        out << setprecision(4);
+        out << HTML::kWhite << '\t' << data.mag    << '\n';
+        out << HTML::kWhite << '\t' << data.freq   << '\n';
+        out << HTML::kWhite << '\t' << data.counts << '\n';
+        out << HTML::kWhite << '\t' << data.period << '\n';
+        out << HTML::kWhite << '\t' << data.temp   << "\n";
+
+        ofstream(fPath+"/sqm.data") << out.str();
 
         return GetCurrentState();
@@ -2951 +2976 @@
             out << GetStateHtml(fDimFscControl,     FSC::State::kConnected);
             out << GetStateHtml(fDimGpsControl,     GPS::State::kConnected);
+            out << GetStateHtml(fDimSqmControl,     SQM::State::kConnected);
             out << GetStateHtml(fDimAgilentControl24, Agilent::State::kVoltageOff);
             out << GetStateHtml(fDimAgilentControl50, Agilent::State::kVoltageOff);
@@ -3025 +3051 @@
         fDimFscControl    ("FSC_CONTROL"),
         fDimGpsControl    ("GPS_CONTROL"),
+        fDimSqmControl    ("SQM_CONTROL"),
         fDimAgilentControl24("AGILENT_CONTROL_24V"),
         fDimAgilentControl50("AGILENT_CONTROL_50V"),
@@ -3051 +3078 @@
         fDimFscControl.Subscribe(*this);
         fDimGpsControl.Subscribe(*this);
+        fDimSqmControl.Subscribe(*this);
         fDimAgilentControl24.Subscribe(*this);
         fDimAgilentControl50.Subscribe(*this);
@@ -3089 +3117 @@
         Subscribe("GPS_CONTROL/NEMA")
             (bind(&StateMachineSmartFACT::HandleGpsNema,             this, placeholders::_1));
+
+        Subscribe("SQM_CONTROL/DATA")
+            (bind(&StateMachineSmartFACT::HandleSqmData,             this, placeholders::_1));
 
         Subscribe("TEMPERATURE/DATA")