Changeset 11156 for trunk/FACT++/src/HeadersFAD.h

Timestamp:

06/23/11 22:11:25 (13 years ago)

Author:

tbretz

Message:

Added new bits in Status word; removed obsolete ref clock too high; added new command enable busy.

File:

• trunk/FACT++/src/HeadersFAD.h (modified) (3 diffs)

trunk/FACT++/src/HeadersFAD.h

@@ -25 +25 @@
         kCmdContTriggerOff  = 0x2000,
         kCmdRun             = 0x2200,  // CMD_Start/Stop
+        kCmdBusy            = 0x2400,  //
         kCmdResetTriggerId  = 0x2A00,  //
         kCmdSocket          = 0x3000,  // CMD_mode_command/CMD_mode_all_sockets
@@ -100 +101 @@
             kDenable       = 1<<11,
             kDwrite        = 1<<10,
-            kRefClkTooHigh = 1<< 9,
+            //kRefClkTooHigh = 1<< 9,
             kRefClkTooLow  = 1<< 8,
             kDcmLocked     = 1<< 7,
             kDcmReady      = 1<< 6,
             kSpiSclk       = 1<< 5,
+            kBusy          = 1<< 4,  // Busy enabled
+            kTriggerLine   = 1<< 3,  // Trigger line enabled
+            kContTrigger   = 1<< 2,  // Cont trigger enabled
+            kSock17        = 1<< 1,  // Socket 1-7 for data transfer
         };
 #endif
@@ -249 +254 @@
         bool HasDenable() const        { return fStatus&kDenable; }
         bool HasDwrite() const         { return fStatus&kDwrite; }
-        bool IsRefClockTooHigh() const { return fStatus&kRefClkTooHigh; }
+//        bool IsRefClockTooHigh() const { return fStatus&kRefClkTooHigh; }
         bool IsRefClockTooLow() const  { return fStatus&kRefClkTooLow; }
         bool IsDcmLocked() const       { return fStatus&kDcmLocked; }
         bool IsDcmReady() const        { return fStatus&kDcmReady; }
         bool HasSpiSclk() const        { return fStatus&kSpiSclk; }
+        bool HasBusy() const           { return fStatus&kBusy; }
+        bool HasTriggerEnabled() const { return fStatus&kTriggerLine; }
+        bool HasContTriggerEnabled() const { return fStatus&kContTrigger; }
+        bool IsInSock17Mode() const    { return fStatus&kSock17; }
 
         uint16_t Crate() const { return fBoardId>>8; }