Changeset 10973 for trunk

Timestamp:

06/10/11 09:18:02 (13 years ago)

Author:

tbretz

Message:

Implemented the new execute command for the write command.

Location:

trunk/FACT++/src

Files:

• HeadersFAD.h (modified) (1 diff)
• fad.cc (modified) (6 diffs)
• fadctrl.cc (modified) (6 diffs)

trunk/FACT++/src/HeadersFAD.h

@@ -33 +33 @@
     enum Commands
     {
+        kCmdWriteExecute      = 0x0400,         // Configure FAD with the current config ram
+
         kCmdWrite             = 0x0500,         // write to Config-RAM
         kCmdWriteRoi          = kCmdWrite|0x00, // Baseaddress ROI-Values

trunk/FACT++/src/fad.cc

@@ -32 +32 @@
 
     double   fStartTime;
-    uint32_t fRunNumber;
 
     void AsyncRead(ba::mutable_buffers_1 buffers)
@@ -72 +71 @@
 
     FAD::EventHeader   fHeader;
+    FAD::EventHeader   fRam;
     FAD::ChannelHeader fChHeader[kNumChannels];
+
+    uint16_t fRamRoi[kNumChannels];
 
     ba::deadline_timer fTriggerSendData;
@@ -89 +91 @@
         fHeader.fEventCounter++;
         fHeader.fTimeStamp = uint32_t((Time(Time::utc).UnixTime()-fStartTime)*10000);
-        fHeader.fRunNumber = fRunNumber;
-
 
         fBuffer.resize(0);
@@ -228 +228 @@
                 cout << "-> Trigger" << endl;
                 SendData();
+                break;
+
+            case kCmdWriteExecute:
+                cout << "-> Execute" << endl;
+                memcpy(fHeader.fDac, fRam.fDac, sizeof(fHeader.fDac));
+                for (int i=0; i<kNumChannels; i++)
+                    fChHeader[i].fRegionOfInterest = fRamRoi[i];
+                fHeader.fRunNumber = fRam.fRunNumber;
                 break;
 
@@ -270 +278 @@
         {
         case kCmdWriteRunNumberMSW:
-            fRunNumber &= 0xffff;
-            fRunNumber |= fBufCommand[0]<<16;
+            fRam.fRunNumber &= 0xffff;
+            fRam.fRunNumber |= fBufCommand[0]<<16;
             cout << "-> Set RunNumber MSW" << endl;
             break;
         case kCmdWriteRunNumberLSW:
-            fRunNumber &= 0xffff0000;
-            fRunNumber |= fBufCommand[0];
+            fRam.fRunNumber &= 0xffff0000;
+            fRam.fRunNumber |= fBufCommand[0];
             cout << "-> Set RunNumber LSW" << endl;
             break;
         case kCmdWriteRoi:
             cout << "-> Set Roi[" << fCommand[1] << "]=" << fBufCommand[0] << endl;
-            fChHeader[fCommand[1]].fRegionOfInterest = fBufCommand[0];
+            //fChHeader[fCommand[1]].fRegionOfInterest = fBufCommand[0];
+            fRamRoi[fCommand[1]] = fBufCommand[0];
             break;
 
         case kCmdWriteDac:
             cout << "-> Set Dac[" << fCommand[1] << "]=" << fBufCommand[0] << endl;
-            fHeader.fDac[fCommand[1]] = fBufCommand[0];
+            fRam.fDac[fCommand[1]] = fBufCommand[0];
             break;
         }
@@ -310 +319 @@
         fTriggerEnabled=false;
         fCommandSocket=true;
-        fRunNumber = 1;
 
         fHeader.fStartDelimiter = FAD::kDelimiterStart;
         fHeader.fVersion = 0x104;
         fHeader.fBoardId = (fBoardId%10) | ((fBoardId/10)<<8);
+        fHeader.fRunNumber = 1;
         fHeader.fStatus = 0xf<<12 |
             FAD::EventHeader::kDenable    |

trunk/FACT++/src/fadctrl.cc

@@ -378 +378 @@
 
         PostCmd(FAD::kCmdWriteRate, val);//uint8_t(1000./val/12.5));
+        PostCmd(FAD::kCmdWriteExecute);
         //PostCmd(kCmdContTriggerRate, uint8_t(80/val));
 
@@ -387 +388 @@
         PostCmd(FAD::kCmdWriteRunNumberLSW, num&0xffff);
         PostCmd(FAD::kCmdWriteRunNumberMSW, num>>16);
+        PostCmd(FAD::kCmdWriteExecute);
     }
 
@@ -394 +396 @@
         // Allowed value: [0, MAX_VAL]
         PostCmd(FAD::kCmdWrite + addr, val);
+        PostCmd(FAD::kCmdWriteExecute);
     }
 
@@ -401 +404 @@
             return false;
 
-        PostCmd(FAD::kCmdWriteDac + addr, val);
+        PostCmd(FAD::kCmdWriteExecute);
         return true;
     }
@@ -414 +417 @@
             for (unsigned int i=0; i<=FAD::kMaxRoiAddr; i++)
                 PostCmd(FAD::kCmdWriteRoi + i, val);
+            PostCmd(FAD::kCmdWriteExecute);
             return true;
         }
@@ -421 +425 @@
 
         PostCmd(FAD::kCmdWriteRoi + addr, val);
+        PostCmd(FAD::kCmdWriteExecute);
         return true;
     }