Changeset 11166

Timestamp:

06/24/11 12:55:20 (13 years ago)

Author:

tbretz

Message:

Added PLL lock.

Location:

trunk/FACT++

Files:

• gui/FactGui.h (modified) (4 diffs)
• src/EventBuilderWrapper.h (modified) (5 diffs)

trunk/FACT++/gui/FactGui.h

@@ -390 +390 @@
     DimStampedInfo fDimFadConnections;
     DimStampedInfo fDimFadFwVersion;
+    DimStampedInfo fDimFadPllLock;
     DimStampedInfo fDimFadStatistics;
 
@@ -1110 +1111 @@
         fFadFwVersion->setToolTip(tip.str().c_str());
 
-        SetLedColor(fFadLEDFwVersion, d.qos?kLedGreen:kLedOrange, d.time);
+        SetLedColor(fFadLedFwVersion, d.qos?kLedGreen:kLedOrange, d.time);
+    }
+
+    void handleFadPllLock(const DimData &d)
+    {
+        if (!CheckSize(d, 43*sizeof(uint8_t)))
+            return;
+
+        SetLedColor(fFadLedPllLock, d.qos?kLedGreen:kLedOrange, d.time);
+
+        const uint8_t *ptr = d.ptr<uint8_t>();
+
+        ostringstream tip;
+        tip << "<table border='1'><tr><th colspan='11'>" << Time().GetAsStr() << "</th></tr><tr><th></th>";
+        for (int b=0; b<10; b++)
+            tip << "<th>" << b << "</th>";
+        tip << "</tr>";
+
+        for (int c=0; c<4; c++)
+        {
+            tip << "<tr><th>" << c << "</th>";
+            for (int b=0; b<10; b++)
+            {
+                tip << "<td>"
+                    << (int)(ptr[c*10+b+3]&8)
+                    << (int)(ptr[c*10+b+3]&4)
+                    << (int)(ptr[c*10+b+3]&2)
+                    << (int)(ptr[c*10+b+3]&1)
+                    << "</td>";
+            }
+            tip << "</tr>";
+        }
+        tip << "</table>";
+
+        fFadLedPllLock->setToolTip(tip.str().c_str());
     }
 
@@ -1908 +1943 @@
             return PostInfoHandler(&FactGui::handleFadFwVersion);
 
+        if (getInfo()==&fDimFadPllLock)
+            return PostInfoHandler(&FactGui::handleFadPllLock);
+
         if (getInfo()==&fDimFadStatistics)
             return PostInfoHandler(&FactGui::handleFadStatistics);
@@ -2349 +2387 @@
         fDimFadConnections     ("FAD_CONTROL/CONNECTIONS",      (void*)NULL, 0, this),
         fDimFadFwVersion       ("FAD_CONTROL/FIRMWARE_VERSION", (void*)NULL, 0, this),
+        fDimFadPllLock         ("FAD_CONTROL/PLL_LOCK",         (void*)NULL, 0, this),
         fDimFadStatistics      ("FAD_CONTROL/STATISTICS",       (void*)NULL, 0, this)
     {

trunk/FACT++/src/EventBuilderWrapper.h

@@ -721 +721 @@
     DimDescribedService fDimEventData;
     DimDescribedService fDimFwVersion;
+    DimDescribedService fDimPllLock;
     DimDescribedService fDimStatistics;
 
@@ -740 +741 @@
         fDimEventData("FAD_CONTROL/EVENT_DATA", "S:1;I:1;S:1;I:2;S:1;S", ""),
         fDimFwVersion("FAD_CONTROL/FIRMWARE_VERSION", "F:43", ""),
+        fDimPllLock("FAD_CONTROL/PLL_LOCK", "C:43", ""),
         fDimStatistics("FAD_CONTROL/STATISTICS", "X:8", ""),
         fDebugStream(false), fDebugRead(false)
@@ -1353 +1355 @@
             vec[i+3] = *ref;
 
-            if (gi_NumConnect[i/7]!=7)
-                continue;
+//            if (gi_NumConnect[i/7]!=7)
+//                continue;
 
             if (!val)
@@ -1403 +1405 @@
     {
         const uint16_t id = h.Id();
-        if (id>39) // WARNING
+        if (id>39) 
             return;
 
@@ -1442 +1444 @@
         {
             const pair<bool, boost::array<uint16_t,43>> pll = Compare(&h, &h.fStatus, 0xf<<12, 12);
-            Print("Pll", pll);
+            pair<bool, boost::array<uint8_t,43>> data;
+            data.first = pll.first;
+
+            for (int i=0; i<43; i++)
+                data.second[i] = (pll.second[i]>>12)&0xf;
+            Update(fDimPllLock, data);
         }