]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
CTS-Gui: Added JTTL selection for AddOn-Input Mux
authorManuel Penschuck <manuel.penschuck@stud.uni-frankfurt.de>
Mon, 15 Dec 2014 21:41:17 +0000 (22:41 +0100)
committerManuel Penschuck <manuel.penschuck@stud.uni-frankfurt.de>
Mon, 15 Dec 2014 21:41:17 +0000 (22:41 +0100)
web/CtsPlugins/CtsMod15.pm

index d5c10abc48f6bcfcaea7db758603eaf05d780b39..557c6c72a56e470ff08e78c8c76169fe7945b3e1 100755 (executable)
@@ -6,6 +6,7 @@ package CtsMod15;
 use warnings;
 use strict;
 use TrbRegister;
+use Data::Dumper;
 
 sub moduleName {"AddOn Input Multiplexer"}
 
@@ -17,8 +18,8 @@ sub init {
    
    my $regs = $self->{'_registers'};
    my $prop = $self->{'_properties'};
+   
    my $cprop = $self->{'_cts'}{'_properties'};
-
    my $header = $self->{'_cts'}{'_enum'}{0x15}->read();
 
    print "Trigger Modules 0x12 and 0x15 cannot be instantiated in the same design\n" if exists $self->{'_cts'}{'_enum'}{0x12};
@@ -44,10 +45,18 @@ sub init {
          'monitor' => '1',
          'label' => "Input Multiplexer $i"
       });
-   
-      if ($prop->{'trb_compiletime'} => 1416136409) {
+      
+      my $chanStart = 22;
+      if ($cprop->{'trb_compiletime'} >= 1418678509) {
+        for(my $k=0; $k<16; $k++) {
+          $regs->{$key}{'_defs'}{'input'}{'enum'}{$k+$chanStart} = "jttl[$k]";
+        }
+        $chanStart += 16;
+      }
+      
+      if ($cprop->{'trb_compiletime'} >= 1416136409) {
         for(my $k=0; $k<16; $k++) {
-          $regs->{$key}{'_defs'}{'input'}{'enum'}{$k+22} = "itc[$k]";
+          $regs->{$key}{'_defs'}{'input'}{'enum'}{$k+$chanStart} = "itc[$k]";
         }
       }