From: Jan Michel <j.michel@gsi.de>
Date: Mon, 28 Oct 2019 14:25:54 +0000 (+0100)
Subject: new CTS module for RJ-adapter on TRB3sc
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=fbb5a197fa5e66f06f1a7a4f9e9988c70019d6cf;p=daqtools.git

new CTS module for RJ-adapter on TRB3sc
---

diff --git a/web/CtsPlugins/CtsMod17.pm b/web/CtsPlugins/CtsMod17.pm
index 82c82cc..a9808ae 100644
--- a/web/CtsPlugins/CtsMod17.pm
+++ b/web/CtsPlugins/CtsMod17.pm
@@ -20,7 +20,7 @@ sub init {
    my $prop = $self->{'_properties'};
    
    my $cprop = $self->{'_cts'}{'_properties'};
-   my $header = $self->{'_cts'}{'_enum'}{0x16}->read();
+   my $header = $self->{'_cts'}{'_enum'}{0x17}->read();
 
    print "Trigger Modules 0x12 and 0x17 cannot be instantiated in the same design\n" if exists $self->{'_cts'}{'_enum'}{0x12};
    
@@ -30,17 +30,20 @@ sub init {
       
       $regs->{$key} = new TrbRegister($address + 1 + $i, $trb, {
          'input'  => {'lower' =>  0, 'len' => 7, 'type' => 'enum', 'enum' => 
-            { 0  => 'A[0]', 1  => 'A[1]',
-              2  => 'B[0]', 3  => 'B[1]',
-              4  => 'C[0]', 5  => 'C[1]',
-              6  => 'D[0]', 7  => 'D[1]',
-              8  => 'E[0]', 9  => 'E[1]',
-              10 => 'F[0]', 11 => 'F[1]',
-              12 => 'G[0]', 13 => 'G[1]',
-              14 => 'H[0]', 15 => 'H[1]',
-              16 => 'I[0]', 17 => 'I[1]',
+            {
+              0 => 'trig_rj[3]', 1 => 'trig_rj[4]', 
+              2  => 'A[0]', 3   => 'A[1]',
+              4  => 'B[0]', 5  => 'B[1]',
+              6  => 'C[0]', 7  => 'C[1]',
+              8  => 'D[0]', 9  => 'D[1]',
+              10 => 'G[0]', 11 => 'G[1]',
+              12 => 'H[0]', 13 => 'H[1]',
+              14 => 'I[0]', 15 => 'I[1]',
+              16 => 'J[0]', 17 => 'J[1]',
+              18 => 'X[0]', 19 => 'X[1]',
+              20 => 'X[2]', 21 => 'X[3]',
               
-              18 => 'int_trg[0]', 19 => 'int_trg[1]'
+              22 => 'int_trg[0]', 23 => 'int_trg[1]'
             }
          }
       }, {