Changeset 10525


Ignore:
Timestamp:
May 3, 2011, 10:03:58 AM (8 years ago)
Author:
tbretz
Message:
Added Number of responding boards and boards in crate to DimFtuList
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/HeadersFTM.h

    r10520 r10525  
    521521
    522522
    523 
    524523    struct FtuResponse
    525524    {
    526         uint16_t fPingAddr;
     525        uint16_t fPingAddr;       // Number of Pings and addr (pings= see error)
    527526        uint64_t fDNA;
    528         uint16_t fErrorCounter;
     527        uint16_t fErrorCounter;   //
    529528
    530529        void reverse() { Reverse(&fDNA); }
     
    533532
    534533    } __attribute__((__packed__));
    535 
    536534
    537535    struct FtuList
     
    542540
    543541        FtuResponse fFTU[4][10];
    544                          
     542
    545543        FtuList() { init(*this); }
    546544
     
    583581        uint64_t fDNA[40];            /// DNA of FTU board
    584582        uint8_t  fAddr[40];           /// Address of FTU board
    585         uint8_t  fPing[40];           /// Number of pings until response
     583        uint8_t  fPing[40];           /// Number of pings until response (same as in Error)
    586584
    587585        DimFtuList(const Header &h, const FtuList &d) :
    588586            fTimeStamp(h.fTimeStamp),
    589             fActiveFTU(d.fActiveFTU[0] | (d.fActiveFTU[1]<<10) | (d.fActiveFTU[2]<<20) | (d.fActiveFTU[3]<<30))
    590         {
     587            fActiveFTU(d.fActiveFTU[0] | (d.fActiveFTU[1]<<10) | (d.fActiveFTU[2]<<20) | (d.fActiveFTU[3]<<30)),
     588            fNumBoards(d.fNumBoards)
     589        {
     590            for (int i=0; i<4; i++)
     591                fNumBoardsCrate[i] = d.fNumBoardsCrate[i];
     592
    591593            for (int i=0; i<40; i++)
    592594            {
     
    604606    struct Error
    605607    {
    606         uint16_t fNumCalls;    // Number or unsuccessfull calls
     608                              //  (same as FtuList)
     609        uint16_t fNumCalls;   // 0=error, >1 needed repetition but successfull
    607610        uint16_t fData[28];
    608611
Note: See TracChangeset for help on using the changeset viewer.