Changeset 10875 for trunk/FACT++/src

Timestamp:

05/27/11 17:19:25 (13 years ago)

Author:

tbretz

Message:

Use EventImp::GetBool; implemented SET_RUN_NUMBER

File:

• trunk/FACT++/src/fadctrl.cc (modified) (7 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -380 +380 @@
     }
 
+    void CmdSetRunNumber(uint32_t num)
+    {
+        PostCmd(FAD::kCmdWriteRunNumberLSW, num&0xffff);
+        PostCmd(FAD::kCmdWriteRunNumberMSW, num>>16);
+    }
+
     void CmdSetRegister(uint8_t addr, uint16_t val)
     {
@@ -398 +404 @@
     bool CmdSetRoi(int8_t addr, uint16_t val)
     {
-        if (addr>FAD::kMaxRoiAddr)
-            return false;
-
         if (val>FAD::kMaxRoiValue)
             return false;
 
         if (addr<0)
-            for (int i=0; i<=FAD::kMaxRoiAddr; i++)
+        {
+            for (unsigned int i=0; i<=FAD::kMaxRoiAddr; i++)
                 PostCmd(FAD::kCmdWriteRoi + i, val);
-        else
-            PostCmd(FAD::kCmdWriteRoi + addr, val);
-
+            return true;
+        }
+
+        if (uint8_t(addr)>FAD::kMaxRoiAddr)
+            return false;
+
+        PostCmd(FAD::kCmdWriteRoi + addr, val);
         return true;
     }
@@ -732 +740 @@
     }
 
+    int SetRunNumber(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetRunNumber", 8))
+            return T::kSM_FatalError;
+
+        const uint64_t num = evt.Get<uint64_t>();
+
+        if (num>FAD::kMaxRunNumber)
+        {
+            ostringstream msg;
+            msg << hex << "Value " << num << " out of range, max=" << FAD::kMaxRunNumber;
+            T::Error(msg);
+            return false;
+        }
+
+        for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
+            i->second.second->CmdSetRunNumber(num);
+
+        return T::GetCurrentState();
+    }
+
     int Test(const EventImp &evt)
     {
@@ -750 +779 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->SetVerbose(evt.GetText()[0]!=0);
+            i->second.second->SetVerbose(evt.GetBool());
 
         return T::GetCurrentState();
@@ -761 +790 @@
 
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->SetHexOutput(evt.GetText()[0]!=0);
+            i->second.second->SetHexOutput(evt.GetBool());
 
         return T::GetCurrentState();
@@ -772 +801 @@
 
        for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->SetDataOutput(evt.GetText()[0]!=0);
+            i->second.second->SetDataOutput(evt.GetBool());
 
         return T::GetCurrentState();
@@ -1144 +1173 @@
             ("");
 
+        T::AddEvent("SET_RUN_NUMBER", "X:1")
+            (boost::bind(&StateMachineFAD::SetRunNumber, this, _1))
+            ("");
+
         T::AddEvent("SET_REGISTER", "I:2")
             (boost::bind(&StateMachineFAD::SetRegister, this, _1))