From: Cahit Ugur <c.ugur@gsi.de>
Date: Fri, 1 Mar 2013 08:01:22 +0000 (+0100)
Subject: Extra registers added to the tdc.htm - cu
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=6fb758e339f9169a617c53da11eddc5570681b73;p=daqtools.git

Extra registers added to the tdc.htm - cu
---

diff --git a/web/htdocs/tdc/tdc.htm b/web/htdocs/tdc/tdc.htm
index a107e7d..f50933a 100644
--- a/web/htdocs/tdc/tdc.htm
+++ b/web/htdocs/tdc/tdc.htm
@@ -50,14 +50,15 @@ var showenable = document.getElementById("form_enable").checked;
 var oldvalues = {};
 
 
-var reglist = "0-c100-c103-c104-c105-c106-c107-c108-c109-c10a-c10b-c10c-c10d-c10f-c110-c0-c2-c3";
+var reglist = "0-c100-c103-c104-c105-c106-c107-c108-c109-c10a-c10b-c10c-c10d-c10f-c110-c111-c112-c0-c2-c3";
 //var reglist = "0-80-83-84-85-86-87-88-89-8a-8b-8c-8d-8f-90-c0-c2-c3";
 
 var regs = reglist.split('-');
-var regnames = new Array("Temperature","debug<br>channels<br>ref input","window bef.<br>window aft.",
+var regnames = new Array("Temperature","debug_wr<br>debug_rd<br>channels<br>ref input","window en.<br>window bef.<br>window aft.",
                          "valid trg","valid tmg trg","valid notmg","invalid trg","multi trg",
                          "spurious trg","wrong rdo","spikes","idle time","wait time",
-                         "releases","rdo time","basic ctrl","act chan 1","act chan 2");
+                         "releases","rdo time","timeout number","data finished number","Logic Anal.<br>Debug Mode<br>Run Mode",
+			 "act chan 1","act chan 2");
 
 var updateTask;
 var updateRegsTask;
@@ -193,7 +194,7 @@ function updateregs(data) {
       o += "<th>"+c[j][0];
     } 
   
-  for(i = 0; i < 18; i++) {
+  for(i = 0; i < 20; i++) {
     o += "<tr class=\""+(i%2?"odd":"even")+"\"><th>"+regs[i]+"<td>"+regnames[i];
 
     
@@ -205,7 +206,7 @@ function updateregs(data) {
           o += ((val>>20)/16).toFixed(1);
           }
         else if(i==1) {
-          o += (val&0xFF).toString(16)+"<br>"+((val&0xff00)>>8)+"<br>";
+          o += (val&0xF).toString(16)+"<br>"+((val&0xF0)>>4).toString(16)+"<br>"+((val&0xff00)>>8)+"<br>";
           if((val>>16 & 1)) 
             o += "<span class=\"over\" style=\"background:#faa;display:block;width:100%;float:right\">";
           o += (val>>16 & 1);
@@ -213,12 +214,19 @@ function updateregs(data) {
             o += "</span>";
           }
         else if(i==2) {
-          o += (val&0x7FF)+"<br>"+((val&0x7ff0000)>>16);
+          o += ((val&0x80000000)>>31)+"<br>"+(val&0x7FF)+"<br>"+((val&0x7ff0000)>>16);
           }
-        else if(i==17 || i==16 || i==15) {
-          o += (val*1).toString(16);
-          if(i==16) enableGroup[j][0] = val*1.;
-          if(i==17) enableGroup[j][1] = val*1.;
+	else if(i==17) {
+          o += (val&0xF)+"<br>"+((val&0x10)>>4)+"<br>";
+	  if((val>>12 & 1))
+	    o += "Triggerless";
+	  else
+	    o += "Triggered";
+          }
+	else if(i==18 || i==19) {
+          o += (val*1.).toString(16);
+          if(i==18) enableGroup[j][0] = val*1.;
+          if(i==19) enableGroup[j][1] = val*1.;
           }
         else {
           o += val;