nxyter register updates

diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl
index 12f6d224d603b26e76a289cb4c6b481e14f344f6..d959cf7cc99fd95b0656b46e03c1d8df2c50b026 100755 (executable)
--- a/web/htdocs/nxyter/index.pl
+++ b/web/htdocs/nxyter/index.pl
@@ -27,35 +27,29 @@ $setup[1]->{period}  = -1;
 $setup[1]->{address} = 1;
 
 $setup[2]->{name}    = "TriggerHandler";
-$setup[2]->{cmd}     = "Nxyter-0xfe49-TriggerHandler";
+$setup[2]->{cmd}     = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse";
 $setup[2]->{period}  = -1;
 $setup[2]->{address} = 1;
 
-$setup[3]->{name}    = "Testpulse";
-$setup[3]->{cmd}     = "Nxyter-0xfe49-TestPulse";
+$setup[3]->{name}    = "DataReceiver";
+$setup[3]->{cmd}     = "Nxyter-0xfe49-DataReceiver";
 $setup[3]->{period}  = -1;
 $setup[3]->{address} = 1;
 
-$setup[4]->{name}    = "DataReceiver";
-$setup[4]->{cmd}     = "Nxyter-0xfe49-DataReceiver";
+$setup[4]->{name}    = "I2CRegister";
+$setup[4]->{cmd}     = "Nxyter-0xfe49-NxyterI2C";
 $setup[4]->{period}  = -1;
 $setup[4]->{address} = 1;
 
-$setup[5]->{name}    = "I2CRegister";
-$setup[5]->{cmd}     = "Nxyter-0xfe49-NxyterI2C";
+$setup[5]->{name}    = "DACRegister";
+$setup[5]->{cmd}     = "Nxyter-0xfe49-NxyterDAC";
 $setup[5]->{period}  = -1;
 $setup[5]->{address} = 1;
 
-$setup[6]->{name}    = "DACRegister";
-$setup[6]->{cmd}     = "Nxyter-0xfe49-NxyterDAC";
+$setup[6]->{name}    = "NXControl";
+$setup[6]->{cmd}     = "Nxyter-0xfe49-NXControl";
 $setup[6]->{period}  = -1;
-$setup[6]->{address} = 1;
-
-
-$setup[7]->{name}    = "OtherStuff";
-$setup[7]->{cmd}     = "Nxyter-0xfe49-TriggerValidate";
-$setup[7]->{period}  = -1;
-$setup[7]->{generic} = 1;
+$setup[6]->{generic} = 1;
 
 xmlpage::initPage(\@setup,$page);
 

diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml
index 3cf56c6b1c595fed8b1c44df6b5e6c413aa5eb0b..90cb1aaf1672c7ebd25f7199f854e827ce7c3193 100644 (file)
--- a/xml-db/database/Nxyter.xml
+++ b/xml-db/database/Nxyter.xml
@@ -366,4 +366,34 @@
     </register>
   </group>
 
+  <group name="NXControl"
+         address="0100"  size="5"  purpose="status"  mode="rw" continuous="false">
+    
+    <register name="NxOffline" address="0103" purpose="config" mode="rw" >
+      <description>Nxyter Offline Mode</description>
+      <field name="NxOffline" start="0" bits="1" format="boolean"/>
+    </register>
+    
+    <register name="MainClkLock" address="0104" 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" >
+      <description>ADC Data Clock Lock</description>
+      <field name="AdcClkLock" start="0" bits="1" format="boolean"/>
+    </register>
+
+    <register name="MainNotLockCtr" address="010a" 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" >
+      <description>PLL ADC Data Clock NotLock Counter</description>
+      <field name="AdcNotLockCtr" start="0" bits="16" format="unsigned"/>
+    </register>
+  
+  </group>
+
 </TrbNetEntity>