From c250e6b63ab7fe85f8271e053f52fa25292d52f5 Mon Sep 17 00:00:00 2001 From: Cahit Ugur Date: Thu, 30 Jan 2014 16:57:26 +0100 Subject: [PATCH] Text input for the trigger window in the TDC Registers is implemented. --- web/htdocs/layout/styles.css | 6 ++++++ web/htdocs/tdc/tdc.htm | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/web/htdocs/layout/styles.css b/web/htdocs/layout/styles.css index 45bbb6a..2f979db 100644 --- a/web/htdocs/layout/styles.css +++ b/web/htdocs/layout/styles.css @@ -202,6 +202,12 @@ input.small { margin-right:-6px; } +input.smaller { + width:65px; + text-align:right; + margin-right:2px; +} + #form_rate, #form_rate2, #form_min, #form_max { width: 89px; } diff --git a/web/htdocs/tdc/tdc.htm b/web/htdocs/tdc/tdc.htm index 7be2736..95d81b1 100644 --- a/web/htdocs/tdc/tdc.htm +++ b/web/htdocs/tdc/tdc.htm @@ -222,6 +222,19 @@ function setDataLimit(e,board) { getdata("../commands/put.pl?"+board+"-"+reg.toString(16)+"-"+(value*1.).toString(16),0); settimers(200,50); } + +function setTriggerWindow(e,board,val) { + reg = 0xc801; + preTrigger = 0x7FF; + postTrigger = 0x7FF0000; + value = (e.value)/5; + if(val==0) + getdata("../commands/putbitrange.pl?"+board+"-"+reg.toString(16)+"-"+preTrigger.toString(16)+"-"+(value*1.).toString(16),0); + else + getdata("../commands/putbitrange.pl?"+board+"-"+reg.toString(16)+"-"+postTrigger.toString(16)+"-"+(value*65536.).toString(16),0); + + settimers(200,50); + } function updatestatregs(data) { @@ -312,7 +325,13 @@ function updatectrlregs(data) { o += "Enabled"; else o += "Disabled"; - o += "
"+(val&0x7FF)*5+" ns"+"
"+((val&0x7ff0000)>>16)*5+" ns"; + preWindow = (val&0x7FF)*5; + postWindow = ((val&0x7FF0000)>>16)*5; + o += "
"+""+"ns"+ + "
"+""+"ns"; + + + } else if(i==2 || i==3) { o += (val*1.).toString(16); -- 2.43.0