Changeset 10969 for fact/FADctrl/FAD.cc

Timestamp:

06/10/11 08:23:22 (13 years ago)

Author:

neise

Message:

support for Firmware Version 0200

File:

• fact/FADctrl/FAD.cc (modified) (5 diffs)

fact/FADctrl/FAD.cc

@@ -32 +32 @@
    {"roi", &FAD::cmd_roi, true, 2, "<range> <value>", "Set ROI to for channel range to value"},
    {"dac", &FAD::cmd_dac, true, 2, "<range> <value>", "Set DAC numbers in range to value"},
+   {"execute", &FAD::cmd_execute, true, 0, "", "confirm FAD configuration settings, e.g. DAC, ROI, run#"},
    {"address", &FAD::cmd_address, true, 2, "<range> <value>", "Set addresses in range to value"},
    {"send", &FAD::cmd_send, true, 1, "<value>", "Send arbitrary data to board"},
@@ -205 +206 @@
 
 //
+// Execute: Confirm new ROI, DAC or what ever settings
+//
+
+void FAD::cmd_execute() {
+
+  for (unsigned int i=0; i<Boards.size(); i++) Boards[i]->Send(CMD_Execute);
+}
+
+
+//
 // Set run number
 //
 void FAD::cmd_runnumber() {
-
+        
+        unsigned short Buffer[4] = {0};
   int Num;
 
@@ -215 +227 @@
         return;
   }
+        Buffer[0] = htons(CMD_Write | ADDR_RUNNUMBER);
+        Buffer[1] = htons( (unsigned short)( ((unsigned int)Num) >> 16 ) );
+        Buffer[2] = htons(CMD_Write | (ADDR_RUNNUMBER + 1) );
+        Buffer[3] = htons( (unsigned short)Num );
 
   for (unsigned int i=0; i<Boards.size(); i++) {
-        Boards[i]->Send(CMD_Write | ADDR_RUNNUMBER );
-        Boards[i]->Send((unsigned short) (Num>>16));            // Write the HIGH-word first
-        Boards[i]->Send(CMD_Write | (ADDR_RUNNUMBER+1) );
-        Boards[i]->Send((unsigned short) Num); // now write the LOW-word
+        Boards[i]->Send(Buffer, sizeof(Buffer));
+        Boards[i]->Send(CMD_Execute);
   }
 }
@@ -351 +365 @@
   for (unsigned int i=0; i<Boards.size(); i++) {
         Boards[i]->Send(Buffer, sizeof(Buffer));
+        Boards[i]->Send(CMD_Execute);
   }
 } 
@@ -380 +395 @@
   }
 
-  // Disable triggers for all boards and wait (workaround for firmware bug)  
-  for (unsigned int i=0; i<Boards.size(); i++) Boards[i]->Send(CMD_TRIGGERS_OFF);
-  usleep(500000);
 
   // Send command buffer and enable triggers again
   for (unsigned int i=0; i<Boards.size(); i++) {
-        Boards[i]->Send(Buffer, sizeof(Buffer));
-        Boards[i]->Send(CMD_TRIGGERS_ON);
-  }
+        Boards[i]->Send(Buffer+R.Min*2, (R.Max-R.Min+1)*2*sizeof(unsigned short));
+        Boards[i]->Send(CMD_Execute);
+  }
+
+        
 }