From 403dc702fbe488fb731a2ac15f7b0ac97450c64a Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Thu, 24 Nov 2016 17:19:27 +0100
Subject: [PATCH] Implemented readout delay

---
 firmware/register_map_eval5.xls | Bin 43520 -> 43520 bytes
 software/include/DRS.h          |   2 ++
 software/src/DRS.cpp            |  17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/firmware/register_map_eval5.xls b/firmware/register_map_eval5.xls
index c5389c99b5909fcad9126fa9c1c8b22f9f5d7e96..49e37e031a55921b89caaf0e8219b342c1d8842f 100644
GIT binary patch
delta 20
ccmZp;!qjkuX+sVRYuVm&<uRKJS^Ad(09}Cz0ssI2

delta 20
bcmZp;!qjkuX+sVR>-yvvlc>#wEd5IXS0D%~

diff --git a/software/include/DRS.h b/software/include/DRS.h
index 2606989..333ac0c 100644
--- a/software/include/DRS.h
+++ b/software/include/DRS.h
@@ -76,6 +76,7 @@ unsigned int millitime();
 #define REG_EEPROM_PAGE_MEZZ         0x0001A    // DRS4 Mezz
 #define REG_TRG_CONFIG               0x0001C    // DRS4 Eval4
 #define REG_LMK_LSB                  0x0001E    // DRS4 Mezz
+#define REG_READOUT_DELAY            0x00020    // DRS4 Eval5
 #define REG_WARMUP                   0x00020    // DRS4 Mezz
 #define REG_COOLDOWN                 0x00022    // DRS4 Mezz
 #define REG_READ_POINTER             0x00026    // DRS4 Mezz
@@ -640,6 +641,7 @@ public:
    int          GetTriggerDelay() { return fTriggerDelay; }
    double       GetTriggerDelayNs() { return fTriggerDelayNs; }
    int          SetSyncDelay(int ticks);
+   int          SetReadoutDelay(int ticks);
    int          SetTriggerLevel(double value);
    int          SetIndividualTriggerLevel(int channel, double voltage);
    int          SetTriggerPolarity(bool negative);
diff --git a/software/src/DRS.cpp b/software/src/DRS.cpp
index 33042e3..cfb5819 100644
--- a/software/src/DRS.cpp
+++ b/software/src/DRS.cpp
@@ -2020,6 +2020,8 @@ int DRSBoard::Init()
       SetDecimation(0);
    }
 
+   SetReadoutDelay(30303 * 0); // in ms
+   
    // disable calibration signals
    EnableAcal(0, 0);
    SetCalibTiming(0, 0);
@@ -2318,6 +2320,19 @@ int DRSBoard::SetSyncDelay(int ticks)
 
 /*------------------------------------------------------------------*/
 
+int DRSBoard::SetReadoutDelay(int ticks)
+{
+   if (fBoardType == 9) {
+      Write(T_CTRL, REG_READOUT_DELAY, &ticks, 4);
+      
+      return 1;
+   }
+   
+   return 0;
+}
+
+/*------------------------------------------------------------------*/
+
 int DRSBoard::SetTriggerSource(int source)
 {
    short int reg;
@@ -4560,7 +4575,7 @@ double DRSBoard::GetTrueFrequency()
 
 int DRSBoard::GetTime(unsigned int chipIndex, int channelIndex, int tc, float *time, bool tcalibrated, bool rotated)
 {
-   int i, scale, iend;
+   int i, scale;
    double gt0, gt;
 
    /* for DRS2, please use function below */