nxyter register updates

diff --git a/users/tum_e12/configure_cts.sh b/users/tum_e12/configure_cts.sh
index 26a189b59e871830d60f40e4c8efd0a2e34c71bd..614893ec73a6812b59fad7e56a9ec7d0f432c913 100755 (executable)
--- a/users/tum_e12/configure_cts.sh
+++ b/users/tum_e12/configure_cts.sh
@@ -12,6 +12,10 @@ trbcmd w 0x8000 0x8308 0xffffff
 trbcmd w 0x8000 0x830b 0x7
 trbcmd w 0x8000 0x830d 0x0
 
+# Pulser #0 Settings
+#trbcmd w 0x8000 0xa140  0x0001869f
+#trbcmd clearbit 0x8000 0xa101 0x2
+
 # Pulser #0 Settings
 trbcmd w 0x8000 0xa137 0x0001869f #0x3e7
 trbcmd clearbit 0x8000 0xa101 0x2

diff --git a/web/htdocs/commands/xmlpage.pm b/web/htdocs/commands/xmlpage.pm
index f64b9dd5e2aec0756c2dc6a2cccffd2220f4d9a2..841f14d8ce557118e0f6caa275aa73af41cbd064 100644 (file)
--- a/web/htdocs/commands/xmlpage.pm
+++ b/web/htdocs/commands/xmlpage.pm
@@ -41,6 +41,7 @@ EOF
 <div id="overview">
 <div class="header">);
 
+
 for ( my $s = 0; $s < scalar @setup; $s++) {
   print qq|<span class="|.(($active == $s)?"selected":"inactive").qq|"><a href="?$setup[$s]->{name}">$setup[$s]->{name}</a></span>|;
   }
@@ -113,4 +114,4 @@ sub printJavaScripts {
 }
 
 
-1;
\ No newline at end of file
+1;

diff --git a/web/htdocs/layout/blue.css b/web/htdocs/layout/blue.css
index 57d9905a49ecbc1739c0e3844c5ecf3d174f8489..84273606420ddab334ff5c67875ad801ac4abc2b 100644 (file)
--- a/web/htdocs/layout/blue.css
+++ b/web/htdocs/layout/blue.css
@@ -43,7 +43,7 @@ body {
 }
 
 #overview {
-  min-width:1000px;
+  min-width:1100px;
   margin:50px 0 0 20px;  
   resize:horizontal;
 /*   overflow:auto; */
@@ -208,6 +208,7 @@ table.fields td.button_move:hover, table.registers td.button_move:hover{
 
 
 div.header {
+  white-space:nowrap;
   font-size:13pt;
   position:absolute;
   font-weight:bold;
@@ -347,4 +348,4 @@ th:hover .tooltip, td:hover .tooltip {
 table.queryresult th div, table.queryresult td div {
   position:relative;
   cursor:default;
-}
\ No newline at end of file
+}

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index d959cf7cc99fd95b0656b46e03c1d8df2c50b026..0580348c1b8ed9fc9aac43e314906b047ec2d88c 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -16,41 +16,32 @@ $page->{title} = "Nxyter Register";
 $page->{link}  = "../";
 
 my @setup;
-$setup[0]->{name}    = "DataValid";
-$setup[0]->{cmd}     = "Nxyter-0xfe49-DataValidate";
+
+$setup[0]->{name}    = "NXControl";
+$setup[0]->{cmd}     = "Nxyter-0xfe49-NXControl";
 $setup[0]->{period}  = -1;
-$setup[0]->{address} = 1;
+$setup[0]->{generic} = 1;
 
-$setup[1]->{name}    = "TrigValidate";
-$setup[1]->{cmd}     = "Nxyter-0xfe49-TriggerValidate";
+$setup[1]->{name}    = "DataReceiver";
+$setup[1]->{cmd}     = "Nxyter-0xfe49-DataValidate&Nxyter-0xfe49-DataReceiver";
 $setup[1]->{period}  = -1;
 $setup[1]->{address} = 1;
 
-$setup[2]->{name}    = "TriggerHandler";
-$setup[2]->{cmd}     = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse";
+$setup[2]->{name}    = "TrigValidate";
+$setup[2]->{cmd}     = "Nxyter-0xfe49-TriggerValidate";
 $setup[2]->{period}  = -1;
 $setup[2]->{address} = 1;
 
-$setup[3]->{name}    = "DataReceiver";
-$setup[3]->{cmd}     = "Nxyter-0xfe49-DataReceiver";
+$setup[3]->{name}    = "TriggerHandler";
+$setup[3]->{cmd}     = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse";
 $setup[3]->{period}  = -1;
 $setup[3]->{address} = 1;
 
 $setup[4]->{name}    = "I2CRegister";
-$setup[4]->{cmd}     = "Nxyter-0xfe49-NxyterI2C";
+$setup[4]->{cmd}     = "Nxyter-0xfe49-NxyterI2C&Nxyter-0xfe49-NxyterDAC";
 $setup[4]->{period}  = -1;
 $setup[4]->{address} = 1;
 
-$setup[5]->{name}    = "DACRegister";
-$setup[5]->{cmd}     = "Nxyter-0xfe49-NxyterDAC";
-$setup[5]->{period}  = -1;
-$setup[5]->{address} = 1;
-
-$setup[6]->{name}    = "NXControl";
-$setup[6]->{cmd}     = "Nxyter-0xfe49-NXControl";
-$setup[6]->{period}  = -1;
-$setup[6]->{generic} = 1;
-
 xmlpage::initPage(\@setup,$page);
 
 1;

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 90cb1aaf1672c7ebd25f7199f854e827ce7c3193..6ea1545ab07565f697edf63b7028fa2e7d32cc5c 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -188,7 +188,7 @@
 
 
   <group name="DataReceiver"
-         address="0500"  size="13"  purpose="status"  mode="rw"  continuous="true">
+         address="0500"  size="15"  purpose="status"  mode="rw"  continuous="true">
 
     <register name="CurrentTimestamp" address="0000" purpose="status" mode="r">
       <description>Current Timestamp Value read from Fifo</description>
@@ -225,9 +225,9 @@
       <field name="ParityErrorCounter" start="0" bits="32" format="unsigned" errorflag="true" />
     </register>
     
-    <register name="PLLNotLockCount" address="0004" purpose="status" mode="r">
+    <register name="ADCSNotLockCount" address="0004" purpose="status" mode="r">
       <description>ADC Sampling PLL Clock Not Lock Counter</description>
-      <field name="PLLNotLockCount" start="0" bits="32" format="unsigned" errorflag="true" />
+      <field name="ADCSNotLockCount" start="0" bits="32" format="unsigned" errorflag="true" />
     </register>
 
     <register name="JohnsonCtrSync" address="0005" purpose="config" mode="rw">
@@ -250,7 +250,7 @@
       <field name="ADCValue" start="0" bits="32" format="unsigned"/>
     </register>
     
-    <register name="ADCInputErrorEnable" address="0009" purpose="status" mode="rw">
+    <register name="ADCInputErrorEnable" address="0009" purpose="config" mode="rw">
       <description>"ADC Input Error Enable</description>
       <field name="ADCInputErrorEnable" start="0" bits="1" format="boolean" />
     </register>
@@ -260,15 +260,32 @@
       <field name="ADCInputErrorCtr" start="0" bits="16" format="unsigned" />
     </register>
 
-    <register name="NXDataClkOK" address="000b" purpose="status" mode="r">
-      <description>Nyxter Data Clock OK</description>
-      <field name="NXDataClkOK" start="0" bits="1" format="boolean" />
+    <register name="ADCClockOK" address="000b" purpose="status" mode="r">
+      <description>ADC Clock OK, Johnson counter is synced</description>
+      <field name="ADCClockOK" start="0" bits="1" format="boolean" />
     </register>
 
     <register name="ADCResetCounter" address="000c" purpose="status" mode="r">
       <description>ADC Handler Reset Counter</description>
       <field name="ADCResetCounter" start="0" bits="16" format="unsigned" />
     </register>
+    
+    <register name="TSDelay" address="000d" purpose="config" mode="rw">
+      <description>nx_fifo_threshold</description>
+      <field name="TSDelay" start="0" bits="4" format="unsigned" />
+    </register>
+    
+    <register name="ADCBShift" address="000e" purpose="config" mode="rw">
+      <description>ADC Bit Shift</description>
+      
+      <field name="ShiftDir" start="3" bits="1" format="unsigned">
+        <description>ADC Bit Shift Direction (0=ror, 1=rol)</description>
+      </field>
+      <field name="ShiftValue" start="0" bits="3" format="unsigned">
+        <description>ADC Bit Shift value</description>    
+      </field>
+      
+    </register>
 
   </group>
   
@@ -367,31 +384,51 @@
   </group>
 
   <group name="NXControl"
-         address="0100"  size="5"  purpose="status"  mode="rw" continuous="false">
+         address="0103"  size="9"  purpose="status"  mode="rw" continuous="true">
     
-    <register name="NxOffline" address="0103" purpose="config" mode="rw" >
-      <description>Nxyter Offline Mode</description>
+    <register name="SetOffline" address="0000" purpose="config" mode="rw" >
+      <description>Force Nxyter Offline Mode</description>
+      <field name="SetOffline" start="0" bits="1" format="boolean"/>
+    </register>
+
+    <register name="I2COnlineS" address="0001" purpose="status" mode="r" >
+      <description>Nxyter I2C Online Status</description>
+      <field name="I2COnlineS" start="0" bits="1" format="boolean"/>
+    </register>
+
+    <register name="NxOffline" address="0002" purpose="status" mode="r" >
+      <description>Nxyter Offline Status</description>
       <field name="NxOffline" start="0" bits="1" format="boolean"/>
     </register>
     
-    <register name="MainClkLock" address="0104" purpose="status" mode="r" >
+    <register name="MainClkLock" address="0003" purpose="status" mode="r" >
       <description>Nxyter Main Clock Lock (250 MHz)</description>
       <field name="MainClkLock" start="0" bits="1" format="boolean"/>
     </register>
     
-    <register name="AdcClkLock" address="0105" purpose="status" mode="r" >
+    <register name="AdcDClkLock" address="0004" purpose="status" mode="r" >
       <description>ADC Data Clock Lock</description>
-      <field name="AdcClkLock" start="0" bits="1" format="boolean"/>
+      <field name="AdcDClkLock" start="0" bits="1" format="boolean"/>
+    </register>
+    
+    <register name="AdcSClkLock" address="0005" purpose="status" mode="r" >
+      <description>ADC Sample Clock Lock</description>
+      <field name="AdcSClkLock" start="0" bits="1" format="boolean"/>
     </register>
 
-    <register name="MainNotLockCtr" address="010a" purpose="status" mode="r" >
+    <register name="MainNotLockCtr" address="0006" purpose="status" mode="r" >
       <description>PLL Nxyter Main Clock NotLock Counter</description>
       <field name="MainNotLockCtr" start="0" bits="16" format="unsigned"/>
     </register>
     
-    <register name="AdcNotLockCtr" address="010b" purpose="status" mode="r" >
+    <register name="AdcDNotLockCtr" address="0007" purpose="status" mode="r" >
       <description>PLL ADC Data Clock NotLock Counter</description>
-      <field name="AdcNotLockCtr" start="0" bits="16" format="unsigned"/>
+      <field name="AdcDNotLockCtr" start="0" bits="16" format="unsigned"/>
+    </register>
+
+    <register name="AdcSNotLockCtr" address="0008" purpose="status" mode="r" >
+      <description>PLL ADC Sample Clock NotLock Counter</description>
+      <field name="AdcSNotLockCtr" start="0" bits="16" format="unsigned"/>
     </register>
   
   </group>