From 060489444e9d5e2be8e0766ee5e59dd5699e1773 Mon Sep 17 00:00:00 2001
From: Jan Michel <j.michel@gsi.de>
Date: Wed, 4 Mar 2020 10:10:56 +0100
Subject: [PATCH] add new trigger outputs on TRB3 to GUI

---
 web/htdocs/network/trigger.pl | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/htdocs/network/trigger.pl b/web/htdocs/network/trigger.pl
index e18e69b..994620d 100755
--- a/web/htdocs/network/trigger.pl
+++ b/web/htdocs/network/trigger.pl
@@ -167,13 +167,14 @@ sub makemasterbits {
   my $o = "";
   
   if($t eq 'trb3sc') {
-    $o .= "<font style=\"color:red\" title=\"for output 1\">".(($d->{0} & (1<<($i*2+$s)))?'&#x25fc':'&#x25fb')."</font> ";
-    $o .= "<font style=\"color:blue\" title=\"for output 2\">".(($d->{4} & (1<<($i*2+$s)))?'&#x25fc':'&#x25fb')."</font><br>";
+    $o .= "<font style=\"color:red\" title=\"for output 1\">".(($d->{0} & (1<<($i*2+$s)))?'&#x278a':'&#x25fb')."</font> ";
+    $o .= "<font style=\"color:blue\" title=\"for output 2\">".(($d->{4} & (1<<($i*2+$s)))?'&#x278b':'&#x25fb')."</font><br>";
     $o .= "<font style=\"color:#0a0\" title=\"for mult\">".(($d->{0x33} & (1<<($i*2+$s)))?'&#x25fc':'&#x25fb')."</font><br>";
   }
   if($t eq 'trb3') {
-    $o .= "<font style=\"color:red\" title=\"for output 1\">".(($d->{0} & (1<<($i*4+$s)))?'&#x25fc':'&#x25fb')."</font> ";
-    $o .= "<font style=\"color:blue\" title=\"for output 2\">".(($d->{4} & (1<<($i*4+$s)))?'&#x25fc':'&#x25fb')."</font><br>";
+    $o .= "<font style=\"color:red\" title=\"for output 1\">".(($d->{0} & (1<<($i*4+$s)))?'&#x278a':'&#x25fb')."</font> ";
+    $o .= "<font style=\"color:blue\" title=\"for output 2\">".(($d->{4} & (1<<($i*4+$s)))?'&#x278b':'&#x25fb')."</font><br>";
+    $o .= "<font style=\"color:orange\" title=\"for output 3\">".(($d->{8} & (1<<($i*4+$s)))?'&#x278c':'&#x25fb')."</font> ";
     $o .= "<font style=\"color:#0a0\" title=\"for mult\">".(($d->{0x33} & (1<<($i*4+$s)))?'&#x25fc':'&#x25fb')."</font><br>";
   }
   return $o;
@@ -201,7 +202,7 @@ sub gettable {
         if ($data->{$b}{0x33} != 0) {
           $out .= "mult >=".(($data->{$boards->[0]}{0x32} >> 16)&0xFF)." ";
           $out .= "<font style=\"color:red\" title=\"for output 1\">".(($data->{$b}{0x34} & (1 << 8))?'&#x25fc':'&#x25fb')."</font> ";
-          $out .= "<font style=\"color:blue\" title=\"for output 21\">".(($data->{$b}{0x34} & (9 << 9))?'&#x25fc':'&#x25fb')."</font> ";
+          $out .= "<font style=\"color:blue\" title=\"for output 2\">".(($data->{$b}{0x34} & (9 << 9))?'&#x25fc':'&#x25fb')."</font> ";
 #           $out .= sprintf("on outputs %04b",($data->{$b}{0x34} >> 8));
           }
         }
@@ -278,13 +279,14 @@ sub gettable {
     if ($data->{$boards->[0]}{0x33} != 0) {
       $out .= "mult >=".(($data->{$boards->[0]}{0x32} >> 16)&0xFF)." ";
       $out .= "<font style=\"color:red\" title=\"for output 1\">".(($data->{$b}{0x34} & (1 << 8))?'&#x25fc':'&#x25fb')."</font> ";
-      $out .= "<font style=\"color:blue\" title=\"for output 21\">".(($data->{$b}{0x34} & (9 << 9))?'&#x25fc':'&#x25fb')."</font> ";
+      $out .= "<font style=\"color:blue\" title=\"for output 2\">".(($data->{$b}{0x34} & (9 << 9))?'&#x25fc':'&#x25fb')."</font> ";
 #           $out .= sprintf("on outputs %04b",($data->{$b}{0x34} >> 8));
       }
      
     $out .= "</table>";  
-    $out .= qq#<table><tr><th>Red<td>selected in 'or' for output 1 on master board
-                   <tr><th>Blue<td>selected in 'or' for output 2 on master board
+    $out .= qq#<table><tr><th>Red<td>selected in 'or' for output 1 on central FPGA (TRG3)
+                   <tr><th>Blue<td>selected in 'or' for output 2 on central FPGA (CLK3)
+                   <tr><th>Orange<td>selected in 'or' for output 3 central FPGA (CLK4)
                    <tr><th>Green<td>selected for multiplicity logic
                    <tr><th>Black<td>Enabled in 'or'
                    <tr><th>Generic<td>The generic tab only works for TRB3 central and TRB3sc crate master FPGA!
-- 
2.43.0