]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
*** empty log message ***
authorhadeshyp <hadeshyp>
Wed, 28 Nov 2012 19:05:32 +0000 (19:05 +0000)
committerhadeshyp <hadeshyp>
Wed, 28 Nov 2012 19:05:32 +0000 (19:05 +0000)
cts/htdocs/thresh/getpadiwa.pl
cts/htdocs/thresh/padiwa.htm
cts/htdocs/thresh/scripts.js

index c41384a706fd3433cdb3bbef251b5456dd86a6ef..3d882e70bd31130261aeceaa691ab2b3e7bf7ab1 100755 (executable)
@@ -40,6 +40,12 @@ for(my $i=0; $i < 4; $i++) {
     $ret->[$i*4+2] = sendcmd(0x10020000,$i);
     $ret->[$i*4+3] = sendcmd(0x10030000,$i);
     }
+  elsif ($task eq "thresh") {
+    $num = 16;
+    for(my $j=0;$j<16;$j++) {
+      $ret->[$i*16+$j] = sendcmd(0x00000000+$j*0x10000,$i);
+      }
+    }
   }
 
 
index 1ad5cdd3c28fe8c50b0c3215d7bdf799a1b8c7c5..3dc5506898d454457aec6e6658aaab973a65e30d 100644 (file)
@@ -14,7 +14,7 @@
 <table class="form"><tr class="head"><th colspan=2>Configuration
 <tr><td>Board<td><input onChange="setValues()" type="text" id="form_board" name="board" maxlength="4" value="fe48">
 <tr><td>Update Interval (ms)<td><input onChange="setValues()" type="text" id="form_rate" name="rate" maxlength="6" value="10000">
-<tr><td>Option<td><select onChange="setValues()" id="form_option" name="option"><option value="temp">Temperature<option value="id">ID</select>
+<tr><td>Option<td><select onChange="setValues()" id="form_option" name="option"><option value="temp">Temperature<option value="id">ID<option value="thresh">Thresholds</select>
 <tr><td>Min/Max<td><input onChange="setValues()" type="text" id="form_min" name="min" maxlength="6" value="10"><input onChange="setValues()" type="text" id="form_max" name="max" maxlength="6" value="80">
 <tr><td><td><input type="button" onClick="setValues()" value="OK">
 </table>
@@ -68,6 +68,14 @@ function update(data) {
         if(c[j][(i-1)*4+1].substr(2,2) != "28") val = "---";
         o += "<td class=\"fixed\">"+(val);
         }
+      else if(option == "thresh") {
+        o += "<td>";
+        for(k=1;k<=16;k++) {
+          val = c[j][(i-1)*16+k] & 0xffff;
+          if(val == 0 || val == 0xffff) val = "---";
+          o += "<span  style=\"background:"+findcolor(val,0,65536,0)+"\">"+(val.toString(16))+"</span><br>";
+          }
+        }
       }
     }
   document.getElementById("content").innerHTML  = o;
index 46ed40ecd2fb9a0d35e566bdf365c29fae8d5428..ee458dc4cd27e8c6ec07b8bfaf74ad485d043a74 100644 (file)
@@ -42,9 +42,7 @@ function findcolor(v,min,max,lg) {
 
 
   if (v == 0 || v<min) {
-    r = 220;
-    g = 220;
-    b = 220;
+    return "transparent";
   } else {
     v -= min;
     if (step) {