From 36e6b04d3c3e0b63ec263efa675ff9b6909ff9a1 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Fri, 26 Apr 2019 14:14:28 +0200 Subject: [PATCH] trigger GUI: Include KEL connector for TRB3sc master --- web/htdocs/network/trigger.pl | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/web/htdocs/network/trigger.pl b/web/htdocs/network/trigger.pl index 800ace4..e18e69b 100755 --- a/web/htdocs/network/trigger.pl +++ b/web/htdocs/network/trigger.pl @@ -146,7 +146,21 @@ sub makeinputbitsslice { return $o; } + +sub makemasterkel { + my ($data,$outp) = @_; + my $o = ""; + my $val = ($data->{$outp*4}>>22) | ($data->{$outp*4+1} << 10); + + my $tmp = sprintf("%016b",$val & 0xFFFF); + $tmp = convbox($tmp,0); + $o .= $tmp."
"; + $tmp = sprintf("%016b",$val>>16 & 0xFFFF); + $tmp = convbox($tmp,0); + $o .= $tmp; + + } sub makemasterbits { my ($d,$i,$s,$t) = @_; #data,slot,output,type @@ -179,8 +193,12 @@ sub gettable { my $b = $boards->[0]; if($i==4) { - $out .= sprintf("0x%4x",$b); - if ($data->{$boards->[0]}{0x33} != 0) { + $out .= sprintf("0x%4x",$b); + $out .= "".makemasterkel($data->{$b},0); + $out .= "".makemasterkel($data->{$b},1); + + $out .= ""; + if ($data->{$b}{0x33} != 0) { $out .= "mult >=".(($data->{$boards->[0]}{0x32} >> 16)&0xFF)." "; $out .= "".(($data->{$b}{0x34} & (1 << 8))?'◼':'◻')." "; $out .= "".(($data->{$b}{0x34} & (9 << 9))?'◼':'◻')." "; -- 2.43.0