Task 1319: Modified setting of the PPS- and residual- delays. The values are...

Task 1319: Modified setting of the PPS- and residual- delays. The values are read from the file /opt/aperitf/etc/FixedDelays.

applications/apertif/commissioning/dish_commands.sh

@@ -269,45 +269,11 @@ if [ "$APP" == "apertif-sr2.6" ]; then
     HOST=$(hostname)
     TELCHAR=${HOST:6:7}
 # . Get value from MAC configuration file
-    PPS_DELAY=$(grep -i RT$TELCHAR /opt/apertif/etc/FixedDelays.conf | awk -v N=$3 '{print $3}')
+    PPS_DELAY=$(grep -i ^RT$TELCHAR /opt/apertif/etc/FixedDelays.conf | awk '{print $2}')
+    RESIDUAL_DELAY=$(grep -i ^RT$TELCHAR /opt/apertif/etc/FixedDelays.conf | awk '{print $3}')
 # . Apply value
     python $UPE/peripherals/pi_common_pulse_delay.py --unb $UNBS --bn 0:3 --reg pulse_delay=$PPS_DELAY 
-fi
-
-###############################################################################
-# Write fiber delay setting. 
-# . Packet rate: 781250pkts/sec; 1 packet/1280ns. 183 words/packet.
-#
-#   RT    len   diff(2274-len) diff*5ns  packets  Words
-#  
-# . RT0:  901m   n/a
-# . RT1:  762m   n/a
-# . RT2:  612m  1662m           8310ns   6.492    1188
-# . RT3:  472m  1802m           9010ns   7.039    1288
-# . RT4:  338m  1936m           9680ns   7.563    1384
-# . RT5:  177m  2097m          10485ns   8.191    1499
-# . RT6:  130m  2144m          10720ns   8.375    1533
-# . RT7:  275m  1999m           9995ns   7.809    1429
-# . RT8:  421m  1853m           9265ns   7.238    1325
-# . RT9:  565m  1709m           8545ns   6.676    1222
-# . RTA:  737m  1537m           7685ns   6.004    1099
-# . RTB:  737m  1537m           7685ns   6.004    1099
-# . RTC: 2274m     0m          
-# . RTD: 2274m     0m          
-###############################################################################
-if [ "$APP" == "apertif-sr2.6" ]; then
-    case "$(hostname)" in 
-        lcu-rt2) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1188 ;;
-        lcu-rt3) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1288 ;;
-        lcu-rt4) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1384 ;;
-        lcu-rt5) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1499 ;;
-        lcu-rt6) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1533 ;;
-        lcu-rt7) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1429 ;;
-        lcu-rt8) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1325 ;;
-        lcu-rt9) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1222 ;;
-        lcu-rta) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1099 ;;
-        lcu-rtb) python $UPE/peripherals/pi_dp_fifo_monitor.py --unb $UNBS --fn 0:3 --reg rd_fill=1099 ;;
-    esac
+    python $UPE/peripherals/pi_dp_fifo_monitor.py    --unb $UNBS --fn 0:3 --reg rd_fill=$RESIDUAL_DELAY
 fi
 
 ###############################################################################