From 3c64fec10b128185c828757dc040b13b80ca7b91 Mon Sep 17 00:00:00 2001 From: Ludwig Maier Date: Wed, 23 Apr 2014 22:24:43 +0200 Subject: [PATCH] nxyter regs update --- web/htdocs/nxyter/index.pl | 2 +- xml-db/database/Nxyter.xml | 91 +++++++++++++++++++------------------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl index 097cfba..653c416 100755 --- a/web/htdocs/nxyter/index.pl +++ b/web/htdocs/nxyter/index.pl @@ -40,7 +40,7 @@ $setup[2]->{period} = -1; $setup[2]->{address} = 1; $setup[3]->{name} = "TriggerHandler"; -$setup[3]->{cmd} = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse&Nxyter-0xfe49-EventBuffer"; +$setup[3]->{cmd} = "Nxyter-0xfe49-TriggerHandler"; $setup[3]->{period} = -1; $setup[3]->{address} = 1; diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml index 7a7dfbb..820f969 100644 --- a/xml-db/database/Nxyter.xml +++ b/xml-db/database/Nxyter.xml @@ -10,7 +10,7 @@ + address="0160" size="6" purpose="config" mode="rw" continuous="true"> Enable test pulse @@ -18,39 +18,32 @@ - Delay of the testpulse after Trigger + Delay of the Testpulse after Trigger - - Accepted incoming Trigger Rate - + + Length of Trigger TestPulse + - + Invalid Timing Trigger counter - - - - - - - - Length of Trigger TestPulse - + + Accepted incoming Trigger Rate (Hz) + - - Testpulse Rate - + + Outgoing Testpulse Rate (Hz) + - - - + + + + Status of Error Bits - - - - - - - - - + + + + + + + + + + + + Reset Busy Status, Click to force reset - - - + + + - + Merge of Nxyter and ADC Frame Rates, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> - + Nxyter Timestamp Frame Rate, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> @@ -282,7 +279,7 @@ Delay of Timestamp Fifo - + @@ -318,14 +315,14 @@ - + ADC Data Rate Error Counter - + - + Timestamp Data Rate Error Counter - + @@ -375,15 +372,17 @@ - + Average of last Token Return ADC Values - + - - ADCTR Mean - + + + Parity Error Counter + + ADCTR Limit -- 2.43.0