From fb0c13d75672aaadca9bdeac4ab89a4cab81f8f9 Mon Sep 17 00:00:00 2001 From: Ludwig Maier Date: Mon, 7 Apr 2014 22:26:01 +0200 Subject: [PATCH] nxyter update registers --- web/htdocs/nxyter/index.pl | 4 +- xml-db/database/Nxyter.xml | 320 ++++++++++++++++++------------------- 2 files changed, 155 insertions(+), 169 deletions(-) diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl index 8c05cd8..097cfba 100755 --- a/web/htdocs/nxyter/index.pl +++ b/web/htdocs/nxyter/index.pl @@ -24,8 +24,8 @@ $page->{link} = "../"; my @setup; -$setup[0]->{name} = "Control"; -$setup[0]->{cmd} = "Nxyter-0xfe49-NXControl&Nxyter-0xfe49-ADCMonitor"; +$setup[0]->{name} = "Status"; +$setup[0]->{cmd} = "Nxyter-0xfe49-NXStatus&Nxyter-0xfe49-ADCMonitor"; $setup[0]->{period} = -1; $setup[0]->{generic} = 1; diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml index 7770fde..8e6aafa 100644 --- a/xml-db/database/Nxyter.xml +++ b/xml-db/database/Nxyter.xml @@ -186,17 +186,12 @@ - + - + - - Merge of Nxyter and ADC Frame Rates, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> - - - - + address="0500" size="20" purpose="status" mode="rw" continuous="true"> + Status of Error Bits @@ -209,97 +204,108 @@ - + 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> + - - reset Timeout Flag - + + ADC Data Frame Rate, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> + - - + + Reset Handler Counter - - Current Timestamp Value read from Fifo - + + ADC Reset counter + - - - Status of the timestamp Fifo - - - Timestamp Fifo full - - - - Timestamp Fifo Empty - - - - Timestamp Fifo Almost Empty - - - - Synchronized to Nxyter Frame - - - - - Number of Resyncs - + + + Parity Error Rate, must be 0, &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> - + + ADC Handler not Lock Counter + + + + + Frames Merge Error Counter + + + + + Number of Resyncs + - + Number of Parity Errors - - + + ADC Sampling PLL Clock Not Lock Counter - - - johnson_counter_sync (experts only) - - - - + + PLL ADC Sampling Clock DPHASE - + PLL ADC Sampling Clock FINEDELB - - - Current ADC raw value - - - - - ADC Reset counter - + + + johnson_counter_sync (experts only) + - - + + Delay of Timestamp Fifo + + + Status of the timestamp Fifo + + + Timestamp Fifo full + + + + Timestamp Fifo Empty + + + + Timestamp Fifo Almost Empty + + + + Synchronized to Nxyter Frame + + - + ADC Bit Shift @@ -310,120 +316,100 @@ - - ADC Frame Not Lock Counter - + + Current Timestamp Value read from Fifo + - - Nxyter Timestamp Frame Rate, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> - - - - - ADC Data Frame Rate, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> - - - - - ADC Test Channel Value - - - + address="0120" size="16" purpose="status" mode="r" continuous="true"> - + Total hit rate summed over all channels - - + + Rate of Incoming Nxyter + ADC Frames, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> - + Pileup Rate - - + + Overflow Rate - - - Number of invalid frames - - - - - Average of last valid ADC Values - - - - + + Number of Averages, power of two (2^n) - - - Average of last Token Return ADC Values - + + + Average of last valid ADC Values + - - + + ADCTR Error Status - - + + ADCTR Error Rate - - ADCTR Error Counter - + + Average of last Token Return ADC Values + - - + + ADCTR Mean - + ADCTR Limit + + + ADCTR Error Counter + + - - Reserved - + + Pileup Counter + - + Number of hit overflows - - Pileup Counter - + + Number of invalid frames + - - + + Reserved - + - + - + I2C Online, i.e. Nxyter is connected - + @@ -485,7 +471,7 @@ - + 16: Gate Voltage Preamplifier Current Sink (Vcg) @@ -555,12 +541,12 @@ - + 32: Configuration Register #1 @@ -601,12 +587,12 @@ Nxyter Testpulse Channel Group (0=0,4,.. 1=1,5,.. 2=2,6,.. 3=3,7,..) - + 38: Testpulse Delay @@ -616,13 +602,13 @@ 39: Test Trigger Delay - - + + 43..45: Clock Delay Registers @@ -633,7 +619,7 @@ Update Nxyter I2C Register - + Update Nxyter DAC Register @@ -656,12 +642,12 @@ Channel Down - + DAC Trim Value - + @@ -732,7 +718,7 @@ - @@ -747,18 +733,18 @@ - + Nxyter I2C Online Status - + - - Nxyter Offline Status - + + Nxyter Online Status + - - Nxyter Main Clock Lock (250 MHz) + + Nxyter Main Clock Lock (250 MHz), click to reset @@ -856,7 +842,7 @@ - + @@ -869,7 +855,7 @@ address="0a00" size="128" purpose="config" mode="r" continuous="true"> Continuous Overflow Counter per Channel - + @@ -879,7 +865,7 @@ ADC Value Average per Channel - + Number of Averages per Channel, power of two (2^n) -- 2.43.0