Merge branch 'master' into L2SDP-1013

8e99c331 · Eric Kooistra · a1f36b2a · 758849e9 · 8e99c331 · 8e99c331
Commit 8e99c331 authored 1 year ago by Eric Kooistra
--- a/applications/lofar2/images/images.txt
+++ b/applications/lofar2/images/images.txt
-Image name                                          | Date          | Author               | Usage
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-unb2b_minimal-r03350b9b9                            | 2021-03-19    |                      |
+Purpose: List of kept and used LOFAR2 Station SDP Firmware FPGA images (rbf + sof in tar.gz)

-lofar2_unb2b_filterbank_full-r8a75c955b             | 2021-03-01    | R vd Walle           | Deprecated, better use lofar2_unb2b_sdp_station_fsub-rc125dfd6d
-lofar2_unb2b_sdp_station_adc-rc125dfd6d             | 2021-04-21    | J. Hargreaves        | -
-lofar2_unb2b_sdp_station_adc-r087d98be6             | 2021-06-14    | J. Hargreaves        | -
-lofar2_unb2b_sdp_station_fsub-rbc8dc7f66            | 2021-06-23    | R vd Walle           | See $UPE_GEAR/peripherals/tc_lofar2_unb2b_filterbank.py
-lofar2_unb2b_sdp_station_bf-rc125dfd6d              | 2021-04-21    | R vd Walle           | See $UPE_GEAR/peripherals/tc_lofar2_unb2b_beamformer.py
-lofar2_unb2b_sdp_station_bf-r087d98be6              | 2021-06-14    | R vd Walle           | See $UPE_GEAR/peripherals/tc_lofar2_unb2b_beamformer.py
-lofar2_unb2b_sdp_station_xsub_one-r087d98be6        | 2021-06-14    | R vd Walle           | 
+Authors:
+* RW = R vd Walle
+* EK = E. Kooistra
+* PD = P. Donker
+* JH = J. Hargreaves

-unb2b_minimal-rce6b96eed                            | 2021-08-26    | P. Donker            | unb2b_minimal with new mmap, rbf maid with option --unb2_factory
+Image name                                      | Date       |Author| Usage
+---------------------------------------------------------------------------please-keep-line-length-within-120-char------
+unb2b_minimal-r03350b9b9                        | 2021-03-19 |      |

-lofar2_unb2b_sdp_station_full-r9ff51058a            | 2022-01-12    | R vd Walle           | Old Lofar2 SDP station full design for UniBoard2b without ring.
-lofar2_unb2b_sdp_station_full-r2c3958e1f            | 2022-04-29    | R vd Walle           | Lofar2 SDP station full design for UniBoard2b.
+lofar2_unb2b_filterbank_full-r8a75c955b         | 2021-03-01 | RW   | Deprecated, better use
+                                                                    | lofar2_unb2b_sdp_station_fsub-rc125dfd6d
+lofar2_unb2b_sdp_station_adc-rc125dfd6d         | 2021-04-21 | JH   | -
+lofar2_unb2b_sdp_station_adc-r087d98be6         | 2021-06-14 | JH   | -
+lofar2_unb2b_sdp_station_fsub-rbc8dc7f66        | 2021-06-23 | RW   | See $UPE_GEAR/peripherals/
+                                                                    | tc_lofar2_unb2b_filterbank.py
+lofar2_unb2b_sdp_station_bf-rc125dfd6d          | 2021-04-21 | RW   | See $UPE_GEAR/peripherals/
+                                                                    | tc_lofar2_unb2b_beamformer.py
+lofar2_unb2b_sdp_station_bf-r087d98be6          | 2021-06-14 | RW   | See $UPE_GEAR/peripherals/
+                                                                    | tc_lofar2_unb2b_beamformer.py
+lofar2_unb2b_sdp_station_xsub_one-r087d98be6    | 2021-06-14 | RW   |

-lofar2_unb2b_sdp_station_full_wg-rb1341f599         | 2022-10-24    | R vd Walle           | Lofar2 SDP station design without ADC inputs, only WG. Uses dp_clk + dp_pps instead of rx_clk + rx_sysref.
-lofar2_unb2c_sdp_station_full-rb1341f599            | 2022-10-24    | R vd Walle           | Lofar2 SDP station full design for UniBoard2c.
+unb2b_minimal-rce6b96eed                        | 2021-08-26 | PD   | unb2b_minimal with new mmap, rbf maid with option
+                                                                    | --unb2_factory

-lofar2_unb2b_sdp_station_full_wg-e0f332504          | 2023-01-29    | E. Kooistra          | Lofar2 SDP station full design for UniBoard2b on SDP-arts, with new quantization.
-lofar2_unb2c_sdp_station_full-e0f332504             | 2023-01-29    | E. Kooistra          | Lofar2 SDP station full design for UniBoard2c on DTS-lab, L2TS, with new quantization.
+lofar2_unb2b_sdp_station_full-r9ff51058a        | 2022-01-12 | RW   | Old Lofar2 SDP station full design for UniBoard2b
+                                                                    | without ring.
+lofar2_unb2b_sdp_station_full-r2c3958e1f        | 2022-04-29 | RW   | Lofar2 SDP station full design for UniBoard2b.
+lofar2_unb2b_sdp_station_full_wg-rb1341f599     | 2022-10-24 | RW   | Lofar2 SDP station design without ADC inputs,
+                                                                    | only WG. Uses dp_clk + dp_pps instead of rx_clk +
+                                                                    | rx_sysref.
+lofar2_unb2c_sdp_station_full-rb1341f599        | 2022-10-24 | RW   | Lofar2 SDP station full design for UniBoard2c.

-lofar2_unb2c_ring_full-c9dfeffb9                    | 2023-04-17    | R vd Walle           | $UPE_GEAR/peripherals/tc_lofar2_unb2_ring.py
+lofar2_unb2b_sdp_station_full_wg-e0f332504      | 2023-01-29 | EK   | Lofar2 SDP station full design for UniBoard2b on
+                                                                    | SDP-arts, with new quantization.

+lofar2_unb2c_sdp_station_full-e0f332504         | 2023-01-29 | EK   | Lofar2 SDP station full design for UniBoard2c on
+                                                                    | DTS-lab, L2TS, with new quantization.
+
+lofar2_unb2c_ring_full-c9dfeffb9                | 2023-04-17 | RW   | $UPE_GEAR/peripherals/tc_lofar2_unb2_ring.py
+
+lofar2_unb2c_sdp_station_full-4b45e10a4         | 2023-09-16 | EK   | See [1]. On L2TS in 2023
+lofar2_unb2c_sdp_station_full-04db780e9         | 2023-11-25 | EK   | See [1]. On L2TS from 24 jan 2024. Multiple
+                                                                    | beamlet output destinations (BDO).
+lofar2_unb2c_sdp_station_full-dbc6375ef         | 2024-02-22 | EK   | See [1]. On L2TS. With rxlink_clk - dp_clk FIFO
+                                                                    | in tech_jesd304b_v2 to fix signal input bit
+                                                                    | errors.
+
+References:
+[1] https://support.astron.nl/confluence/display/L2M/L3+SDP+Testing+Notebook%3A+SDP+FW+general


 Example:

 # Create tar.gz file:
-> tar -cvzf lofar2_unb2b_sdp_station_full_wg-e0f332504.tar.gz lofar2_unb2b_sdp_station_full_wg-e0f332504.rbf lofar2_unb2b_sdp_station_full_wg-e0f332504.sof
+> tar -cvzf lofar2_unb2b_sdp_station_full_wg-e0f332504.tar.gz \
+  lofar2_unb2b_sdp_station_full_wg-e0f332504.rbf \
+  lofar2_unb2b_sdp_station_full_wg-e0f332504.sof

 # Extract tar.gz file:
 > tar -xvzf lofar2_unb2b_sdp_station_full_wg-e0f332504.tar.gz
+
+# Actual compression factor depends on the image:
+# . Factor (22612668 + 37439723) / 21332391 = 2.8:
+-rw-rw-r-- 1 kooistra kooistra 21332391 Feb 29 07:42 lofar2_unb2c_sdp_station_full-dbc6375ef.tar.gz
+-rw-rw-r-- 1 kooistra kooistra 22612668 Feb 22 12:12 lofar2_unb2c_sdp_station_full-dbc6375ef.rbf
+-rw-rw-r-- 1 kooistra kooistra 37439723 Feb 22 12:12 lofar2_unb2c_sdp_station_full-dbc6375ef.sof
--- a/applications/lofar2/images/lofar2_unb2c_sdp_station_full-04db780e9.tar.gz
+++ b/applications/lofar2/images/lofar2_unb2c_sdp_station_full-04db780e9.tar.gz
--- a/applications/lofar2/images/lofar2_unb2c_sdp_station_full-4b45e10a4.tar.gz
+++ b/applications/lofar2/images/lofar2_unb2c_sdp_station_full-4b45e10a4.tar.gz
--- a/applications/lofar2/images/lofar2_unb2c_sdp_station_full-dbc6375ef.tar.gz
+++ b/applications/lofar2/images/lofar2_unb2c_sdp_station_full-dbc6375ef.tar.gz
--- a/boards/uniboard2c/images/images.txt
+++ b/boards/uniboard2c/images/images.txt
-Image name                                          | Date          | Author               | Usage
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-unb2c_test_heater-r6825a1822                        | 2021-12-10    | R vd Walle           | See, $UPE_GEAR/peripherals/util_heater.py.
+Purpose: List of kept and used UniBoard2c Firmware FPGA images (rbf + sof in tar.gz)

-unb2c_test_1GbE_I-r7dbc0316d.tar.gz                 | 2022-12-10    | E. Kooistra          | See, $UPE_GEAR/peripherals/tc_unb2_test_eth.py
-unb2c_test_1GbE_II-rac961afe2.tar.gz                | 2022-12-20    | E. Kooistra          | See, $UPE_GEAR/peripherals/tc_unb2_test_eth.py
+Authors:
+* RW = R vd Walle
+* EK = E. Kooistra
+* PD = P. Donker
+* JH = J. Hargreaves

+Image name                                      | Date       |Author| Usage
+---------------------------------------------------------------------------please-keep-line-length-within-120-char------
+unb2c_test_heater-r6825a1822                    | 2021-12-10 | RW   | See, $UPE_GEAR/peripherals/util_heater.py.

+unb2c_test_1GbE_I-r7dbc0316d                    | 2022-12-10 | EK   | See [1], $UPE_GEAR/peripherals/tc_unb2_test_eth.py
+unb2c_test_1GbE_II-rac961afe2                   | 2022-12-20 | EK   | See [1], $UPE_GEAR/peripherals/tc_unb2_test_eth.py
+
+
+References:
+[1] https://support.astron.nl/confluence/display/L2M/L3+SDP+Testing+Notebook%3A+1GbE+tests


 Example:
@@ -15,3 +25,15 @@ Example:

 # Extract tar.gz file:
 > tar -xvzf unb2c_test_1GbE_I-r7dbc0316d.tar.gz
+
+# Actual compression factor depends on the image and varies between about 2 and 10:
+# . Factor (22445724 + 37210805) / 4185128 = 14.2:
+-rw-rw-r-- 1 kooistra kooistra  4185128 Dec 13  2022 unb2c_test_1GbE_I-r7dbc0316d.tar.gz
+-rw-rw-r-- 1 kooistra kooistra 22445724 Dec 12  2022 unb2c_test_1GbE_I.rbf
+-rw-rw-r-- 1 kooistra kooistra 37210805 Dec 12  2022 unb2c_test_1GbE_I.sof
+
+# . Factor (22723588 + 37179056) / 29576001 = 2.0:
+-rw-rw-r-- 1 kooistra kooistra 29576001 Jan  4  2022 unb2c_test_heater-r6825a1822.tar.gz
+-rw-rw-r-- 1 kooistra kooistra 22723588 Dec 14  2021 unb2c_test_heater-r6825a1822.rbf
+-rw-rw-r-- 1 kooistra kooistra 37179056 Dec 10  2021 unb2c_test_heater-r6825a1822.sof
+