L2SDP-261, merged with master can be compiled but not done.

src/constants.h

@@ -54,7 +54,7 @@
 #define C_N_fft 1024  // The FFT size defines the number of samples per block.
 #define C_N_pol 2  // Number of antenna polarizations, X and Y.
 #define C_A_pn 6  // Number of dual polarization antennas per Processing Node (PN) FPGA.
-// #define C_N_beamlets 976  // Number of beamlets per antenna band  488, 976
+#define C_N_beamlets 976  // Number of beamlets per antenna band  488, 976  // TODO: check
 #define C_V_si_db 1024  // Size of the databuffer per signal input (SI), to capture
                         // a snapshot of the signal input data (ADC JESD204B data or WG data)
 #define C_V_si_histogram 512  // Number of bins of the histogram per signal input (SI).

src/periph/fpga.cpp

@@ -529,6 +529,7 @@ bool Periph_fpga::write(TermOutput& termout, const string addr, const string typ
         }
         else if (addr == "fpga/bf_weights_xy_yx") {
             retval = write_bf_weights_xy_yx(data);
+        }
         else if (addr == "fpga/subband_spectral_inversion") {
             retval = write_subband_spectral_inversion(data);
         }
@@ -2243,8 +2244,8 @@ bool Periph_fpga::read_bf_weights_xx_yy(TermOutput& termout, int format)
     uint32_t n_inst = mmap->getNInstances("mm/?/RAM_BF_WEIGHTS/0/data");
     uint32_t n_ports = mmap->getNPorts("mm/0/RAM_BF_WEIGHTS/0/data");
     uint32_t span = mmap->getSpan("mm/0/RAM_BF_WEIGHTS/0/data");
-    uint32_t ports_span = mmap->getPortSpan("mm/0/RAM_BF_WEIGHTS/0/data");
-    uint32_t perip_span = mmap->getPeripheralSpan("mm/0/RAM_BF_WEIGHTS/0/data");
+    // uint32_t ports_span = mmap->getPortSpan("mm/0/RAM_BF_WEIGHTS/0/data");
+    // uint32_t perip_span = mmap->getPeripheralSpan("mm/0/RAM_BF_WEIGHTS/0/data");
 
     uint32_t *ptr = (uint32_t *)termout.val;
     string regname;
@@ -2267,8 +2268,8 @@ bool Periph_fpga::write_bf_weights_xx_yy(const char *data)
     uint32_t n_inst = mmap->getNInstances("mm/?/RAM_BF_WEIGHTS/0/data");
     uint32_t n_ports = mmap->getNPorts("mm/0/RAM_BF_WEIGHTS/0/data");
     uint32_t span = mmap->getSpan("mm/0/RAM_BF_WEIGHTS/0/data");
-    uint32_t ports_span = mmap->getPortSpan("mm/0/RAM_BF_WEIGHTS/0/data");
-    uint32_t perip_span = mmap->getPeripheralSpan("mm/0/RAM_BF_WEIGHTS/0/data");
+    // uint32_t ports_span = mmap->getPortSpan("mm/0/RAM_BF_WEIGHTS/0/data");
+    // uint32_t perip_span = mmap->getPeripheralSpan("mm/0/RAM_BF_WEIGHTS/0/data");
 
     // uint32_t n_beamsets;
     // cf->getValue("n_beamsets", n_beamsets);
@@ -2294,8 +2295,8 @@ bool Periph_fpga::read_bf_weights_xy_yx(TermOutput& termout, int format)
     uint32_t n_inst = mmap->getNInstances("mm/?/RAM_BF_WEIGHTS/0/data");
     uint32_t n_ports = mmap->getNPorts("mm/0/RAM_BF_WEIGHTS/0/data");
     uint32_t span = mmap->getSpan("mm/0/RAM_BF_WEIGHTS/0/data");
-    uint32_t ports_span = mmap->getPortSpan("mm/0/RAM_BF_WEIGHTS/0/data");
-    uint32_t perip_span = mmap->getPeripheralSpan("mm/0/RAM_BF_WEIGHTS/0/data");
+    // uint32_t ports_span = mmap->getPortSpan("mm/0/RAM_BF_WEIGHTS/0/data");
+    // uint32_t perip_span = mmap->getPeripheralSpan("mm/0/RAM_BF_WEIGHTS/0/data");
 
     uint32_t *ptr = (uint32_t *)termout.val;
     string regname;
@@ -2318,8 +2319,8 @@ bool Periph_fpga::write_bf_weights_xy_yx(const char *data)
     uint32_t n_inst = mmap->getNInstances("mm/?/RAM_BF_WEIGHTS/0/data");
     uint32_t n_ports = mmap->getNPorts("mm/0/RAM_BF_WEIGHTS/0/data");
     uint32_t span = mmap->getSpan("mm/0/RAM_BF_WEIGHTS/0/data");
-    uint32_t ports_span = mmap->getPortSpan("mm/0/RAM_BF_WEIGHTS/0/data");
-    uint32_t perip_span = mmap->getPeripheralSpan("mm/0/RAM_BF_WEIGHTS/0/data");
+    // uint32_t ports_span = mmap->getPortSpan("mm/0/RAM_BF_WEIGHTS/0/data");
+    // uint32_t perip_span = mmap->getPeripheralSpan("mm/0/RAM_BF_WEIGHTS/0/data");
 
     // uint32_t n_beamsets;
     // cf->getValue("n_beamsets", n_beamsets);