From 3ab6eb87f9b376280a40e5da56f8d4ed4a9048b2 Mon Sep 17 00:00:00 2001
From: Boudewijn Hut <hut@astron.nl>
Date: Wed, 28 Jun 2017 06:51:10 +0000
Subject: [PATCH] Defined new 'DATAWRITER' variable, to toggle between wcudata1
 and wcudata2

---
 .../apertif/commissioning/central_commands.sh | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/applications/apertif/commissioning/central_commands.sh b/applications/apertif/commissioning/central_commands.sh
index 0d81cdd335..609bab91f5 100755
--- a/applications/apertif/commissioning/central_commands.sh
+++ b/applications/apertif/commissioning/central_commands.sh
@@ -34,6 +34,8 @@ UNBS=$3
 OPTIONS=$4
 POL=$5
 
+DATAWRITER="wcudata1"
+
 echo central_commands.sh: Application  : $APP
 echo central_commands.sh: Telescopes   : $TELS
 echo central_commands.sh: UniBoards    : $UNBS
@@ -256,24 +258,45 @@ fi
 ###############################################################################
 UNBS2="${UNBS//,/ }"
 if [ $APP == "apertif" ]; then
+    if [ "$DATAWRITER" == "wcudata1" ]; then
+        DATAWRITER_ETH0_ETH_DST_MAC=$WCUDATA1_ETH0_ETH_DST_MAC
+        DATAWRITER_ETH0_IP_DST_ADDR=$WCUDATA1_ETH0_IP_DST_ADDR
+        DATAWRITER_ETH1_ETH_DST_MAC=$WCUDATA1_ETH1_ETH_DST_MAC
+        DATAWRITER_ETH1_IP_DST_ADDR=$WCUDATA1_ETH1_IP_DST_ADDR
+        DATAWRITER_ETH2_ETH_DST_MAC=$WCUDATA1_ETH2_ETH_DST_MAC
+        DATAWRITER_ETH2_IP_DST_ADDR=$WCUDATA1_ETH2_IP_DST_ADDR
+        DATAWRITER_ETH3_ETH_DST_MAC=$WCUDATA1_ETH3_ETH_DST_MAC
+        DATAWRITER_ETH3_IP_DST_ADDR=$WCUDATA1_ETH3_IP_DST_ADDR
+    else
+        DATAWRITER_ETH0_ETH_DST_MAC=$WCUDATA2_ETH0_ETH_DST_MAC
+        DATAWRITER_ETH0_IP_DST_ADDR=$WCUDATA2_ETH0_IP_DST_ADDR
+        DATAWRITER_ETH1_ETH_DST_MAC=$WCUDATA2_ETH1_ETH_DST_MAC
+        DATAWRITER_ETH1_IP_DST_ADDR=$WCUDATA2_ETH1_IP_DST_ADDR
+        DATAWRITER_ETH2_ETH_DST_MAC=$WCUDATA2_ETH2_ETH_DST_MAC
+        DATAWRITER_ETH2_IP_DST_ADDR=$WCUDATA2_ETH2_IP_DST_ADDR
+        DATAWRITER_ETH3_ETH_DST_MAC=$WCUDATA2_ETH3_ETH_DST_MAC
+        DATAWRITER_ETH3_IP_DST_ADDR=$WCUDATA2_ETH3_IP_DST_ADDR
+    fi
+    
+
     for UNB in $UNBS2
     do
         # correlator boards 0:3 to eth0
         if [ $UNB -ge 0 -a $UNB -le 3 ]; then
-            ETH_DST_MAC=${WCUDATA1_ETH0_ETH_DST_MAC}
-            IP_DST_ADDR=${WCUDATA1_ETH0_IP_DST_ADDR}
+            ETH_DST_MAC=${DATAWRITER_ETH0_ETH_DST_MAC}
+            IP_DST_ADDR=${DATAWRITER_ETH0_IP_DST_ADDR}
         # correlator boards 4:7 to eth1
         elif [ $UNB -ge 4 -a $UNB -le 7 ]; then
-            ETH_DST_MAC=${WCUDATA1_ETH1_ETH_DST_MAC}
-            IP_DST_ADDR=${WCUDATA1_ETH1_IP_DST_ADDR}
+            ETH_DST_MAC=${DATAWRITER_ETH1_ETH_DST_MAC}
+            IP_DST_ADDR=${DATAWRITER_ETH1_IP_DST_ADDR}
         # correlator boards 8:11 to eth2
         elif [ $UNB -ge 8 -a $UNB -le 11 ]; then
-            ETH_DST_MAC=${WCUDATA1_ETH2_ETH_DST_MAC}
-            IP_DST_ADDR=${WCUDATA1_ETH2_IP_DST_ADDR}
+            ETH_DST_MAC=${DATAWRITER_ETH2_ETH_DST_MAC}
+            IP_DST_ADDR=${DATAWRITER_ETH2_IP_DST_ADDR}
         # correlator boards 12:15 to eth3
         elif [ $UNB -ge 12 -a $UNB -le 15 ]; then
-            ETH_DST_MAC=${WCUDATA1_ETH3_ETH_DST_MAC}
-            IP_DST_ADDR=${WCUDATA1_ETH3_IP_DST_ADDR}
+            ETH_DST_MAC=${DATAWRITER_ETH3_ETH_DST_MAC}
+            IP_DST_ADDR=${DATAWRITER_ETH3_IP_DST_ADDR}
         fi
         UDP_DST_PORT=4000 # Firmware default
         python $SVN/RadioHDL/trunk/applications/apertif/designs/apertif_unb1_correlator/tb/python/pi_apertif_unb1_correlator_offload.py --unb $UNB --fn 0:3 --bn 0:3 --reg eth_dst_mac=$ETH_DST_MAC,ip_dst_addr=$IP_DST_ADDR,udp_dst_port=$UDP_DST_PORT
-- 
GitLab