From 794200f26eb368f93ea0bcd59dcb511adfa84da1 Mon Sep 17 00:00:00 2001 From: Manuel Penschuck Date: Mon, 15 Dec 2014 22:41:17 +0100 Subject: [PATCH] CTS-Gui: Added JTTL selection for AddOn-Input Mux --- web/CtsPlugins/CtsMod15.pm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/web/CtsPlugins/CtsMod15.pm b/web/CtsPlugins/CtsMod15.pm index d5c10ab..557c6c7 100755 --- a/web/CtsPlugins/CtsMod15.pm +++ b/web/CtsPlugins/CtsMod15.pm @@ -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]"; } } -- 2.43.0