Update to ADC regs

diff --git a/web/htdocs/addons/adc.pl b/web/htdocs/addons/adc.pl
index 9e2c6adba21bbb604ee2d3c081166bf175ea21ce..c530f8cc46b45925d4649e66a2c1c5fae8413e46 100755 (executable)
--- a/web/htdocs/addons/adc.pl
+++ b/web/htdocs/addons/adc.pl
@@ -23,16 +23,43 @@ $page->{title} = "ADC AddOn";
 $page->{link}  = "../";
 
 my @setup;
-$setup[0]->{name}    = "BufferConfig";
-$setup[0]->{cmd}     = "ADC-0xfe4b-BufferConfig";
-$setup[0]->{period}  = 5000;
-$setup[0]->{address} = 1;
 
-$setup[1]->{name}    = "ProcessingConfig";
-$setup[1]->{cmd}     = "ADC-0xfe4b-ProcessingConfig";
-$setup[1]->{period}  = 5000;
-$setup[1]->{address} = 1;
+push(@setup,({name      => "Control", 
+              cmd       => "ADC-0xfe4b-Control",
+              period    => 1000,
+              address   => 1}));
 
+push(@setup,({name      => "Input", 
+              cmd       => "ADC-0xfe4b-InputHandler",
+              period    => 1000,
+              address   => 1}));              
+              
+push(@setup,({name      => "BufferConfig", 
+              cmd       => "ADC-0xfe4b-BufferConfig",
+              period    => 1000,
+              address   => 1}));
+
+push(@setup,({name      => "ConfigProcessor", 
+              cmd       => "ADC-0xfe4b-ProcessorConfig",
+              period    => 1000,
+              address   => 1}));
+
+push(@setup,({name      => "StatusProcessor", 
+              cmd       => "ADC-0xfe4b-ProcessorStatus",
+              period    => 1000,
+              address   => 1}));
+
+
+push(@setup,({name      => "LastValues", 
+              cmd       => "ADC-0xfe4b-LastValues",
+              period    => 1000,
+              address   => 1}));
+              
+push(@setup,({name      => "Baseline", 
+              cmd       => "ADC-0xfe4b-Baseline",
+              period    => 1000,
+              address   => 1}));
+              
 
 xmlpage::initPage(\@setup,$page);
  

diff --git a/xml-db/database/ADC.xml b/xml-db/database/ADC.xml
index af59fd5fa0bf52fa097f520d3ffa3bafe719758c..25ef6a8b5b012358c15965289f930a92f3870cdd 100644 (file)
--- a/xml-db/database/ADC.xml
+++ b/xml-db/database/ADC.xml
@@ -15,13 +15,29 @@
        100 clock valid (1 bit per ADC)
        101 fco valid (1 bit per ADC)
        102 readout state
- 800 - 83f last ADC values              (local 0x0 - 0x3)
- 840 - 87f long-term average / baseline (local 0x4 - 0x7)
- 880 - 8bf fifo access (debugging only) (local 0x8 - 0xb)-->
+-->
 
+<group name="Control"
+           address="0000"  size="7"  purpose="config" mode="rw" continuous="false">  
+      <description>Configuration registers</description>
+      <register name="BufferControl" address="0001" >
+        <description>Stop writing to buffers</description>
+        <field  name="StopBuffers" start="0"   bits="1"  format="boolean"  errorflag="true"/>
+        <field  name="BaselineOn"  start="4"   bits="1"  format="boolean"  errorflag="true">
+          <description>Baseline calculation always on (not just when no signal found)</description>
+        </field>
+      </register>  
+      <register name="ProcessorStrobes" address="0000" purpose="trigger" mode="w" >
+        <description>Strobe signals to control processor</description>
+        <field  name="ClearBuffers"  start="4"   bits="1"  format="boolean"  errorflag="true"/>
+        <field  name="ResetBuffers"  start="5"   bits="1"  format="boolean"  errorflag="true"/>
+        <field  name="ResetBaseline" start="8"   bits="1"  format="boolean"  errorflag="true"/>
+        <field  name="ResetReadout"  start="12"  bits="1"  format="boolean"  errorflag="true"/>
+      </register> 
+</group>
   
 <group name="BufferConfig"
-           address="0010"  size="7"  purpose="config" mode="rw" continuous="true">
+           address="0010"  size="16"  purpose="config" mode="rw" continuous="true">
       <description>Configuration of buffer handling</description>
       <register name="BufferDepth" address="0000" >
         <description>Number of samples to be stored in the buffer</description>
@@ -38,35 +54,54 @@
         <field  name="ProcessBlocks" start="0"   bits="2"  format="unsigned" noflag="true" />
       </register>
       
-      <register name="TriggerOffset" address="0003" >
-        <description>Offset from the calculated baseline that must be reached to generate a trigger signal for the CTS</description>
-        <field  name="TriggerOffset" start="0"   bits="11"  format="signed" noflag="true" />
+      <register name="TriggerSetting" address="0003" >
+        <description>Settings of trigger signal generation</description>
+        <field  name="TriggerOffset" start="0"   bits="10"  format="signed" noflag="true" >
+          <description>Offset from the calculated baseline that must be reached to generate a trigger signal for the CTS</description>
+        </field>
+        <field name="TriggerInvert" start="16" bits="1" format="bitmask" noflag="true">
+          <description>Selects positive (unset) or negative (set) signal inputs. If negative is selected, a trigger is generated if the input signal is below the baseline minus the set threshold</description>
+        </field>
       </register>
 
-      <register name="ReadoutOffset" address="0004" >
+      <register name="ReadoutSetting" address="0004" >
         <description>Offset from the calculated baseline that must be reached to transmit data during readout (Zero Suppression)</description>
-        <field  name="ReadoutOffset" start="0"   bits="11"  format="signed" noflag="true" />
+        <field  name="ReadoutOffset" start="0"   bits="18"  format="signed" noflag="true" >
+          <description>Offset from the calculated baseline that must be reached to generate a readout from this channel.</description>
+        </field>
+        <field name="ReadoutInvert" start="16" bits="1" format="bitmask" noflag="true">
+          <description>Selects positive (unset) or negative (set) signal inputs. If negative is selected, a readout is generated if the input signal is below the baseline minus the set threshold</description>
+        </field>        
       </register>
 
       <register name="Downsampling" address="0005" >
-        <description>Downsampling of ADC samples before storing in buffer</description>
-        <field  name="Downsampling" start="0"   bits="8"  format="unsigned" noflag="true" />
+        <description>Downsampling of ADC samples before storing in buffer. Make sure values can not exceed 16 Bit!</description>
+        <field  name="Downsampling" start="0"   bits="8"  format="unsigned" scaleoffset="1" noflag="true" />
       </register>
 
       <register name="BaselineAvg" address="0006" >
         <description>Averaging time for baseline calculation. 2**N samples are taken. Baseline is calculated from buffer output data, triggered events are suppressed.</description>
         <field  name="BaselineAvg" start="0"   bits="4"  format="unsigned" noflag="true" />
       </register>
+      <register name="TriggerEnable0" address="0007" >
+        <description>Trigger enable for channels 31 - 0</description>
+        <field  name="TriggerEnable0" start="0"   bits="32"  format="bitmask" noflag="true" />
+      </register>
+      <register name="TriggerEnable1" address="0008" >
+        <description>Trigger enable for channels 47 - 32</description>
+        <field  name="TriggerEnable1" start="0"   bits="16"  format="bitmask" noflag="true" />
+      </register>
+      
 </group>  
 
-<group name="ProcessingConfig" address="0020"  size="12"  purpose="config" mode="rw" continuous="true">
-      <register name="ValuesToSum" address="0000" repeat="4">
+<group name="ProcessorConfig" address="0020"  size="12"  purpose="config" mode="rw" continuous="true">
+      <register name="ValuesToSum" address="0000" repeat="4" >
         <description>Number of values to sum for each output data word</description>
-        <field  name="ValuesToSum" start="0"   bits="8"  format="unsigned" noflag="true" />
+        <field  name="ValuesToSum" start="0"   bits="8"  format="unsigned" scaleoffset="1" noflag="true" />
       </register>
       <register name="NumberOfWords" address="0004" repeat="4">
         <description>Number of output data words to produce</description>
-        <field  name="NumberOfWords" start="0"   bits="10"  format="unsigned" noflag="true" />
+        <field  name="NumberOfWords" start="0"   bits="8"  format="unsigned" noflag="true" />
       </register>  
       <register name="Scaling" address="0008" repeat="4">
         <description>Scaling factor. Sums are divided by 2**N before written to the data stream.</description>
@@ -74,5 +109,131 @@
       </register>  
 </group>
 
+<group name="ProcessorStatus" address="0900"  size="255"  purpose="status" mode="r" continuous="false">
+    <group name="FillLevels1g" address="0000"  size="12"  purpose="status" mode="r" continuous="true"> 
+      <register name="FillLevels1" address="0000" repeat="12" continuous="true">
+        <description>Buffer fill level</description>
+        <field  name="FillLevel0" start="0"   bits="11"  format="unsigned" noflag="true" >
+          <description>Fill level of buffer of first ADC channel</description>
+        </field>
+        <field  name="FillLevel1" start="16"  bits="11"  format="unsigned" noflag="true" >
+          <description>Fill level of buffer of second ADC channel</description>
+        </field>
+      </register>
+    </group>  
+    <group name="FillLevels2g" address="0010"  size="12"  purpose="status" mode="r" continuous="true">  
+      <register name="FillLevels2" address="0000" repeat="12">
+        <description>Buffer fill level</description>
+        <field  name="FillLevel2" start="0"   bits="11"  format="unsigned" noflag="true" >
+          <description>Fill level of buffer of third ADC channel</description>
+        </field>
+        <field  name="FillLevel3" start="16"  bits="11"  format="unsigned" noflag="true" >
+          <description>Fill level of buffer of fourth ADC channel</description>
+        </field>
+      </register>
+    </group>  
+    <group name="BufferHandlerg" address="0020"  size="12"  purpose="status" mode="r" continuous="true">  
+      <register name="BufferHandler" address="0000" repeat="12" continuous="true">
+        <description>Buffer fill level</description>      
+        <field name="StopWriting" start="0" bits="1" format="boolean" invertflag="true">
+          <description>Writing to buffers is stopped</description>
+        </field>
+        <field name="StopWritingRdo" start="1" bits="1" format="boolean"  invertflag="true">
+          <description>Writing to buffers is stopped because of readout</description>
+        </field>
+        <field name="StopIn" start="2" bits="1" format="boolean"  errorflag="true">
+          <description>Writing to buffers is stopped by external signal</description>
+        </field>
+        <field name="RamRemove" start="3" bits="1" format="bitmask" noflag="true" >
+          <description>Removing a word from RAM</description>
+        </field>
+        <field name="RamClear" start="4" bits="4" format="bitmask" noflag="true" >
+          <description>Clearing RAM flag</description>
+        </field>
+        <field name="RamRead" start="8" bits="4" format="bitmask" noflag="true" >
+          <description>Reading a word from RAM</description>
+        </field>
+        <field name="AdcValid" start="12" bits="1" format="bitmask" noflag="true" >
+          <description>Valid data flag from ADC input</description>
+        </field>
+        <field name="RamWrite" start="13" bits="1" format="bitmask" noflag="true" >
+          <description>Write strobe to RAM</description>
+        </field>        
+        <field name="TriggerGen" start="16" bits="4" format="bitmask" noflag="true" >
+          <description>Trigger generation flag</description>
+        </field>        
+        <field name="ReadoutFlag" start="20" bits="4" format="bitmask" noflag="true" >
+          <description>Readout flag</description>
+        </field> 
+      </register> 
+    </group>  
+    <group name="WritePointerg" address="0030"  size="12"  purpose="status" mode="r" continuous="true">  
+      <register name="WritePointer" address="0000" repeat="12" continuous="true">
+        <description>Write pointer of buffers</description>
+        <field  name="WritePointer" start="0"   bits="11"  format="unsigned" noflag="true" >
+        </field>
+      </register>      
+    </group>  
+    <group name="ReadPointers1g" address="0040"  size="12"  purpose="status" mode="r" continuous="true">  
+      <register name="ReadPointers1" address="0000" repeat="12" continuous="true">
+        <description>Buffer read pointer</description>
+        <field  name="ReadPointer0" start="0"   bits="11"  format="unsigned" noflag="true" >
+          <description>Read pointer of buffer of first ADC channel</description>
+        </field>
+        <field  name="ReadPointer1" start="16"  bits="11"  format="unsigned" noflag="true" >
+          <description>Read pointer of buffer of second ADC channel</description>
+        </field>
+      </register>
+    </group>  
+    <group name="ReadPointers2g" address="0050"  size="12"  purpose="status" mode="r" continuous="true">  
+      <register name="ReadPointers2" address="0000" repeat="12" continuous="true">
+        <description>Buffer read pointer</description>
+        <field  name="ReadPointer2" start="0"   bits="11"  format="unsigned" noflag="true" >
+          <description>Read pointer of buffer of third ADC channel</description>
+        </field>
+        <field  name="ReadPointer3" start="16"  bits="11"  format="unsigned" noflag="true" >
+          <description>Read pointer of buffer of fourth ADC channel</description>
+        </field>
+      </register>       
+    </group>    
+    <group name="ReadoutHandlerg" address="0060"  size="12"  purpose="status" mode="r" continuous="true">  
+      <register name="ReadoutHandler" address="0000" repeat="12" continuous="true">
+        <description>Status of the Readout handler</description>
+        <field  name="ReadoutState" start="0"   bits="8"  format="enum" noflag="true" >
+          <description>Status of the Readout handler FSM</description>
+          <enumItem value="0">Idle</enumItem>
+          <enumItem value="1">ReleaseDirect</enumItem>
+          <enumItem value="2">WaitForEnd</enumItem>
+          <enumItem value="3">CheckStatusTrigger</enumItem>
+          <enumItem value="4">Start</enumItem>
+          <enumItem value="5">Readout</enumItem>
+          <enumItem value="6">NextBlock</enumItem>
+          <enumItem value="7">SendStatus</enumItem>
+        </field>
+      </register>       
+    </group>    
+</group>
+
+
+<group name="InputHandler"
+           address="0030"  size="12"  purpose="status" mode="r" continuous="true">
+      <register name="WordCount" address="0000" repeat="12" >
+        <description>Counter of words from ADC</description>
+        <field  name="WordCount" start="4"   bits="28"  format="unsigned" noflag="true" rate="true" />
+      </register>
+</group>  
+
+<group name="LastValues" address="0800"  size="48"  purpose="status" mode="r" continuous="true">
+      <register name="LastValue" address="0000" repeat="48" >
+        <description>Last value read from ADC</description>
+        <field  name="LastValue" start="0"   bits="10"  format="unsigned" noflag="true" />
+      </register>
+</group>      
+<group name="Baselines" address="0840"  size="48"  purpose="status" mode="r" continuous="true">
+      <register name="Baseline" address="0000" repeat="48" >
+        <description>The current calculated baseline of the ADC value</description>
+        <field  name="Baseline" start="0"   bits="18"  format="unsigned" noflag="true" />
+      </register>
+</group>
  
 </TrbNetEntity>

diff --git a/xml-db/database/Readout.xml b/xml-db/database/Readout.xml
index c0374e02a386b6bafdf22afb0df78a6261d7ad1f..a991d36798f360693aae876549ec79b583035afc 100644 (file)
--- a/xml-db/database/Readout.xml
+++ b/xml-db/database/Readout.xml
@@ -7,7 +7,7 @@
   <description>Register of the trigger and read-out handler in full_endpoint (on front-ends only)</description>
 
   <group name="Status" address="0000" mode="r" continuous="false">
-    <register name="DataBufferStatus" address="0100" repeat="4" purpose="status">
+    <register name="DataBufferStatus" address="0100" repeat="12" purpose="status">
       <description>Status of the event data buffers</description>
       <field name="DataFifoLevel" start="0" bits="16" format="unsigned" >
         <description>Fill level of the data Fifo in 32 Bit words</description>

diff --git a/xml-db/schema/TrbNetCommon.xsd b/xml-db/schema/TrbNetCommon.xsd
index 31f209f3e695e487fffe45cabb60ce64ac4f6b31..d386f6c67b0e5286db3f99183c58983070fce460 100644 (file)
--- a/xml-db/schema/TrbNetCommon.xsd
+++ b/xml-db/schema/TrbNetCommon.xsd
@@ -231,6 +231,7 @@
     <xs:attribute ref="address" />
     <xs:attribute ref="mode" />
     <xs:attribute ref="purpose" />
+    <xs:attribute ref="continuous" />    
     <xs:attribute ref="rate" />
   </xs:complexType>