From b290d4e3b29ef586ded6e0b932bd9d1a10dea5cc Mon Sep 17 00:00:00 2001
From: Maps <maps@ikf>
Date: Tue, 9 May 2017 10:12:38 +0200
Subject: [PATCH] PK: Extending ELwindow setup with a 2nd TRB3

---
 config/sensorQ0.xml               |  2 ++
 config/sensorQ1.xml               |  2 ++
 network/register_configgbe_mvd.db |  1 +
 setup/ELwindow_readout.xml        | 58 +++++++++++++++++++++++++++++++
 system/ELwindow.xml               | 26 ++++++--------
 5 files changed, 74 insertions(+), 15 deletions(-)
 create mode 100644 config/sensorQ0.xml
 create mode 100644 config/sensorQ1.xml

diff --git a/config/sensorQ0.xml b/config/sensorQ0.xml
new file mode 100644
index 0000000..68a5927
--- /dev/null
+++ b/config/sensorQ0.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="nice_thresh.xml"><register name="DAC_BIAS"><field name="IVTST2" value="0x64"/><field name="IVDREF1A" value="165"/><field name="IVDREF1B" value="175"/><field name="IVDREF1D" value="135"/><field name="IVDREF1C" value="141"/><field name="IVDREF2" value="100"/></register><register name="RO_MODE0"><field name="En_ExtStart" value="0x1"/></register><register name="SEQUENCER_PIX_REG"><field name="DataRdPix" value="0x7FFF"/><field name="DataPwrOn" value="0x7FFFFFFF"/></register><register name="HEADER_REG"><field name="trailer0" value="0x8001"/><field name="trailer1" value="0x8001"/></register><register name="CONTROL_SUZE_REG"><field name="dualchannelout" value="0x1"/><field name="clkrateout" value="0x1"/></register></MAPS>
diff --git a/config/sensorQ1.xml b/config/sensorQ1.xml
new file mode 100644
index 0000000..9c58922
--- /dev/null
+++ b/config/sensorQ1.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml" inheritSettingsFrom="nice_thresh.xml"><register name="DAC_BIAS"><field name="IVTST2" value="0x64"/><field name="IVDREF2" value="100"/><field name="IVDREF1D" value="255"/><field name="IVDREF1C" value="255"/><field name="IVDREF1B" value="255"/><field name="IVDREF1A" value="220"/></register><register name="RO_MODE0"><field name="En_ExtStart" value="0x1"/></register><register name="SEQUENCER_PIX_REG"><field name="DataRdPix" value="0x7FFF"/><field name="DataPwrOn" value="0x7FFFFFFF"/></register><register name="HEADER_REG"><field name="trailer0" value="0x8001"/><field name="trailer1" value="0x8001"/></register><register name="CONTROL_SUZE_REG"><field name="dualchannelout" value="0x1"/><field name="clkrateout" value="0x1"/></register></MAPS>
diff --git a/network/register_configgbe_mvd.db b/network/register_configgbe_mvd.db
index b868226..35a5633 100755
--- a/network/register_configgbe_mvd.db
+++ b/network/register_configgbe_mvd.db
@@ -14,6 +14,7 @@
   0xc020      0       0x8020        1            0        0xffffff         1
   0xc820      0       0xc820        1            0        0xffffff         1
   0xc010      0       0xc010        1            0        0xffffff         1
+  0xc030      0       0xc030        1            0        0xffffff         1
 
 
 #These values to not need to be written - for completeness only  
diff --git a/setup/ELwindow_readout.xml b/setup/ELwindow_readout.xml
index 0422641..918fc2e 100644
--- a/setup/ELwindow_readout.xml
+++ b/setup/ELwindow_readout.xml
@@ -67,7 +67,65 @@
     <JtagConf>trigger_init_sequence</JtagConf>
   </controller>
 
+ <controller id="0" address="d030" name="board02">
+    <chain id="0" name="chain0">
+      <sensor id="0000" 
+              serial="0"
+              name="sensorQ0"
+              config="sensorQ0.xml"
+              enabled="true">
+        <description>blah</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+	<CbConf
+	  EnaA="1"
+	  EnaD="1"
+	  DisA="0"
+	  DisD="0"
+	  SensorEn="1"
+	  JtagEn="1"
+	/> 
+      </sensor>
+      <sensor id="0001" 
+              serial="1"
+              name="sensorQ1"
+              config="sensorQ1.xml"
+              enabled="true">
+        <description>blah</description>
+        <position
+                x="0"
+                y="0"
+                z="0"
+                flippedx="false"
+                flippedy="false"
+                phi="0"
+                />
+	<CbConf
+	  EnaA="1"
+	  EnaD="1"
+	  DisA="0"
+	  DisD="0"
+	  SensorEn="1"
+	  JtagEn="1"
+	/> 
+      </sensor>
 
+      <JtagConf>delay0</JtagConf>
+      <JtagConf>set_timing_10mhz</JtagConf>
+      <JtagConf>set_inout</JtagConf>
+      <JtagConf>maps_reset_before_off</JtagConf>
+      <JtagConf>maps_reset_after_on</JtagConf>
+
+    </chain>
+    <JtagConf>waitbeforestart_6us</JtagConf>
+    <JtagConf>trigger_init_sequence</JtagConf>
+  </controller>
   
   
 </setup>
diff --git a/system/ELwindow.xml b/system/ELwindow.xml
index e972b91..6ca7d45 100644
--- a/system/ELwindow.xml
+++ b/system/ELwindow.xml
@@ -6,21 +6,17 @@
   <description>The config file for the Trb3 system close to the Window in the ELab</description>
 
   <daqopserver>jspc55:82</daqopserver>
-  <ccu address="c820" />
-  <hub address="c820" />
-  <!-- <roc address="d880" name="roc0" /> -->
-  <roc address="d823" name="roc0" />
-  <!-- <roc address="d822" name="roc0" /> -->
+  <cts address="c820" />
   <gbe address="c820" port="50820" name="central link" />
+  <gbe address="c030" port="50011" name="slave link" />
+  <hub address="c820">
+    <!-- <roc address="d880" name="roc0" /> -->
+    <!-- <roc address="d883" name="roc2" /> -->
+    <roc address="d823" name="roc1" />
+   
+  </hub>
+  <hub address="c030">
+    <roc address="d030" name="roc2" />
+  </hub>
   
 </system>
-
-
-
-
-
-
-
-
-
-
-- 
2.43.0