nxyter register updates

diff --git a/users/tum_e12/configure_eb.sh b/users/tum_e12/configure_eb.sh
index c081822c089d560fc58911f749371e5eba2fcf6f..80f01cb8ae532e87320e698fa69f5c482b90f8d7 100755 (executable)
--- a/users/tum_e12/configure_eb.sh
+++ b/users/tum_e12/configure_eb.sh
@@ -4,8 +4,8 @@
 # i.e. 6C:F0:49:02:D7:45
 #trbcmd w 0x8000 0x8100 0x4902d745   # Lower 32 bits of EB MAC
 #trbcmd w 0x8000 0x8101 0x6cf0       # Bit 15..0: Higher 16 bit of EB MAC,
-trbcmd w 0x8000 0x8100 0x0c:2e:81:76 # Lower 32 bits of EB MAC
-trbcmd w 0x8000 0x8101 0x00:0e       # Bit 15..0: Higher 16 bit of EB MAC,
+trbcmd w 0x8000 0x8100 0x0c2e8176    # Lower 32 bits of EB MAC
+trbcmd w 0x8000 0x8101 0x000e        # Bit 15..0: Higher 16 bit of EB MAC,
 
 # IP Adress and Port of EB: (10.152.8.107:50000)
 #trbcmd w 0x8000 0x8102 0x0a98086b   # Destination IP
@@ -20,6 +20,6 @@ trbcmd w 0x8000 0x8105 0x0230       # Bit 15..0: Higher 16 bit of Source MAC
 
 # IP and Port of Source (10.152.8.17:50000)
 #trbcmd w 0x8000 0x8106 0x0a980811   # Source IP
-trbcmd w 0x8000 0x8102 0xc0a80111   # Destination IP
+trbcmd w 0x8000 0x8106 0xc0a80111   # Source IP
 trbcmd w 0x8000 0x8107 0xc350       # Bit 15..0: Source UDP Port 
 trbcmd w 0x8000 0x8108 0x0578       # Bit 15..0: MTU size

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index 03e336dc98675ccbd2dd27f11d032a83d1708dbd..12f6d224d603b26e76a289cb4c6b481e14f344f6 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -17,43 +17,43 @@ $page->{link}  = "../";
 
 my @setup;
 $setup[0]->{name}    = "DataValid";
-$setup[0]->{cmd}     = "Nxyter-0x3800-DataValidate";
+$setup[0]->{cmd}     = "Nxyter-0xfe49-DataValidate";
 $setup[0]->{period}  = -1;
 $setup[0]->{address} = 1;
 
-$setup[1]->{name}    = "TrigValid";
-$setup[1]->{cmd}     = "Nxyter-0x3800-TriggerValidate";
+$setup[1]->{name}    = "TrigValidate";
+$setup[1]->{cmd}     = "Nxyter-0xfe49-TriggerValidate";
 $setup[1]->{period}  = -1;
 $setup[1]->{address} = 1;
 
 $setup[2]->{name}    = "TriggerHandler";
-$setup[2]->{cmd}     = "Nxyter-0x3800-TriggerHandler";
+$setup[2]->{cmd}     = "Nxyter-0xfe49-TriggerHandler";
 $setup[2]->{period}  = -1;
 $setup[2]->{address} = 1;
 
 $setup[3]->{name}    = "Testpulse";
-$setup[3]->{cmd}     = "Nxyter-0x3800-TestPulse";
+$setup[3]->{cmd}     = "Nxyter-0xfe49-TestPulse";
 $setup[3]->{period}  = -1;
 $setup[3]->{address} = 1;
 
 $setup[4]->{name}    = "DataReceiver";
-$setup[4]->{cmd}     = "Nxyter-0x3800-DataReceiver";
+$setup[4]->{cmd}     = "Nxyter-0xfe49-DataReceiver";
 $setup[4]->{period}  = -1;
 $setup[4]->{address} = 1;
 
 $setup[5]->{name}    = "I2CRegister";
-$setup[5]->{cmd}     = "Nxyter-0x3800-NxyterI2C";
+$setup[5]->{cmd}     = "Nxyter-0xfe49-NxyterI2C";
 $setup[5]->{period}  = -1;
 $setup[5]->{address} = 1;
 
 $setup[6]->{name}    = "DACRegister";
-$setup[6]->{cmd}     = "Nxyter-0x3800-NxyterDAC";
+$setup[6]->{cmd}     = "Nxyter-0xfe49-NxyterDAC";
 $setup[6]->{period}  = -1;
 $setup[6]->{address} = 1;
 
 
 $setup[7]->{name}    = "OtherStuff";
-$setup[7]->{cmd}     = "Nxyter-0x3800-TriggerValidate";
+$setup[7]->{cmd}     = "Nxyter-0xfe49-TriggerValidate";
 $setup[7]->{period}  = -1;
 $setup[7]->{generic} = 1;
 

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 29bdee2f65bb161d5c7625014159985cb0efd392..9c9abd5ede91b77e09951d0108402e407eb31d07 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -91,15 +91,21 @@
          address="0180"  size="15"  purpose="config"  mode="rw"  continuous="false">
     <register name="ReadoutMode" address="0000" purpose="config">
       <description>Readout mode selection</description>
-      <field name="ReadoutMode" start="0" bits="3" format="enum">
-        <enumItem value="0">TS Select + TS Ovfl,Parity valid</enumItem>
-        <enumItem value="1">TS Select + TS Ovfl,Parity,Pileup valid</enumItem>
-        <enumItem value="2">TS Select + ignore TS Status Bits</enumItem>
-        <enumItem value="3">TS Select + ignore TS Status Bits</enumItem>
-        <enumItem value="4">TS Ovfl,Parity valid</enumItem>
-        <enumItem value="5">TS Ovfl,Parity,Pileup valid</enumItem>
-        <enumItem value="6">ignore TS Status Bits</enumItem>
-        <enumItem value="7">ignore TS Status Bits</enumItem>
+      
+      <field name="SelfTrigger" start="3" bits="1" format="boolean">
+        <description>Self Trigger Mode</description>
+      </field>
+      
+      <field name="TSSelectOff" start="2" bits="1" format="boolean">
+        <description>TimeStamp Selection Filter Off</description>
+      </field>
+
+      <field name="StatusSelect" start="0" bits="2" format="enum">
+        <description>Timestamp Selection Mode</description>
+        <enumItem value="0">Ovfl, Parity Bits valid</enumItem>
+        <enumItem value="1">Ovfl, Parity, Pileup Bits valid</enumItem>
+        <enumItem value="2">ignore Status Bits</enumItem>
+        <enumItem value="3">ignore Status Bits</enumItem>
       </field>
     </register>    
 
@@ -163,14 +169,14 @@
 
 
   <group name="DataReceiver"
-         address="0500"  size="9"  purpose="status"  mode="rw"  continuous="true">
+         address="0500"  size="13"  purpose="status"  mode="rw"  continuous="true">
 
     <register name="CurrentTimestamp" address="0000" purpose="status" mode="r">
       <description>Current Timestamp Value read from Fifo</description>
       <field name="CurrentTimestamp" start="0" bits="32" format="unsigned" />
     </register>
     
-    <register name="TimestampFifoStatus" address="0001" purpose="status">
+    <register name="TimestampFifoStatus" address="0001" purpose="status" mode="r">
       <description>Status of the timestamp Fifo</description>
       
       <field name="TSFifoFull" start="0" bits="1" format="boolean" errorflag="true" mode="r">
@@ -205,17 +211,17 @@
       <field name="PLLNotLockCount" start="0" bits="32" format="unsigned" errorflag="true" />
     </register>
 
-    <register name="JohnsonCtrSync" address="0005" purpose="config">
+    <register name="JohnsonCtrSync" address="0005" purpose="config" mode="rw">
       <description>johnson_counter_sync (experts only)</description>
       <field name="JohnsonCtrSync" start="0" bits="2" format="unsigned"/>
     </register>
 
-    <register name="PllDPhase" address="0006" purpose="config">
+    <register name="PllDPhase" address="0006" purpose="config" mode="rw">
       <description>PLL ADC Sampling Clock DPHASE</description>
       <field name="PllDPhase" start="0" bits="4" format="unsigned" scale="2" unit="ns" />
     </register>
     
-    <register name="PllFineDelb" address="0007" purpose="config">
+    <register name="PllFineDelb" address="0007" purpose="config" mode="rw">
       <description>PLL ADC Sampling Clock FINEDELB</description>
       <field name="PllFineDelb" start="0" bits="4" format="unsigned" scale="125" unit="ps" />
     </register>
@@ -224,19 +230,26 @@
       <description>Current ADC value</description>
       <field name="ADCValue" start="0" bits="32" format="unsigned"/>
     </register>
-   
-
-    <!--
-       <register name="DebugMux" address="000f" purpose="config">
-         <description>Debug Multiplexer selection</description>
-         <field name="DebugMux" start="0" bits="2" format="enum">
-           <enumItem value="0">Normal Debug</enumItem>
-           <enumItem value="1">ADC Nxyter</enumItem>
-           <enumItem value="2">ADC Testchannel</enumItem>
-           <enumItem value="3">ADC Reset Handler</enumItem>
-         </field>
-       </register>
-       -->
+    
+    <register name="ADCInputErrorEnable" address="0009" purpose="status" mode="rw">
+      <description>"ADC Input Error Enable</description>
+      <field name="ADCInputErrorEnable" start="0" bits="1" format="boolean" />
+    </register>
+    
+    <register name="ADCInputErrorCtr" address="000a" purpose="status" mode="r">
+      <description>ADC Input Error Counter</description>
+      <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>
+
+    <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>
 
   </group>