]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
*** empty log message ***
authorhadeshyp <hadeshyp>
Fri, 19 Oct 2012 15:46:11 +0000 (15:46 +0000)
committerhadeshyp <hadeshyp>
Fri, 19 Oct 2012 15:46:11 +0000 (15:46 +0000)
cts/htdocs/thresh/styles.css
cts/htdocs/thresh/tdc.htm
cts/htdocs/thresh/threshold.htm

index f0ffbfca19feb12eb1e4e3463ed778ff4e24c6f4..3d1fb38585d1798f7cd642f76beca186c9cd809c 100644 (file)
@@ -96,4 +96,110 @@ div#bar2 div {
 .head {
   background:#333;
   color:#eef;
-}
\ No newline at end of file
+}
+
+
+
+/*
+body {
+    background:#444;
+    font-size:10pt;
+    margin:50px 0 0 15px;
+    padding:0;
+    color:#ddd;
+}
+
+h2 {
+  position:absolute;
+  width:100%;
+  top:-15px;
+  left:0px;
+  background:#555;
+  border-bottom:1px solid #ccc;
+  padding:10px 0 5px 10px;
+}
+
+table.form {
+  border:1px solid #777;
+  padding:0;
+  background:#666;
+  margin-bottom:20px;
+  border-collapse:collapse;
+}
+
+table.form td {
+  padding:2px 10px;
+}
+
+.form input {
+  background:#444;
+  color:#ddd;
+  border-color:#777;
+}
+
+table#content, table#contentregs {
+ border:1px solid #777; 
+ margin:0 20px 20px 0;
+ border-collapse:collapse;
+}
+
+table#contentregs td:first-child, table#contentregs th:first-child,
+table#content td:first-child, table#content th:first-child{
+  width:40px;
+  padding-right:0px;
+  text-align:center;
+}
+
+
+
+table#content td, table#content th, table#contentregs td, table#contentregs th{
+ border:1px solid #777; 
+ width:100px;
+ text-align:right;
+ padding-right:15px;
+}
+
+
+div#bar1 {
+  width:900px;
+  overflow-x:scroll;
+  }
+  
+div#bar1 div {
+  width:66500px;
+  height:0px;
+}
+
+div#bar2 {
+  width:900px;
+  overflow-x:scroll;
+  }
+  
+div#bar2 div {
+  width:65536px;
+  height:0px;
+}
+
+
+#total {
+  text-align:center;
+  font-weight:bold;
+  }
+
+  
+.odd {
+  background:#555;
+}
+
+.odd:hover, .even:hover {
+  background:#664;
+}
+
+.even {
+  background:#333;
+}
+
+.head {
+  background:#aaa;
+  color:#000;
+}
index a920e833c7dc68ceff1a2c87d0e130b19716930e..3ee87a054a48b81898bd83e5c890e752ff7c91cb 100644 (file)
@@ -11,7 +11,7 @@
 
 <h2>Hit Counters &amp; TDC Registers</h2>
 <form acion="">
-<table class="form"><tr class="head"><th colspan=2>Settings
+<table class="form"><tr class="head"><th colspan=2>Configuration
 <tr><td>Board<td><input type="text" id="form_board" name="board" maxlength="4" value="ffff">
 <tr><td># of Channels<td><input type="text" id="form_channels" name="channels" maxlength="3" value="65">
 <tr><td>Update Interval (ms)<td><input type="text" id="form_rate" name="rate" maxlength="5" value="1000">
index ba5f2fc93a032d4cbfa8c8b16b2278b3b0cc9193..576bfa3f4535edea7c616e62d66629602f42cc08 100644 (file)
@@ -8,29 +8,30 @@
 </head>
 <body>
 
-<h4>Threshold Settings</h4>
+<h2>Threshold Settings</h2>
 <form acion="">
-<table><tr><td>Board:<td><input type="text" id="form_board" name="board" maxlength="4" value="fccc">
+<table class="form"><tr class="head"><th colspan="2">Configuration<tr><td>Board:<td><input type="text" id="form_board" name="board" maxlength="4" value="fccc">
 <tr><td>DAC-Chain:<td><select id="form_chain" name="chain"><option>0<option>1<option>2<option>3<option>4<option>5<option>6<option>7<option>8<option>9<option>10<option>11<option>12<option>13<option>14<option>15</select>
 <tr><td>Channel<td><select id="form_channel" name="channel"><option>0<option>1<option>2<option>3<option>4<option>5<option>6<option>7<option>8<option>9<option>10<option>11<option>12<option>13<option>14<option>15</select>
+<tr><td>Board Type<td><select id="form_type" name="chain"><option value='3' selected>LTC242x DAC<option value='8'>Padiwa SPI</select>
 <tr><td>Update Interval (ms)<td><input type="text" id="form_rate" name="rate" maxlength="5" value="500">
 <tr><td>Reference (mV)<td><input type="text" id="form_ref" name="reference" maxlength="4" value="2500">
 <tr><td><td><input type="button" onClick="setValues()" value="OK">
 </table>
 </form>
 
-<table><tr><td>
+<table><tr><td>Coarse (0-65535)<td>
 <div id="bar1"  onScroll="update(1,1)">
 <div>&nbsp;</div>
 </div>
 <td id="bar1value">
-<tr><td><div id="bar2"  onScroll="update(2,256)">
+<tr><td>Fine (0-255)<td><div id="bar2"  onScroll="update(2,256)">
 <div>&nbsp;</div>
 </div>
 <td id="bar2value">
-<tr><td id="total">&nbsp;<td>&nbsp;
-<tr><td id="cmd">&nbsp;<td>&nbsp;
-<tr><td id="err">&nbsp;<td>&nbsp;
+<tr><td id="total" colspan="3">&nbsp;
+<tr><td id="cmd" colspan="3">&nbsp;
+<tr><td id="err" colspan="3">&nbsp;
 </table>
 
 <script language="javascript">
@@ -43,6 +44,7 @@ var updaterate = document.getElementById("form_rate").value;
 var board      = document.getElementById("form_board").value;
 var chain      = 1<<document.getElementById("form_chain").value;
 var chan       = document.getElementById("form_channel").value;
+var type       = document.getElementById("form_type").value;
 var reference  = document.getElementById("form_ref").value;
 var updateTask = setInterval("doUpdate()",updaterate);
 
@@ -52,7 +54,7 @@ function update(bar,scale) {
   document.getElementById("bar"+bar+"value").innerHTML = value[bar-1];
   total = Math.min(value[0]+value[1],65535);
   document.getElementById("total").innerHTML = total+" - "+Math.round(total/655.36*reference)/100+" mV";
-  command = 0x00300000 + (chan << 16) + (total);
+  command = (type << 20) + (chan << 16) + (total);
   command = command.toString(16);
   dataWaiting = 1;
   if(updateTask == 0) {  
@@ -83,6 +85,7 @@ function setValues() {
   board      = document.getElementById("form_board").value;
   chain      = 1<<document.getElementById("form_chain").value;
   chan       = document.getElementById("form_channel").value;
+  type       = document.getElementById("form_type").value;
   reference  = document.getElementById("form_ref").value;
   clearInterval(updateTask);
   updateTask = setInterval("doUpdate()",updaterate);