add downscale register to CTS GUI

diff --git a/web/CtsPlugins/CtsMod10.pm b/web/CtsPlugins/CtsMod10.pm
index 232d829236a454ae40feb01b99e29d32df48f828..fa6cce56fa439964b204a7943a5381aa12c5c1f5 100755 (executable)
--- a/web/CtsPlugins/CtsMod10.pm
+++ b/web/CtsPlugins/CtsMod10.pm
@@ -40,7 +40,7 @@ sub init {
           'label' => "Trigger Input Module Configuration $i"
         });
     }
-  } else {
+  } elsif ($cprop->{'trb_compiletime'} < 1680610367) {
     for(my $i = 0; $i < $header->{'len'}; $i++) {
         my $key = "trg_input_config$i";
         
@@ -58,6 +58,25 @@ sub init {
           'label' => "Trigger Input Module Configuration $i"
         });
     }
+  } else {
+    for(my $i = 0; $i < $header->{'len'}; $i++) {
+        my $key = "trg_input_config$i";
+        
+        $regs->{$key} = new TrbRegister($address + 1 + $i, $trb, {
+          'delay'     => {'lower' =>  0, 'len' => 6},
+          'spike_rej' => {'lower' =>  8, 'len' => 4},
+          'invert'    => {'lower' =>  12, 'len' => 1, 'type' => 'bool'},
+          'override'  => {'lower' =>  13, 'len' => 2, 'type' => 'enum', 'enum' => 
+                            {0 => 'off', 1 => 'to_low', 3 => 'to_high'}          
+                         },
+          'downscale' => {'lower' =>  16, 'len' => 4},    
+        }, {
+          'accessmode' => "rw",
+          'export'     => 1,
+          'monitor' => '1',
+          'label' => "Trigger Input Module Configuration $i"
+        });
+    }
   }
 
    for(my $i = 0; $i < $header->{'itc_len'}; $i++) {

diff --git a/web/htdocs/cts/cts.htm b/web/htdocs/cts/cts.htm
index fa466401c4bf872109da838e954ce5a9cc54c18f..e881752993a76fcc923374494fbb1a654655d931 100644 (file)
--- a/web/htdocs/cts/cts.htm
+++ b/web/htdocs/cts/cts.htm
@@ -169,6 +169,7 @@
                         <th class="delay">Delay</th>
                         <th class="spike"><abbr title="Noise reducing. High pulses shorter than this values are rejeted">Spike Rej.</abbr></th>
                         <th class="override">Override</th>
+                        <th class="downscale"><abbr title="only every 2**N pulse is forwarded">Downscale</a></th>
                      </tr>
                   </table>
             </div>
@@ -434,4 +435,4 @@
             
       
    </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/web/htdocs/layout/cts.css b/web/htdocs/layout/cts.css
index 8a3107a0c395b316fe068e637d18bc566647f0b4..ab1c97f2dd962392cb1992db2f4b5f3183519921 100644 (file)
--- a/web/htdocs/layout/cts.css
+++ b/web/htdocs/layout/cts.css
@@ -320,4 +320,8 @@
       border: 2px solid #ffff00;
       margin-bottom: 20px;
       display: none;
-   }
\ No newline at end of file
+   }
+
+   .noavail input{
+      visibility:hidden;
+      }

diff --git a/web/htdocs/scripts/cts.js b/web/htdocs/scripts/cts.js
index b53f54017ae156aeed02176a57a098f511f0feab..59533e51733aa696346ee81cafca17c59494765b 100644 (file)
--- a/web/htdocs/scripts/cts.js
+++ b/web/htdocs/scripts/cts.js
@@ -439,7 +439,9 @@ var CTS = new Class({
    renderTriggerInputs: function() {
       var source_from = this.defs.properties.trg_input_count - this.defs.properties.trg_inp_mux_count;
       var to = this.defs.properties.trg_input_count;
-      
+      var noavail = "";
+      if(this.defs.properties.trb_compiletime < 1680610367)
+        noavail = " noavail";
       for(var i=0; i < to; i++) {
          var reg = 'trg_input_config' + i;
          var areg = 'trg_input_mux' + (i-source_from);
@@ -478,7 +480,11 @@ var CTS = new Class({
                      new Element('option', {'value': 'to_low', 'text': '-> 0'}),
                      new Element('option', {'value': 'to_high', 'text': '-> 1'}),
                   ])
-               )
+               ),
+               new Element('td', {'class': 'downscale'+noavail})
+               .adopt([
+                  new Element('input', {'class': 'text autocommit autoupdate', 'slice': reg + '.downscale'})
+               ]),
             ])
          );