Changeset 10525 for trunk/FACT++

Timestamp:

05/03/11 10:03:58 (14 years ago)

Author:

tbretz

Message:

Added Number of responding boards and boards in crate to DimFtuList

File:

• trunk/FACT++/src/HeadersFTM.h (modified) (5 diffs)

trunk/FACT++/src/HeadersFTM.h

@@ -521 +521 @@
 
 
-
     struct FtuResponse
     {
-        uint16_t fPingAddr;
+        uint16_t fPingAddr;       // Number of Pings and addr (pings= see error)
         uint64_t fDNA;
-        uint16_t fErrorCounter;
+        uint16_t fErrorCounter;   //
 
         void reverse() { Reverse(&fDNA); }
@@ -533 +532 @@
 
     } __attribute__((__packed__));
-
 
     struct FtuList
@@ -542 +540 @@
 
         FtuResponse fFTU[4][10];
-                          
+
         FtuList() { init(*this); }
 
@@ -583 +581 @@
         uint64_t fDNA[40];            /// DNA of FTU board
         uint8_t  fAddr[40];           /// Address of FTU board
-        uint8_t  fPing[40];           /// Number of pings until response
+        uint8_t  fPing[40];           /// Number of pings until response (same as in Error)
 
         DimFtuList(const Header &h, const FtuList &d) :
             fTimeStamp(h.fTimeStamp),
-            fActiveFTU(d.fActiveFTU[0] | (d.fActiveFTU[1]<<10) | (d.fActiveFTU[2]<<20) | (d.fActiveFTU[3]<<30))
-        {
+            fActiveFTU(d.fActiveFTU[0] | (d.fActiveFTU[1]<<10) | (d.fActiveFTU[2]<<20) | (d.fActiveFTU[3]<<30)),
+            fNumBoards(d.fNumBoards)
+        {
+            for (int i=0; i<4; i++)
+                fNumBoardsCrate[i] = d.fNumBoardsCrate[i];
+
             for (int i=0; i<40; i++)
             {
@@ -604 +606 @@
     struct Error
     {
-        uint16_t fNumCalls;    // Number or unsuccessfull calls
+                              //  (same as FtuList)
+        uint16_t fNumCalls;   // 0=error, >1 needed repetition but successfull
         uint16_t fData[28];