eiscat: Enabled eiscat db to work with rfnoc_rx_to_file

2 files changed, 121 insertions, 11 deletions

diff --git a/host/include/uhd/rfnoc/blocks/ddc_eiscat.xml b/host/include/uhd/rfnoc/blocks/ddc_eiscat.xml
index 93cf8371f..6cd0f117c 100644
--- a/host/include/uhd/rfnoc/blocks/ddc_eiscat.xml
+++ b/host/include/uhd/rfnoc/blocks/ddc_eiscat.xml
@@ -57,10 +57,6 @@
       <type>double</type>
       <value>0.0</value>
       <port>0</port>
-      <!--<action>-->
-          <!--SR_WRITE("CORDIC_FREQ", $cordic_freq)-->
-      <!--</action>-->
-      <!--FIXME Calculate this properly-->
     </arg>
     <arg>
       <name>input_rate</name>
@@ -96,10 +92,6 @@
       <type>double</type>
       <value>0.0</value>
       <port>1</port>
-      <!--<action>-->
-          <!--SR_WRITE("CORDIC_FREQ", $cordic_freq)-->
-      <!--</action>-->
-      <!--FIXME Calculate this properly-->
     </arg>
     <arg>
       <name>input_rate</name>
@@ -130,6 +122,111 @@
       <value>1.0</value>
       <port>1</port>
     </arg>
+    <arg>
+      <name>freq</name>
+      <type>double</type>
+      <value>0.0</value>
+      <port>2</port>
+    </arg>
+    <arg>
+      <name>input_rate</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>2</port>
+      <check>GE($input_rate, 0.0)</check>
+      <check_message>The input rate must be a positive value (in Hz).</check_message>
+    </arg>
+    <arg>
+      <name>output_rate</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>2</port>
+      <check>GE($output_rate, 0.0)</check>
+      <check_message>The output rate must be a positive value (in Hz).</check_message>
+    </arg>
+    <arg>
+      <name>fullscale</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>2</port>
+      <check>GE($fullscale, 0.0)</check>
+    </arg>
+    <arg>
+      <name>scalar_correction</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>2</port>
+    </arg>
+    <arg>
+      <name>freq</name>
+      <type>double</type>
+      <value>0.0</value>
+      <port>3</port>
+    </arg>
+    <arg>
+      <name>input_rate</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>3</port>
+      <check>GE($input_rate, 0.0)</check>
+      <check_message>The input rate must be a positive value (in Hz).</check_message>
+    </arg>
+    <arg>
+      <name>output_rate</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>3</port>
+      <check>GE($output_rate, 0.0)</check>
+      <check_message>The output rate must be a positive value (in Hz).</check_message>
+    </arg>
+    <arg>
+      <name>fullscale</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>3</port>
+      <check>GE($fullscale, 0.0)</check>
+    </arg>
+    <arg>
+      <name>scalar_correction</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>3</port>
+    </arg>
+    <arg>
+      <name>freq</name>
+      <type>double</type>
+      <value>0.0</value>
+      <port>4</port>
+    </arg>
+    <arg>
+      <name>input_rate</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>4</port>
+      <check>GE($input_rate, 0.0)</check>
+      <check_message>The input rate must be a positive value (in Hz).</check_message>
+    </arg>
+    <arg>
+      <name>output_rate</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>4</port>
+      <check>GE($output_rate, 0.0)</check>
+      <check_message>The output rate must be a positive value (in Hz).</check_message>
+    </arg>
+    <arg>
+      <name>fullscale</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>4</port>
+      <check>GE($fullscale, 0.0)</check>
+    </arg>
+    <arg>
+      <name>scalar_correction</name>
+      <type>double</type>
+      <value>1.0</value>
+      <port>4</port>
+    </arg>
   </args>
   <!--All the connections to the outside world are listed in 'ports':-->
   <ports>
diff --git a/host/include/uhd/rfnoc/blocks/radio_eiscat.xml b/host/include/uhd/rfnoc/blocks/radio_eiscat.xml
index 03b440943..e6a81e800 100644
--- a/host/include/uhd/rfnoc/blocks/radio_eiscat.xml
+++ b/host/include/uhd/rfnoc/blocks/radio_eiscat.xml
@@ -9,14 +9,20 @@
   <!-- Registers -->
   <registers>
     <setreg>
+      <!--1-Bit register. Enable Beam Stream Channels. There are 10, so this is a 10 bit value. -->
+      <name>SR_RX_STREAM_ENABLE</name>
+      <address>159</address>
+    </setreg>
+    <setreg>
       <!--1-Bit register. Are we sending the upper or lower 5 beam contirbutions? -->
       <name>SR_BEAMS_TO_NEIGHBOR</name>
-      <address>135</address>
+      <address>202</address>
+      <value>2</value>
     </setreg>
     <setreg>
       <!--1-Bit register. Are we expecting previous contributions? 1==yes we are -->
       <name>SR_PREV_OR_NULL</name>
-      <address>136</address>
+      <address>203</address>
     </setreg>
     <setreg>
       <!--1-Bit register. Are we expecting previous contributions? 1==yes we are -->
@@ -84,7 +90,14 @@
     <arg>
       <name>neighbors</name>
       <type>int</type>
-      <value>0</value>
+      <value>2</value>
+      <action>SR_WRITE("SR_BEAMS_TO_NEIGHBOR", 2)</action>
+    </arg>
+    <arg>
+      <name>channel_enable</name>
+      <type>int</type>
+      <value>1</value>
+      <action>SR_WRITE("SR_RX_STREAM_ENABLE", 1)</action>
     </arg>
     <arg>
       <name>gain</name>