update CTS GUI

diff --git a/web/CtsPlugins/CtsMod15.pm b/web/CtsPlugins/CtsMod15.pm
index c9a52117989317fdc903ab490b1d5c01bd6a43e6..47d7778184d71b8b9c0818b0a31f942fedc5aed0 100755 (executable)
--- a/web/CtsPlugins/CtsMod15.pm
+++ b/web/CtsPlugins/CtsMod15.pm
@@ -54,12 +54,20 @@ sub init {
         $chanStart += 16;
       }
       
+      if ($cprop->{'trb_compiletime'} >= 1686567120) {
+        for(my $k=0; $k<4; $k++) {
+          for(my $l=0; $l<4; $l++) {
+            $regs->{$key}{'_defs'}{'input'}{'enum'}{$k*4+$l+$chanStart} = "fpga".$k."[$l]";
+            }
+        }
+        $chanStart += 16;
+      }
+
       if ($cprop->{'trb_compiletime'} >= 1416136409) {
         for(my $k=0; $k<16; $k++) {
           $regs->{$key}{'_defs'}{'input'}{'enum'}{$k+$chanStart} = "itc[$k]";
         }
       }
-
    }
    
 

diff --git a/web/htdocs/cts/cts.htm b/web/htdocs/cts/cts.htm
index e881752993a76fcc923374494fbb1a654655d931..faa20f4b289a1b3b1fd2a48947776009fe64cb4e 100644 (file)
--- a/web/htdocs/cts/cts.htm
+++ b/web/htdocs/cts/cts.htm
@@ -182,10 +182,10 @@
                <table id="periph-inp-tab">
                   <tr>
                      <th class="num">#</th>
-                     <th colspan="5">from FPGA 1</th>
-                     <th colspan="5">from FPGA 2</th>
-                     <th colspan="5">from FPGA 3</th>
-                     <th colspan="5">from FPGA 4</th>
+                     <th colspan="4">from FPGA 1</th>
+                     <th colspan="4">from FPGA 2</th>
+                     <th colspan="4">from FPGA 3</th>
+                     <th colspan="4">from FPGA 4</th>
                   </tr>
                </table>
             

diff --git a/web/htdocs/scripts/cts.js b/web/htdocs/scripts/cts.js
index 43a551b41ffb2275d009e9d4dd1dead5ec9a57e2..47ca8ea4262ebbdc95abfdde4bc14ce5abc04d4c 100644 (file)
--- a/web/htdocs/scripts/cts.js
+++ b/web/htdocs/scripts/cts.js
@@ -543,7 +543,7 @@ var CTS = new Class({
       tab.adopt(header = new Element('tr', {'class': 'snd_header'}));
       header.adopt(new Element('td'));
       for(var f=0; f < 4; f++) {
-         for(var i=4; i>=0; i--) {
+         for(var i=4; i>0; i--) {
             header.adopt(
                new Element('td', {'class': 'slice' + i}).adopt(
                   new Element('abbr', {'text': i-1, 'title': 'mapped to FPGA' + (f+1) + '_COMM(' + (i+6) + ')' + (i?'': ' - not accessible by most frontends')})
@@ -557,7 +557,7 @@ var CTS = new Class({
          row.adopt(new Element('td', {'text': pt, 'class': 'num'}));
          
          for(var f=0; f<4; f++) {
-            for(var i=4; i>=0; i--) {
+            for(var i=4; i>0; i--) {
                var bit = (5*f + i);
                   row.adopt(new Element('td', {'class': 'slice' + i}).adopt(new Element('input', {
                      'class': 'autoupdate autocommit', 'type': 'checkbox',