Index: /trunk/FACT++/gui/FactGui.h =================================================================== --- /trunk/FACT++/gui/FactGui.h (revision 11173) +++ /trunk/FACT++/gui/FactGui.h (revision 11174) @@ -392,4 +392,5 @@ DimStampedInfo fDimFadPllLock; DimStampedInfo fDimFadDrsEnabled; + DimStampedInfo fDimFadStatus; DimStampedInfo fDimFadStatistics; @@ -1114,5 +1115,5 @@ SetLedColor(fFadLedFwVersion, d.qos?kLedGreen:kLedOrange, d.time); } - +/* void handleFadPllLock(const DimData &d) { @@ -1120,5 +1121,5 @@ return; - SetLedColor(fFadLedPllLock, d.qos?kLedGreen:kLedOrange, d.time); +// SetLedColor(fFadLedPllLock, d.qos?kLedGreen:kLedOrange, d.time); const uint8_t *ptr = d.ptr(); @@ -1156,5 +1157,5 @@ const uint8_t *ptr = d.ptr(); - SetLedColor(fFadLedDrsEnabled, d.qos?(ptr[0]?kLedGreen:kLedRed):kLedOrange, d.time); +// SetLedColor(fFadLedDrsEnabled, d.qos?(ptr[0]?kLedGreen:kLedRed):kLedOrange, d.time); ostringstream tip; @@ -1178,4 +1179,51 @@ fFadLedDrsEnabled->setToolTip(tip.str().c_str()); + + } +*/ + void SetFadLed(QPushButton *led, const DimData &d, uint16_t bitmask) + { + const uint16_t quality = d.ptr()[0]; + const uint16_t value = d.ptr()[1]; + const uint16_t *ptr = d.ptr()+2; + + SetLedColor(led, quality&bitmask?(value&bitmask?kLedGreen:kLedRed):kLedOrange, d.time); + + ostringstream tip; + tip << ""; + for (int b=0; b<10; b++) + tip << ""; + tip << ""; + + for (int c=0; c<4; c++) + { + tip << "" << hex; + for (int b=0; b<10; b++) + { + tip << ""; + } + tip << ""; + } + tip << "
" << d.time.GetAsStr() << "
" << b << "
" << dec << c << "" + << (ptr[c*10+b]&bitmask) + << "
"; + + led->setToolTip(tip.str().c_str()); + } + + void handleFadStatus(const DimData &d) + { + if (!CheckSize(d, 42*sizeof(uint16_t))) + return; + + SetFadLed(fFadLedDrsEnabled, d, FAD::EventHeader::kDenable); + SetFadLed(fFadLedDrsWrite, d, FAD::EventHeader::kDwrite); + SetFadLed(fFadLedRefClockTooLow, d, FAD::EventHeader::kRefClkTooLow); + SetFadLed(fFadLedBusy, d, FAD::EventHeader::kBusy); + SetFadLed(fFadLedTriggerLine, d, FAD::EventHeader::kTriggerLine); + SetFadLed(fFadLedContTrigger, d, FAD::EventHeader::kContTrigger); + SetFadLed(fFadLedSocket, d, FAD::EventHeader::kSock17); + SetFadLed(fFadLedPllLock, d, 0xf000); + } @@ -1976,9 +2024,12 @@ return PostInfoHandler(&FactGui::handleFadFwVersion); - if (getInfo()==&fDimFadPllLock) - return PostInfoHandler(&FactGui::handleFadPllLock); - - if (getInfo()==&fDimFadDrsEnabled) - return PostInfoHandler(&FactGui::handleFadDrsEnabled); +// if (getInfo()==&fDimFadPllLock) +// return PostInfoHandler(&FactGui::handleFadPllLock); + +// if (getInfo()==&fDimFadDrsEnabled) +// return PostInfoHandler(&FactGui::handleFadDrsEnabled); + + if (getInfo()==&fDimFadStatus) + return PostInfoHandler(&FactGui::handleFadStatus); if (getInfo()==&fDimFadStatistics) @@ -2425,4 +2476,5 @@ fDimFadPllLock ("FAD_CONTROL/PLL_LOCK", (void*)NULL, 0, this), fDimFadDrsEnabled ("FAD_CONTROL/DRS_ENABLED", (void*)NULL, 0, this), + fDimFadStatus ("FAD_CONTROL/STATUS", (void*)NULL, 0, this), fDimFadStatistics ("FAD_CONTROL/STATISTICS", (void*)NULL, 0, this) { Index: /trunk/FACT++/gui/design.ui =================================================================== --- /trunk/FACT++/gui/design.ui (revision 11173) +++ /trunk/FACT++/gui/design.ui (revision 11174) @@ -3126,5 +3126,5 @@ - + true @@ -3498,5 +3498,5 @@ - + true @@ -3897,5 +3897,5 @@ - + true Index: /trunk/FACT++/src/EventBuilderWrapper.h =================================================================== --- /trunk/FACT++/src/EventBuilderWrapper.h (revision 11173) +++ /trunk/FACT++/src/EventBuilderWrapper.h (revision 11174) @@ -721,6 +721,10 @@ DimDescribedService fDimEventData; DimDescribedService fDimFwVersion; - DimDescribedService fDimPllLock; - DimDescribedService fDimDrsEnabled; + //DimDescribedService fDimPllLock; + //DimDescribedService fDimDrsEnabled; + //DimDescribedService fDimTriggerLine; + //DimDescribedService fDimContinousTrigger; + //DimDescribedService fDimSocket; + DimDescribedService fDimStatus; DimDescribedService fDimStatistics; @@ -742,6 +746,10 @@ 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:41", ""), - fDimDrsEnabled("FAD_CONTROL/DRS_ENABLED", "C:41", ""), + //fDimPllLock("FAD_CONTROL/PLL_LOCK", "C:41", ""), + //fDimDrsEnabled("FAD_CONTROL/DRS_ENABLED", "C:41", ""), + //fDimTriggerLine("FAD_CONTROL/TRIGGER_LINE", "C:41", ""), + //fDimContinousTrigger("FAD_CONTROL/CONTINOUS_TRIGGER", "C:41", ""), + //fDimBusy("FAD_CONTROL/BUSY", "C:41", ""), + fDimStatus("FAD_CONTROL/STATUS", "S:42", ""), fDimStatistics("FAD_CONTROL/STATISTICS", "X:8", ""), fDebugStream(false), fDebugRead(false) @@ -1387,4 +1395,42 @@ } + template + boost::array CompareBits(const FAD::EventHeader *h, const T *t) + { + const int offset = reinterpret_cast(t) - reinterpret_cast(h); + + T val; // All bits 0 + T rc; + + boost::array vec; + + bool first = true; + + for (int i=0; i<40; i++) + { + const char *base = reinterpret_cast(&fVecHeader[i]); + const T *ref = reinterpret_cast(base+offset); + + vec[i+2] = *ref; + + if (gi_NumConnect[i/7]!=7) + continue; + + if (first) + { + first = false; + val = *ref; + rc = ~0; + } + + rc |= val^*ref; + } + + vec[0] = rc; + vec[1] = val; + + return vec; + } + template void Update(DimDescribedService &svc, const pair> &data) @@ -1442,5 +1488,5 @@ Print("Run", run); } - +/* if (old.PLLLCK() != h.PLLLCK()) { @@ -1476,5 +1522,5 @@ Print("Owf", owf); } - +*/ if (old.IsDcmLocked() != h.IsDcmLocked()) { @@ -1494,9 +1540,14 @@ Print("Spi", spi); } - +/* if (old.HasBusy() != h.HasBusy()) { const pair> bsy = Compare(&h, &h.fStatus, FAD::EventHeader::kBusy); - Print("Bsy", bsy); + pair> data; + data.first = bsy.first; + data.second[0] = bsy.second[1]; + for (int i=0; i<40; i++) + data.second[i+1] = bsy.second[i+3]; + Update(fDimBusy, data); } @@ -1504,5 +1555,10 @@ { const pair> trg = Compare(&h, &h.fStatus, FAD::EventHeader::kTriggerLine); - Print("Trg", trg); + pair> data; + data.first = trg.first; + data.second[0] = trg.second[1]; + for (int i=0; i<40; i++) + data.second[i+1] = trg.second[i+3]; + Update(fDimTriggerLine, data); } @@ -1510,5 +1566,10 @@ { const pair> cnt = Compare(&h, &h.fStatus, FAD::EventHeader::kContTrigger); - Print("Cnt", cnt); + pair> data; + data.first = cnt.first; + data.second[0] = cnt.second[1]; + for (int i=0; i<40; i++) + data.second[i+1] = cnt.second[i+3]; + Update(fDimContinousTrigger, data); } @@ -1518,5 +1579,13 @@ Print("Sck", sck); } - +*/ + if (old.fStatus != h.fStatus) + { + const boost::array sts = CompareBits(&h, &h.fStatus); + fDimStatus.setData(const_cast(sts.data()), 42*sizeof(uint16_t)); + fDimStatus.updateService(); + + cout << "EMMIT" << endl; + }