nxyter register updates

diff --git a/users/tum_e12/configure_eb.sh b/users/tum_e12/configure_eb.sh
index ff02b4acdd37e4977ba9804ab66bad8c4e483b20..c081822c089d560fc58911f749371e5eba2fcf6f 100755 (executable)
--- a/users/tum_e12/configure_eb.sh
+++ b/users/tum_e12/configure_eb.sh
@@ -2,11 +2,16 @@
 
 # MAC Address of the EB
 # 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 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,
 
 # IP Adress and Port of EB: (10.152.8.107:50000)
-trbcmd w 0x8000 0x8102 0x0a98086b   # Destination IP
+#trbcmd w 0x8000 0x8102 0x0a98086b   # Destination IP
+#trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
+# IP Adress and Port of EB: (10.152.8.107:50000)
+trbcmd w 0x8000 0x8102 0xc0a8016b   # Destination IP
 trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
 
 # MAC Adress of Source (trb3)
@@ -14,6 +19,7 @@ trbcmd w 0x8000 0x8104 0xdead8001   # Lower 32 bits of Source MAC
 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 0x8106 0x0a980811   # Source IP
+trbcmd w 0x8000 0x8102 0xc0a80111   # Destination 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 d5a7ae5e4e126dc65fe6d6e8e61dda1e06515b4f..03e336dc98675ccbd2dd27f11d032a83d1708dbd 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -46,16 +46,17 @@ $setup[5]->{cmd}     = "Nxyter-0x3800-NxyterI2C";
 $setup[5]->{period}  = -1;
 $setup[5]->{address} = 1;
 
-$setup[6]->{name}    = "OtherStuff";
-$setup[6]->{cmd}     = "Nxyter-0x3800-TriggerValidate";
+$setup[6]->{name}    = "DACRegister";
+$setup[6]->{cmd}     = "Nxyter-0x3800-NxyterDAC";
 $setup[6]->{period}  = -1;
-$setup[6]->{generic} = 1;
+$setup[6]->{address} = 1;
 
-xmlpage::initPage(\@setup,$page);
- 
-
- 
 
-1;
+$setup[7]->{name}    = "OtherStuff";
+$setup[7]->{cmd}     = "Nxyter-0x3800-TriggerValidate";
+$setup[7]->{period}  = -1;
+$setup[7]->{generic} = 1;
 
+xmlpage::initPage(\@setup,$page);
 
+1;

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index b7513d07f7ff7930f4b21dd4bd144a499c6dc6fe..295b297e38a8e9808cff19c21fe8fdf2b06b435c 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -239,27 +239,95 @@
 
   </group>
   
-  
   <group name="NxyterI2C"
-         address="0200"  size="46"  purpose="status"  mode="rw" continuous="true">
+         address="0200" purpose="config"  mode="rw"  continuous="false">
+
+    <group name="NxMainReg"
+           address="0050"  size="7"  purpose="config"  mode="rw" continuous="true">
+      
+      <register name="NxyterClock" address="0000" purpose="config" mode="rw" >
+        <description>Nxyter Main Clock enable</description>
+        <field name="NxyterClock" start="0" bits="1" format="boolean"/>
+      </register> 
+      
+      <register name="NxPolarity" address="0001" purpose="config" mode="rw" >
+        <description>Nxyter Input Polarity (0 = negative, 1 = positive)</description>
+        <field name="NxPolarity" start="0" bits="1" format="unsigned"/>
+      </register>
+      
+      <register name="NxTestPol" address="0002" purpose="status" mode="r" >
+        <description>Nxyter Testpulse Polarity (1 = negative, 0 = positive)</description>
+        <field name="NxTestPol" start="0" bits="1" format="unsigned"/>
+      </register>
+
+      <register name="NxTestPulse" address="0003" purpose="config" mode="rw" >
+        <description>Nxyter Testpulse enable</description>
+        <field name="NxTestPulse" start="0" bits="1" format="boolean"/>
+      </register>
+
+      <register name="NxTestTrigger" address="0004" purpose="config" mode="rw" >
+        <description>Nxyter Testtrigger enable</description>
+        <field name="NxTestTrigger" start="0" bits="1" format="boolean"/>
+      </register>
+      
+      <register name="NxTestChannel" address="0005" purpose="config" mode="rw" >
+        <description>Nxyter Testpulse Channel Group (0=0,4,.. 1=1,5,.. 2=2,6,.. 3=3,7,..)</description>
+        <field name="NxTestChannel" start="0" bits="2" format="unsigned"/>
+      </register>
+      
+      <register name="I2COnline" address="0006" purpose="status" mode="r" >
+        <description>I2C Online, i.e. Nxyter is connected</description>
+        <field name="I2COnline" start="0" bits="1" format="boolean"/>
+      </register>
+    
+    </group>
+  
+    <group name="I2CRegs"
+           address="0000"  size="46"  purpose="status"  mode="rw" continuous="true">
+      
+      <register name="I2CRegister" address="0000" purpose="config" repeat="46">
+        <description>Nxyter I2C Register</description>
+        
+        <field name="I2CWToken" start="31" bits="1" format="bitmask" purpose="status" mode="r">
+          <description>I2C Write Token</description>
+        </field> 
+        
+        <field name="I2CRToken" start="30" bits="1" format="bitmask" purpose="status" mode="r">
+          <description>I2C Read Token</description>
+        </field> 
+        
+        <field name="I2CReserved" start="29" bits="1" format="bitmask" purpose="status" mode="r">
+          <description>Dummy Register</description>
+        </field> 
+      
+        <field name="I2CValue" start="0" bits="8" format="unsigned" purpose="config" mode="rw">
+          <description>I2C Register Value</description>
+        </field>
+        
+      </register>
+    </group>
+  </group>
+
+  <group name="NxyterDAC"
+         address="0300"  size="129"  purpose="status"  mode="rw" continuous="true">
 
-    <register name="I2CRegister" address="0000" purpose="config" repeat="46">
-      <description>Nxyter I2C Register</description>
+    <register name="DACRegister" address="0000" purpose="config" repeat="129">
+      <description>Nxyter DAC Register</description>
       
-      <field name="I2CWToken" start="31" bits="1" format="bitmask" purpose="status" mode="r">
-        <description>I2C Write Token</description>
+      <field name="DACWToken" start="31" bits="1" format="bitmask" purpose="status" mode="r">
+        <description>DAC Write Token</description>
       </field> 
       
-      <field name="I2CRToken" start="30" bits="1" format="bitmask" purpose="status" mode="r">
-        <description>I2C Read Token</description>
+      <field name="DACRToken" start="30" bits="1" format="bitmask" purpose="status" mode="r">
+        <description>DAC Read Token</description>
       </field> 
       
-      <field name="I2CReserved" start="29" bits="1" format="bitmask" purpose="status" mode="r">
-        <description>I2C Write Token</description>
+      <field name="ChannelDown" start="5" bits="1" format="bitmask" purpose="config" mode="rw">
+        <description>Channel Down</description>
       </field> 
       
-      <field name="I2CValue" start="0" bits="8" format="unsigned" purpose="config" mode="rw">
-        <description>I2c Register Value</description>
+      <field name="TrimValue" start="0" bits="5" format="unsigned" purpose="config" mode="rw">
+        <description>DAC Trim Value</description>
       </field> 
       
     </register>