From 983294f52f58e656172402bdb46688070c5c2939 Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Wed, 17 Dec 2014 15:24:10 +0000
Subject: [PATCH] -Added corr_unfolder.vhd at the correlator input; -Modified
 gen_hex_files_complex_subbands to generate folded data. =>Now the correlator
 accepts interleaved inputs as well.

---
 libraries/dsp/correlator/hdllib.cfg           |   1 +
 ....hex => complex_subbands_16b_fold_0_0.hex} |   0
 ....hex => complex_subbands_16b_fold_0_1.hex} |   0
 ...hex => complex_subbands_16b_fold_0_10.hex} |   0
 ...hex => complex_subbands_16b_fold_0_11.hex} |   0
 ...hex => complex_subbands_16b_fold_0_12.hex} |   0
 ...hex => complex_subbands_16b_fold_0_13.hex} |   0
 ...hex => complex_subbands_16b_fold_0_14.hex} |   0
 ...hex => complex_subbands_16b_fold_0_15.hex} |   0
 ...hex => complex_subbands_16b_fold_0_16.hex} |   0
 ...hex => complex_subbands_16b_fold_0_17.hex} |   0
 ...hex => complex_subbands_16b_fold_0_18.hex} |   0
 ...hex => complex_subbands_16b_fold_0_19.hex} |   0
 ....hex => complex_subbands_16b_fold_0_2.hex} |   0
 ...hex => complex_subbands_16b_fold_0_20.hex} |   0
 ...hex => complex_subbands_16b_fold_0_21.hex} |   0
 ...hex => complex_subbands_16b_fold_0_22.hex} |   0
 ...hex => complex_subbands_16b_fold_0_23.hex} |   0
 ....hex => complex_subbands_16b_fold_0_3.hex} |   0
 ....hex => complex_subbands_16b_fold_0_4.hex} |   0
 ....hex => complex_subbands_16b_fold_0_5.hex} |   0
 ....hex => complex_subbands_16b_fold_0_6.hex} |   0
 ....hex => complex_subbands_16b_fold_0_7.hex} |   0
 ....hex => complex_subbands_16b_fold_0_8.hex} |   0
 ....hex => complex_subbands_16b_fold_0_9.hex} |   0
 .../src/hex/complex_subbands_16b_fold_1_0.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_1.hex | 129 ++++++++++++++++
 .../hex/complex_subbands_16b_fold_1_10.hex    | 129 ++++++++++++++++
 .../hex/complex_subbands_16b_fold_1_11.hex    | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_2.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_3.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_4.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_5.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_6.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_7.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_8.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_16b_fold_1_9.hex | 129 ++++++++++++++++
 ...0.hex => complex_subbands_8b_fold_0_0.hex} |   0
 ...1.hex => complex_subbands_8b_fold_0_1.hex} |   0
 ....hex => complex_subbands_8b_fold_0_10.hex} |   0
 ....hex => complex_subbands_8b_fold_0_11.hex} |   0
 ....hex => complex_subbands_8b_fold_0_12.hex} |   0
 ....hex => complex_subbands_8b_fold_0_13.hex} |   0
 ....hex => complex_subbands_8b_fold_0_14.hex} |   0
 ....hex => complex_subbands_8b_fold_0_15.hex} |   0
 ....hex => complex_subbands_8b_fold_0_16.hex} |   0
 ....hex => complex_subbands_8b_fold_0_17.hex} |   0
 ....hex => complex_subbands_8b_fold_0_18.hex} |   0
 ....hex => complex_subbands_8b_fold_0_19.hex} |   0
 ...2.hex => complex_subbands_8b_fold_0_2.hex} |   0
 ....hex => complex_subbands_8b_fold_0_20.hex} |   0
 ....hex => complex_subbands_8b_fold_0_21.hex} |   0
 ....hex => complex_subbands_8b_fold_0_22.hex} |   0
 ....hex => complex_subbands_8b_fold_0_23.hex} |   0
 ...3.hex => complex_subbands_8b_fold_0_3.hex} |   0
 ...4.hex => complex_subbands_8b_fold_0_4.hex} |   0
 ...5.hex => complex_subbands_8b_fold_0_5.hex} |   0
 ...6.hex => complex_subbands_8b_fold_0_6.hex} |   0
 ...7.hex => complex_subbands_8b_fold_0_7.hex} |   0
 ...8.hex => complex_subbands_8b_fold_0_8.hex} |   0
 ...9.hex => complex_subbands_8b_fold_0_9.hex} |   0
 .../src/hex/complex_subbands_8b_fold_1_0.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_1.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_10.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_11.hex | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_2.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_3.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_4.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_5.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_6.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_7.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_8.hex  | 129 ++++++++++++++++
 .../src/hex/complex_subbands_8b_fold_1_9.hex  | 129 ++++++++++++++++
 .../python/gen_hex_files_complex_subbands.py  |  26 +++-
 .../dsp/correlator/src/vhdl/corr_unfolder.vhd | 139 ++++++++++++++++++
 .../dsp/correlator/src/vhdl/correlator.vhd    |  50 ++++++-
 .../dsp/correlator/tb/vhdl/tb_correlator.vhd  |  29 ++--
 77 files changed, 3315 insertions(+), 26 deletions(-)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_0.hex => complex_subbands_16b_fold_0_0.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_1.hex => complex_subbands_16b_fold_0_1.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_10.hex => complex_subbands_16b_fold_0_10.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_11.hex => complex_subbands_16b_fold_0_11.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_12.hex => complex_subbands_16b_fold_0_12.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_13.hex => complex_subbands_16b_fold_0_13.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_14.hex => complex_subbands_16b_fold_0_14.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_15.hex => complex_subbands_16b_fold_0_15.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_16.hex => complex_subbands_16b_fold_0_16.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_17.hex => complex_subbands_16b_fold_0_17.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_18.hex => complex_subbands_16b_fold_0_18.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_19.hex => complex_subbands_16b_fold_0_19.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_2.hex => complex_subbands_16b_fold_0_2.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_20.hex => complex_subbands_16b_fold_0_20.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_21.hex => complex_subbands_16b_fold_0_21.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_22.hex => complex_subbands_16b_fold_0_22.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_23.hex => complex_subbands_16b_fold_0_23.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_3.hex => complex_subbands_16b_fold_0_3.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_4.hex => complex_subbands_16b_fold_0_4.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_5.hex => complex_subbands_16b_fold_0_5.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_6.hex => complex_subbands_16b_fold_0_6.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_7.hex => complex_subbands_16b_fold_0_7.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_8.hex => complex_subbands_16b_fold_0_8.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_16_9.hex => complex_subbands_16b_fold_0_9.hex} (100%)
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_0.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_1.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_10.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_11.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_2.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_3.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_4.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_5.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_6.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_7.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_8.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_9.hex
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_0.hex => complex_subbands_8b_fold_0_0.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_1.hex => complex_subbands_8b_fold_0_1.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_10.hex => complex_subbands_8b_fold_0_10.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_11.hex => complex_subbands_8b_fold_0_11.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_12.hex => complex_subbands_8b_fold_0_12.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_13.hex => complex_subbands_8b_fold_0_13.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_14.hex => complex_subbands_8b_fold_0_14.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_15.hex => complex_subbands_8b_fold_0_15.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_16.hex => complex_subbands_8b_fold_0_16.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_17.hex => complex_subbands_8b_fold_0_17.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_18.hex => complex_subbands_8b_fold_0_18.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_19.hex => complex_subbands_8b_fold_0_19.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_2.hex => complex_subbands_8b_fold_0_2.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_20.hex => complex_subbands_8b_fold_0_20.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_21.hex => complex_subbands_8b_fold_0_21.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_22.hex => complex_subbands_8b_fold_0_22.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_23.hex => complex_subbands_8b_fold_0_23.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_3.hex => complex_subbands_8b_fold_0_3.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_4.hex => complex_subbands_8b_fold_0_4.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_5.hex => complex_subbands_8b_fold_0_5.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_6.hex => complex_subbands_8b_fold_0_6.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_7.hex => complex_subbands_8b_fold_0_7.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_8.hex => complex_subbands_8b_fold_0_8.hex} (100%)
 rename libraries/dsp/correlator/src/hex/{complex_subbands_8_9.hex => complex_subbands_8b_fold_0_9.hex} (100%)
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_0.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_1.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_10.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_11.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_2.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_3.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_4.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_5.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_6.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_7.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_8.hex
 create mode 100644 libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_9.hex
 create mode 100644 libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd

diff --git a/libraries/dsp/correlator/hdllib.cfg b/libraries/dsp/correlator/hdllib.cfg
index 33e5ba72cf..aa0b351b99 100644
--- a/libraries/dsp/correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/hdllib.cfg
@@ -8,6 +8,7 @@ build_dir_synth = $HDL_BUILD_DIR
 
 synth_files =
     $SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_carousel.vhd
+    $SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd
     $SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_permutator.vhd
     $SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_folder.vhd
     $SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_folder_2arr_2.vhd
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_0.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_0.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_0.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_0.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_1.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_1.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_1.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_1.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_10.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_10.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_10.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_10.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_11.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_11.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_11.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_11.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_12.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_12.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_12.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_12.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_13.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_13.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_13.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_13.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_14.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_14.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_14.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_14.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_15.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_15.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_15.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_15.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_16.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_16.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_16.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_16.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_17.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_17.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_17.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_17.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_18.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_18.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_18.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_18.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_19.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_19.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_19.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_19.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_2.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_2.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_2.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_2.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_20.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_20.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_20.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_20.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_21.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_21.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_21.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_21.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_22.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_22.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_22.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_22.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_23.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_23.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_23.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_23.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_3.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_3.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_3.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_3.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_4.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_4.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_4.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_4.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_5.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_5.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_5.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_5.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_6.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_6.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_6.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_6.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_7.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_7.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_7.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_7.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_8.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_8.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_8.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_8.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16_9.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_9.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_16_9.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_0_9.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_0.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_0.hex
new file mode 100644
index 0000000000..acdda72f2a
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_0.hex
@@ -0,0 +1,129 @@
+:040000007FBB023B85
+:040001007FAC047557
+:040002007FBC023B82
+:040003007FAD047554
+:040004007FBD023B7F
+:040005007FAE047551
+:040006007FBE023B7C
+:040007007FAF04754E
+:040008007FBF023B79
+:040009007FB004754B
+:04000A007FC0023B76
+:04000B007FB1047647
+:04000C007FC1023B73
+:04000D007FB2047644
+:04000E007FC2023B70
+:04000F007FB3047641
+:040010007FC3023B6D
+:040011007FB404763E
+:040012007FC4023B6A
+:040013007FB504763B
+:040014007FC5023B67
+:040015007FB6047638
+:040016007FC6023B64
+:040017007FB7047635
+:040018007FC7023B61
+:040019007FB8047632
+:04001A007FC8023B5E
+:04001B007FB904762F
+:04001C007FC9023B5B
+:04001D007FBA04762C
+:04001E007FCA023B58
+:04001F007FBB047629
+:040020007FCB023B55
+:040021007FBC047626
+:040022007FCC023B52
+:040023007FBD047623
+:040024007FCD023B4F
+:040025007FBE047620
+:040026007FCE023B4C
+:040027007FBF04761D
+:040028007FCF023B49
+:040029007FC004761A
+:04002A007FD0023B46
+:04002B007FC1047617
+:04002C007FD1023B43
+:04002D007FC2047614
+:04002E007FD2023B40
+:04002F007FC3047611
+:040030007FD3023B3D
+:040031007FC404760E
+:040032007FD4023B3A
+:040033007FC504760B
+:040034007FD5023B37
+:040035007FC6047608
+:040036007FD6023B34
+:040037007FC7047605
+:040038007FD7023B31
+:040039007FC8047602
+:04003A007FD8023B2E
+:04003B007FC90476FF
+:04003C007FD9023B2B
+:04003D007FCA0476FC
+:04003E007FDA023B28
+:04003F007FCB0476F9
+:040040007FDB023B25
+:040041007FCC0476F6
+:040042007FDC023B22
+:040043007FCD0477F2
+:040044007FDD023B1F
+:040045007FCE0477EF
+:040046007FDE023B1C
+:040047007FCF0477EC
+:040048007FDF023B19
+:040049007FD00477E9
+:04004A007FE0023B16
+:04004B007FD10477E6
+:04004C007FE1023B13
+:04004D007FD20477E3
+:04004E007FE2023B10
+:04004F007FD30477E0
+:040050007FE3023B0D
+:040051007FD40477DD
+:040052007FE4023B0A
+:040053007FD50477DA
+:040054007FE5023B07
+:040055007FD60477D7
+:040056007FE6023C03
+:040057007FD70477D4
+:040058007FE7023C00
+:040059007FD80477D1
+:04005A007FE8023CFD
+:04005B007FD90477CE
+:04005C007FE9023CFA
+:04005D007FDA0477CB
+:04005E007FEA023CF7
+:04005F007FDB0477C8
+:040060007FEB023CF4
+:040061007FDC0477C5
+:040062007FEC023CF1
+:040063007FDD0477C2
+:040064007FED023CEE
+:040065007FDE0477BF
+:040066007FEE023CEB
+:040067007FDF0477BC
+:040068007FEF023CE8
+:040069007FE00477B9
+:04006A007FF0023CE5
+:04006B007FE10477B6
+:04006C007FF1023CE2
+:04006D007FE20477B3
+:04006E007FF2023CDF
+:04006F007FE30477B0
+:040070007FF3023CDC
+:040071007FE40477AD
+:040072007FF4023CD9
+:040073007FE50477AA
+:040074007FF5023CD6
+:040075007FE60477A7
+:040076007FF6023CD3
+:040077007FE70477A4
+:040078007FF7023CD0
+:040079007FE80477A1
+:04007A007FF8023CCD
+:04007B007FE904779E
+:04007C007FF9023CCA
+:04007D007FEA04789A
+:04007E007FFA023CC7
+:04007F007FEB047897
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_1.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_1.hex
new file mode 100644
index 0000000000..4f8eb1dfe6
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_1.hex
@@ -0,0 +1,129 @@
+:040000007F9306B034
+:040001007F7008E91B
+:040002007F9406B031
+:040003007F7108E918
+:040004007F9506B02E
+:040005007F7208E915
+:040006007F9606B02B
+:040007007F7308EA11
+:040008007F9706B028
+:040009007F7408EA0E
+:04000A007F9806B025
+:04000B007F7508EA0B
+:04000C007F9906B022
+:04000D007F7608EA08
+:04000E007F9A06B01F
+:04000F007F7708EA05
+:040010007F9B06B01C
+:040011007F7808EA02
+:040012007F9C06B019
+:040013007F7908EAFF
+:040014007F9D06B016
+:040015007F7A08EAFC
+:040016007F9E06B013
+:040017007F7B08EAF9
+:040018007F9F06B010
+:040019007F7C08EAF6
+:04001A007FA006B00D
+:04001B007F7D08EAF3
+:04001C007FA106B00A
+:04001D007F7E08EAF0
+:04001E007FA206B007
+:04001F007F7F08EAED
+:040020007FA306B004
+:040021007F8008EAEA
+:040022007FA406B001
+:040023007F8108EBE6
+:040024007FA506B1FD
+:040025007F8208EBE3
+:040026007FA606B1FA
+:040027007F8308EBE0
+:040028007FA706B1F7
+:040029007F8408EBDD
+:04002A007FA806B1F4
+:04002B007F8508EBDA
+:04002C007FA906B1F1
+:04002D007F8608EBD7
+:04002E007FAA06B1EE
+:04002F007F8708EBD4
+:040030007FAB06B1EB
+:040031007F8808EBD1
+:040032007FAC06B1E8
+:040033007F8908EBCE
+:040034007FAD06B1E5
+:040035007F8A08EBCB
+:040036007FAE06B1E2
+:040037007F8B08EBC8
+:040038007FAF06B1DF
+:040039007F8C08EBC5
+:04003A007FB006B1DC
+:04003B007F8D08EBC2
+:04003C007FB106B1D9
+:04003D007F8E08EBBF
+:04003E007FB206B1D6
+:04003F007F8F08EBBC
+:040040007FB306B1D3
+:040041007F9008ECB8
+:040042007FB406B1D0
+:040043007F9108ECB5
+:040044007FB506B1CD
+:040045007F9208ECB2
+:040046007FB606B1CA
+:040047007F9308ECAF
+:040048007FB706B1C7
+:040049007F9408ECAC
+:04004A007FB806B2C3
+:04004B007F9508ECA9
+:04004C007FB906B2C0
+:04004D007F9608ECA6
+:04004E007FBA06B2BD
+:04004F007F9708ECA3
+:040050007FBB06B2BA
+:040051007F9808ECA0
+:040052007FBC06B2B7
+:040053007F9908EC9D
+:040054007FBD06B2B4
+:040055007F9A08EC9A
+:040056007FBE06B2B1
+:040057007F9B08EC97
+:040058007FBF06B2AE
+:040059007F9C08EC94
+:04005A007FC006B2AB
+:04005B007F9D08EC91
+:04005C007FC106B2A8
+:04005D007F9E08ED8D
+:04005E007FC206B2A5
+:04005F007F9F08ED8A
+:040060007FC306B2A2
+:040061007FA008ED87
+:040062007FC406B29F
+:040063007FA108ED84
+:040064007FC506B29C
+:040065007FA208ED81
+:040066007FC606B299
+:040067007FA308ED7E
+:040068007FC706B296
+:040069007FA408ED7B
+:04006A007FC806B293
+:04006B007FA508ED78
+:04006C007FC906B290
+:04006D007FA608ED75
+:04006E007FCA06B28D
+:04006F007FA708ED72
+:040070007FCB06B389
+:040071007FA808ED6F
+:040072007FCC06B386
+:040073007FA908ED6C
+:040074007FCD06B383
+:040075007FAA08ED69
+:040076007FCE06B380
+:040077007FAB08ED66
+:040078007FCF06B37D
+:040079007FAC08EE62
+:04007A007FD006B37A
+:04007B007FAD08EE5F
+:04007C007FD106B377
+:04007D007FAE08EE5C
+:04007E007FD206B374
+:04007F007FAF08EE59
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_10.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_10.hex
new file mode 100644
index 0000000000..9b7db8572e
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_10.hex
@@ -0,0 +1,129 @@
+:0400000077442DC84C
+:0400010076732FDB08
+:0400020077452DC849
+:0400030076742FDC04
+:0400040077462DC945
+:0400050076742FDC02
+:0400060077472DC942
+:0400070076752FDCFF
+:0400080077482DC93F
+:0400090076762FDDFB
+:04000A0077482DCA3C
+:04000B0076772FDDF8
+:04000C0077492DCA39
+:04000D0076782FDDF5
+:04000E00774A2DCB35
+:04000F0076792FDEF1
+:04001000774B2DCB32
+:04001100767A2FDEEE
+:04001200774C2DCB2F
+:04001300767B2FDFEA
+:04001400774D2DCC2B
+:04001500767C2FDFE7
+:04001600774E2DCC28
+:04001700767D2FDFE4
+:04001800774F2DCC25
+:04001900767E2FE0E0
+:04001A0077502DCD21
+:04001B00767F2FE0DD
+:04001C0077512DCD1E
+:04001D0076802FE0DA
+:04001E0077522DCD1B
+:04001F0076812FE1D6
+:0400200077532DCE17
+:0400210076812FE1D4
+:0400220077542DCE14
+:0400230076822FE2D0
+:0400240077552DCF10
+:0400250076832FE2CD
+:0400260077562DCF0D
+:0400270076842FE2CA
+:0400280077562DCF0B
+:0400290076852FE3C6
+:04002A0077572DD007
+:04002B0076862FE3C3
+:04002C0077582DD004
+:04002D0076872FE3C0
+:04002E0077592DD001
+:04002F0076882FE4BC
+:04003000775A2DD1FD
+:0400310076892FE4B9
+:04003200775B2DD1FA
+:04003300768A2FE4B6
+:04003400775C2DD1F7
+:04003500768B2FE5B2
+:04003600775D2DD2F3
+:04003700768C2FE5AF
+:04003800775E2DD2F0
+:04003900768D2FE6AB
+:04003A00775F2DD2ED
+:04003B00768E2FE6A8
+:04003C0077602DD3E9
+:04003D00768E2FE6A6
+:04003E0077612DD3E6
+:04003F00768F2FE7A2
+:0400400077622DD4E2
+:0400410076902FE79F
+:0400420077632DD4DF
+:0400430076912FE79C
+:0400440077642DD4DC
+:0400450076922FE898
+:0400460077642DD5D9
+:0400470076932FE895
+:0400480077652DD5D6
+:0400490076942FE991
+:04004A0077662DD5D3
+:04004B0076952FE98E
+:04004C0077672DD6CF
+:04004D0076962FE98B
+:04004E0077682DD6CC
+:04004F0076972FEA87
+:0400500077692DD6C9
+:0400510076982FEA84
+:04005200776A2DD7C5
+:0400530076992FEA81
+:04005400776B2DD7C2
+:04005500769A2FEB7D
+:04005600776C2DD7BF
+:04005700769A2FEB7B
+:04005800776D2DD8BB
+:04005900769B2FEC77
+:04005A00776E2DD8B8
+:04005B00769C2FEC74
+:04005C00776F2DD9B4
+:04005D00769D2FEC71
+:04005E0077702DD9B1
+:04005F00769E2FED6D
+:0400600077712DD9AE
+:04006100769F2FED6A
+:0400620077722DDAAA
+:0400630076A02FED67
+:0400640077722DDAA8
+:0400650076A12FEE63
+:0400660077732DDAA5
+:0400670076A22FEE60
+:0400680077742DDBA1
+:0400690076A32FEF5C
+:04006A0077752DDB9E
+:04006B0076A42FEF59
+:04006C0077762DDB9B
+:04006D0076A52FEF56
+:04006E0077772DDC97
+:04006F0076A62FF052
+:0400700077782DDC94
+:0400710076A72FF04F
+:0400720077792DDC91
+:0400730076A72FF04D
+:04007400777A2DDD8D
+:0400750076A82FF149
+:04007600777B2DDD8A
+:0400770076A92FF146
+:04007800777C2DDE86
+:0400790076AA2FF242
+:04007A00777D2DDE83
+:04007B0076AB2FF23F
+:04007C00777E2DDE80
+:04007D0076AC2FF23C
+:04007E00777F2DDF7C
+:04007F0076AD2FF338
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_11.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_11.hex
new file mode 100644
index 0000000000..36ec64240d
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_11.hex
@@ -0,0 +1,129 @@
+:04000000759831EAD4
+:0400010074B533F6A9
+:04000200759931EBD0
+:0400030074B633F6A6
+:04000400759A31EBCD
+:0400050074B633F7A3
+:04000600759B31ECC9
+:0400070074B733F7A0
+:04000800759C31ECC6
+:0400090074B833F89C
+:04000A00759D31ECC3
+:04000B0074B933F899
+:04000C00759E31EDBF
+:04000D0074BA33F896
+:04000E00759F31EDBC
+:04000F0074BB33F992
+:0400100075A031EEB8
+:0400110074BC33F98F
+:0400120075A031EEB6
+:0400130074BD33FA8B
+:0400140075A131EEB3
+:0400150074BE33FA88
+:0400160075A231EFAF
+:0400170074BF33FA85
+:0400180075A331EFAC
+:0400190074C033FB81
+:04001A0075A431F0A8
+:04001B0074C033FB7F
+:04001C0075A531F0A5
+:04001D0074C133FC7B
+:04001E0075A631F0A2
+:04001F0074C233FC78
+:0400200075A731F19E
+:0400210074C333FC75
+:0400220075A831F19B
+:0400230074C433FD71
+:0400240075A931F297
+:0400250074C533FD6E
+:0400260075AA31F294
+:0400270074C633FE6A
+:0400280075AB31F291
+:0400290074C733FE67
+:04002A0075AC31F38D
+:04002B0074C833FE64
+:04002C0075AC31F38B
+:04002D0074C933FF60
+:04002E0075AD31F388
+:04002F0074CA33FF5D
+:0400300075AE31F484
+:0400310074CB340058
+:0400320075AF31F481
+:0400330074CB340056
+:0400340075B031F57D
+:0400350074CC340053
+:0400360075B131F57A
+:0400370074CD34014F
+:0400380075B231F577
+:0400390074CE34014C
+:04003A0075B331F673
+:04003B0074CF340248
+:04003C0075B431F670
+:04003D0074D0340245
+:04003E0075B531F76C
+:04003F0074D1340341
+:0400400075B631F769
+:0400410074D234033E
+:0400420075B731F766
+:0400430074D334033B
+:0400440075B731F863
+:0400450074D4340437
+:0400460075B831F860
+:0400470074D5340434
+:0400480075B931F95C
+:0400490074D5340531
+:04004A0075BA31F959
+:04004B0074D634052E
+:04004C0075BB31F956
+:04004D0074D734052B
+:04004E0075BC31FA52
+:04004F0074D8340627
+:0400500075BD31FA4F
+:0400510074D9340624
+:0400520075BE31FA4C
+:0400530074DA340720
+:0400540075BF31FB48
+:0400550074DB34071D
+:0400560075C031FB45
+:0400570074DC34071A
+:0400580075C131FC41
+:0400590074DD340816
+:04005A0075C231FC3E
+:04005B0074DE340813
+:04005C0075C331FC3B
+:04005D0074DF34090F
+:04005E0075C331FD38
+:04005F0074E034090C
+:0400600075C431FD35
+:0400610074E034090A
+:0400620075C531FE31
+:0400630074E1340A06
+:0400640075C631FE2E
+:0400650074E2340A03
+:0400660075C731FE2B
+:0400670074E3340BFF
+:0400680075C831FF27
+:0400690074E4340BFC
+:04006A0075C931FF24
+:04006B0074E5340BF9
+:04006C0075CA32001F
+:04006D0074E6340CF5
+:04006E0075CB32001C
+:04006F0074E7340CF2
+:0400700075CC320019
+:0400710074E8340DEE
+:0400720075CD320115
+:0400730074E9340DEB
+:0400740075CE320112
+:0400750074EA340EE7
+:0400760075CF32020E
+:0400770074EA340EE5
+:0400780075CF32020C
+:0400790074EB340EE2
+:04007A0075D0320209
+:04007B0074EC340FDE
+:04007C0075D1320305
+:04007D0074ED340FDB
+:04007E0075D2320302
+:04007F0074EE3410D7
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_2.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_2.hex
new file mode 100644
index 0000000000..a4b60f66b7
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_2.hex
@@ -0,0 +1,129 @@
+:040000007F440B220C
+:040001007F0D0D5A08
+:040002007F450B2209
+:040003007F0E0D5B04
+:040004007F460B2305
+:040005007F0F0D5B01
+:040006007F470B2302
+:040007007F100D5BFE
+:040008007F480B23FF
+:040009007F110D5BFB
+:04000A007F490B23FC
+:04000B007F120D5BF8
+:04000C007F4A0B23F9
+:04000D007F130D5BF5
+:04000E007F4B0B23F6
+:04000F007F140D5BF2
+:040010007F4C0B23F3
+:040011007F150D5BEF
+:040012007F4D0B23F0
+:040013007F160D5BEC
+:040014007F4E0B23ED
+:040015007F170D5CE8
+:040016007F4F0B23EA
+:040017007F180D5CE5
+:040018007F500B23E7
+:040019007F190D5CE2
+:04001A007F510B23E4
+:04001B007F1A0D5CDF
+:04001C007F510B24E1
+:04001D007F1B0D5CDC
+:04001E007F520B24DE
+:04001F007F1C0D5CD9
+:040020007F530B24DB
+:040021007F1D0D5CD6
+:040022007F540B24D8
+:040023007F1E0D5CD3
+:040024007F550B24D5
+:040025007F1F0D5CD0
+:040026007F560B24D2
+:040027007F200D5CCD
+:040028007F570B24CF
+:040029007F210D5DC9
+:04002A007F580B24CC
+:04002B007F220D5DC6
+:04002C007F590B24C9
+:04002D007F230D5DC3
+:04002E007F5A0B24C6
+:04002F007F240D5DC0
+:040030007F5B0B24C3
+:040031007F250D5DBD
+:040032007F5C0B25BF
+:040033007F260D5DBA
+:040034007F5D0B25BC
+:040035007F270D5DB7
+:040036007F5E0B25B9
+:040037007F280D5DB4
+:040038007F5F0B25B6
+:040039007F290D5DB1
+:04003A007F600B25B3
+:04003B007F2A0D5EAD
+:04003C007F610B25B0
+:04003D007F2B0D5EAA
+:04003E007F620B25AD
+:04003F007F2C0D5EA7
+:040040007F630B25AA
+:040041007F2D0D5EA4
+:040042007F640B25A7
+:040043007F2E0D5EA1
+:040044007F650B25A4
+:040045007F2F0D5E9E
+:040046007F660B25A1
+:040047007F300D5E9B
+:040048007F670B259E
+:040049007F310D5E98
+:04004A007F680B269A
+:04004B007F320D5E95
+:04004C007F690B2697
+:04004D007F330D5E92
+:04004E007F6A0B2694
+:04004F007F340D5F8E
+:040050007F6B0B2691
+:040051007F350D5F8B
+:040052007F6C0B268E
+:040053007F360D5F88
+:040054007F6D0B268B
+:040055007F370D5F85
+:040056007F6E0B2688
+:040057007F380D5F82
+:040058007F6F0B2685
+:040059007F390D5F7F
+:04005A007F700B2682
+:04005B007F3A0D5F7C
+:04005C007F710B267F
+:04005D007F3B0D5F79
+:04005E007F720B267C
+:04005F007F3C0D5F76
+:040060007F730B2778
+:040061007F3D0D6072
+:040062007F740B2775
+:040063007F3E0D606F
+:040064007F750B2772
+:040065007F3F0D606C
+:040066007F760B276F
+:040067007F400D6069
+:040068007F770B276C
+:040069007F410D6066
+:04006A007F780B2769
+:04006B007F420D6063
+:04006C007F790B2766
+:04006D007F430D6060
+:04006E007F7A0B2763
+:04006F007F440D605D
+:040070007F7B0B2760
+:040071007F450D605A
+:040072007F7C0B275D
+:040073007F460D6057
+:040074007F7D0B275A
+:040075007F470D6153
+:040076007F7E0B2757
+:040077007F480D6150
+:040078007F7F0B2853
+:040079007F490D614D
+:04007A007F800B2850
+:04007B007F4A0D614A
+:04007C007F810B284D
+:04007D007F4B0D6147
+:04007E007F820B284A
+:04007F007F4B0D6145
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_3.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_3.hex
new file mode 100644
index 0000000000..118a891cd9
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_3.hex
@@ -0,0 +1,129 @@
+:040000007ECC0F9211
+:040001007E8211C822
+:040002007ECD0F920E
+:040003007E8311C81F
+:040004007ECE0F920B
+:040005007E8411C81C
+:040006007ECF0F9208
+:040007007E8511C819
+:040008007ED00F9205
+:040009007E8611C816
+:04000A007ED10F9202
+:04000B007E8711C813
+:04000C007ED20F92FF
+:04000D007E8811C810
+:04000E007ED30F92FC
+:04000F007E8911C80D
+:040010007ED40F93F8
+:040011007E8A11C909
+:040012007ED50F93F5
+:040013007E8B11C906
+:040014007ED60F93F2
+:040015007E8C11C903
+:040016007ED70F93EF
+:040017007E8D11C900
+:040018007ED80F93EC
+:040019007E8E11C9FD
+:04001A007ED90F93E9
+:04001B007E8F11C9FA
+:04001C007EDA0F93E6
+:04001D007E9011C9F7
+:04001E007EDB0F93E3
+:04001F007E9111CAF3
+:040020007EDC0F94DF
+:040021007E9211CAF0
+:040022007EDD0F94DC
+:040023007E9311CAED
+:040024007EDE0F94D9
+:040025007E9411CAEA
+:040026007EDF0F94D6
+:040027007E9511CAE7
+:040028007EE00F94D3
+:040029007E9611CAE4
+:04002A007EE10F94D0
+:04002B007E9711CAE1
+:04002C007EE20F94CD
+:04002D007E9811CBDD
+:04002E007EE30F94CA
+:04002F007E9911CBDA
+:040030007EE40F95C6
+:040031007E9911CBD8
+:040032007EE50F95C3
+:040033007E9A11CBD5
+:040034007EE60F95C0
+:040035007E9B11CBD2
+:040036007EE70F95BD
+:040037007E9C11CBCF
+:040038007EE80F95BA
+:040039007E9D11CBCC
+:04003A007EE90F95B7
+:04003B007E9E11CCC8
+:04003C007EEA0F95B4
+:04003D007E9F11CCC5
+:04003E007EEB0F95B1
+:04003F007EA011CCC2
+:040040007EEC0F96AD
+:040041007EA111CCBF
+:040042007EED0F96AA
+:040043007EA211CCBC
+:040044007EEE0F96A7
+:040045007EA311CCB9
+:040046007EEF0F96A4
+:040047007EA411CCB6
+:040048007EF00F96A1
+:040049007EA511CDB2
+:04004A007EF10F969E
+:04004B007EA611CDAF
+:04004C007EF20F969B
+:04004D007EA711CDAC
+:04004E007EF30F9698
+:04004F007EA811CDA9
+:040050007EF40F9695
+:040051007EA911CDA6
+:040052007EF50F9791
+:040053007EAA11CDA3
+:040054007EF60F978E
+:040055007EAB11CDA0
+:040056007EF70F978B
+:040057007EAC11CE9C
+:040058007EF80F9788
+:040059007EAD11CE99
+:04005A007EF90F9785
+:04005B007EAE11CE96
+:04005C007EFA0F9782
+:04005D007EAF11CE93
+:04005E007EFB0F977F
+:04005F007EB011CE90
+:040060007EFC0F977C
+:040061007EB111CE8D
+:040062007EFD0F9878
+:040063007EB211CE8A
+:040064007EFE0F9875
+:040065007EB311CE87
+:040066007EFF0F9872
+:040067007EB411CF83
+:040068007F000F986E
+:040069007EB511CF80
+:04006A007F010F986B
+:04006B007EB611CF7D
+:04006C007F020F9868
+:04006D007EB711CF7A
+:04006E007F030F9865
+:04006F007EB811CF77
+:040070007F040F9862
+:040071007EB911CF74
+:040072007F050F995E
+:040073007EBA11CF71
+:040074007F060F995B
+:040075007EBB11D06D
+:040076007F070F9958
+:040077007EBC11D06A
+:040078007F080F9955
+:040079007EBD11D067
+:04007A007F090F9952
+:04007B007EBE11D064
+:04007C007F0A0F994F
+:04007D007EBF11D061
+:04007E007F0B0F994C
+:04007F007EC011D05E
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_4.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_4.hex
new file mode 100644
index 0000000000..f1f30339ee
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_4.hex
@@ -0,0 +1,129 @@
+:040000007E2D13FC42
+:040001007DCF162F6A
+:040002007E2E13FC3F
+:040003007DD0162F67
+:040004007E2F13FC3C
+:040005007DD1162F64
+:040006007E3013FD38
+:040007007DD2163060
+:040008007E3113FD35
+:040009007DD316305D
+:04000A007E3213FD32
+:04000B007DD416305A
+:04000C007E3313FD2F
+:04000D007DD5163057
+:04000E007E3413FD2C
+:04000F007DD6163054
+:040010007E3513FD29
+:040011007DD7163051
+:040012007E3613FD26
+:040013007DD816314D
+:040014007E3713FE22
+:040015007DD916314A
+:040016007E3813FE1F
+:040017007DDA163147
+:040018007E3913FE1C
+:040019007DDB163144
+:04001A007E3A13FE19
+:04001B007DDC163141
+:04001C007E3B13FE16
+:04001D007DDD16313E
+:04001E007E3C13FE13
+:04001F007DDE16323A
+:040020007E3D13FF0F
+:040021007DDF163237
+:040022007E3E13FF0C
+:040023007DE0163234
+:040024007E3F13FF09
+:040025007DE1163231
+:040026007E4013FF06
+:040027007DE216322E
+:040028007E4113FF03
+:040029007DE316322B
+:04002A007E4213FF00
+:04002B007DE4163327
+:04002C007E4313FFFD
+:04002D007DE5163324
+:04002E007E441400F8
+:04002F007DE6163321
+:040030007E451400F5
+:040031007DE716331E
+:040032007E461400F2
+:040033007DE816331B
+:040034007E471400EF
+:040035007DE9163417
+:040036007E481400EC
+:040037007DEA163414
+:040038007E491400E9
+:040039007DEB163411
+:04003A007E4A1401E5
+:04003B007DEC16340E
+:04003C007E4B1401E2
+:04003D007DED16340B
+:04003E007E4C1401DF
+:04003F007DEE163408
+:040040007E4D1401DC
+:040041007DEF163504
+:040042007E4E1401D9
+:040043007DF0163501
+:040044007E4F1401D6
+:040045007DF11635FE
+:040046007E501402D2
+:040047007DF21635FB
+:040048007E511402CF
+:040049007DF31635F8
+:04004A007E521402CC
+:04004B007DF41635F5
+:04004C007E531402C9
+:04004D007DF51636F1
+:04004E007E541402C6
+:04004F007DF61636EE
+:040050007E551402C3
+:040051007DF71636EB
+:040052007E561402C0
+:040053007DF81636E8
+:040054007E571403BC
+:040055007DF91636E5
+:040056007E581403B9
+:040057007DF91636E3
+:040058007E591403B6
+:040059007DFA1637DF
+:04005A007E5A1403B3
+:04005B007DFB1637DC
+:04005C007E5B1403B0
+:04005D007DFC1637D9
+:04005E007E5C1403AD
+:04005F007DFD1637D6
+:040060007E5D1404A9
+:040061007DFE1637D3
+:040062007E5E1404A6
+:040063007DFF1637D0
+:040064007E5F1404A3
+:040065007E001638CB
+:040066007E601404A0
+:040067007E011638C8
+:040068007E6114049D
+:040069007E021638C5
+:04006A007E6214049A
+:04006B007E031638C2
+:04006C007E63140497
+:04006D007E041638BF
+:04006E007E64140593
+:04006F007E051639BB
+:040070007E65140590
+:040071007E061639B8
+:040072007E6614058D
+:040073007E071639B5
+:040074007E6714058A
+:040075007E081639B2
+:040076007E68140587
+:040077007E091639AF
+:040078007E69140584
+:040079007E0A1639AC
+:04007A007E6A140680
+:04007B007E0B163AA8
+:04007C007E6B14067D
+:04007D007E0C163AA5
+:04007E007E6C14067A
+:04007F007E0D163AA2
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_5.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_5.hex
new file mode 100644
index 0000000000..7aa80f8a01
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_5.hex
@@ -0,0 +1,129 @@
+:040000007D671860A0
+:040001007CF51A90E0
+:040002007D6818609D
+:040003007CF61A90DD
+:040004007D69186199
+:040005007CF71A90DA
+:040006007D6A186196
+:040007007CF81A90D7
+:040008007D6B186193
+:040009007CF91A90D4
+:04000A007D6C186190
+:04000B007CFA1A91D0
+:04000C007D6D18618D
+:04000D007CFB1A91CD
+:04000E007D6E186289
+:04000F007CFC1A91CA
+:040010007D6F186286
+:040011007CFD1A91C7
+:040012007D70186283
+:040013007CFE1A91C4
+:040014007D71186280
+:040015007CFF1A92C0
+:040016007D7218627D
+:040017007D001A92BC
+:040018007D73186379
+:040019007D011A92B9
+:04001A007D74186376
+:04001B007D021A92B6
+:04001C007D75186373
+:04001D007D031A92B3
+:04001E007D76186370
+:04001F007D041A93AF
+:040020007D7718636D
+:040021007D051A93AC
+:040022007D7818636A
+:040023007D061A93A9
+:040024007D79186466
+:040025007D071A93A6
+:040026007D7A186463
+:040027007D081A93A3
+:040028007D7B186460
+:040029007D091A949F
+:04002A007D7C18645D
+:04002B007D0A1A949C
+:04002C007D7D18645A
+:04002D007D0B1A9499
+:04002E007D7E186556
+:04002F007D0C1A9496
+:040030007D7F186553
+:040031007D0D1A9592
+:040032007D80186550
+:040033007D0E1A958F
+:040034007D8118654D
+:040035007D0F1A958C
+:040036007D8218654A
+:040037007D101A9589
+:040038007D83186646
+:040039007D111A9586
+:04003A007D84186643
+:04003B007D121A9682
+:04003C007D85186640
+:04003D007D131A967F
+:04003E007D8618663D
+:04003F007D141A967C
+:040040007D8718663A
+:040041007D151A9679
+:040042007D88186736
+:040043007D161A9676
+:040044007D89186733
+:040045007D171A9772
+:040046007D89186731
+:040047007D181A976F
+:040048007D8A18672E
+:040049007D191A976C
+:04004A007D8B18672B
+:04004B007D1A1A9769
+:04004C007D8C186728
+:04004D007D1B1A9766
+:04004E007D8D186824
+:04004F007D1B1A9863
+:040050007D8E186821
+:040051007D1C1A9860
+:040052007D8F18681E
+:040053007D1D1A985D
+:040054007D9018681B
+:040055007D1E1A985A
+:040056007D91186818
+:040057007D1F1A9857
+:040058007D92186914
+:040059007D201A9953
+:04005A007D93186911
+:04005B007D211A9950
+:04005C007D9418690E
+:04005D007D221A994D
+:04005E007D9518690B
+:04005F007D231A994A
+:040060007D96186908
+:040061007D241A9A46
+:040062007D97186A04
+:040063007D251A9A43
+:040064007D98186A01
+:040065007D261A9A40
+:040066007D99186AFE
+:040067007D271A9A3D
+:040068007D9A186AFB
+:040069007D281A9A3A
+:04006A007D9B186AF8
+:04006B007D291A9B36
+:04006C007D9C186BF4
+:04006D007D2A1A9B33
+:04006E007D9D186BF1
+:04006F007D2B1A9B30
+:040070007D9E186BEE
+:040071007D2C1A9B2D
+:040072007D9F186BEB
+:040073007D2D1A9B2A
+:040074007DA0186BE8
+:040075007D2E1A9C26
+:040076007DA1186BE5
+:040077007D2F1A9C23
+:040078007DA2186CE1
+:040079007D301A9C20
+:04007A007DA3186CDE
+:04007B007D311A9C1D
+:04007C007DA4186CDB
+:04007D007D321A9C1A
+:04007E007DA5186CD8
+:04007F007D331A9D16
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_6.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_6.hex
new file mode 100644
index 0000000000..fd16671e40
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_6.hex
@@ -0,0 +1,129 @@
+:040000007C7A1CBD2D
+:040001007BF51EE885
+:040002007C7B1CBD2A
+:040003007BF61EE882
+:040004007C7C1CBD27
+:040005007BF61EE880
+:040006007C7D1CBD24
+:040007007BF71EE97C
+:040008007C7E1CBE20
+:040009007BF81EE979
+:04000A007C7F1CBE1D
+:04000B007BF91EE976
+:04000C007C801CBE1A
+:04000D007BFA1EE973
+:04000E007C811CBE17
+:04000F007BFB1EEA6F
+:040010007C821CBF13
+:040011007BFC1EEA6C
+:040012007C831CBF10
+:040013007BFD1EEA69
+:040014007C841CBF0D
+:040015007BFE1EEA66
+:040016007C851CBF0A
+:040017007BFF1EEA63
+:040018007C851CBF08
+:040019007C001EEB5E
+:04001A007C861CC004
+:04001B007C011EEB5B
+:04001C007C871CC001
+:04001D007C021EEB58
+:04001E007C881CC0FE
+:04001F007C031EEB55
+:040020007C891CC0FB
+:040021007C041EEC51
+:040022007C8A1CC1F7
+:040023007C051EEC4E
+:040024007C8B1CC1F4
+:040025007C061EEC4B
+:040026007C8C1CC1F1
+:040027007C071EEC48
+:040028007C8D1CC1EE
+:040029007C081EED44
+:04002A007C8E1CC2EA
+:04002B007C091EED41
+:04002C007C8F1CC2E7
+:04002D007C0A1EED3E
+:04002E007C901CC2E4
+:04002F007C0B1EED3B
+:040030007C911CC2E1
+:040031007C0C1EEE37
+:040032007C921CC2DE
+:040033007C0D1EEE34
+:040034007C931CC3DA
+:040035007C0E1EEE31
+:040036007C941CC3D7
+:040037007C0F1EEE2E
+:040038007C951CC3D4
+:040039007C101EEF2A
+:04003A007C961CC3D1
+:04003B007C111EEF27
+:04003C007C971CC4CD
+:04003D007C121EEF24
+:04003E007C981CC4CA
+:04003F007C131EEF21
+:040040007C991CC4C7
+:040041007C141EF01D
+:040042007C9A1CC4C4
+:040043007C151EF01A
+:040044007C9B1CC4C1
+:040045007C161EF017
+:040046007C9C1CC5BD
+:040047007C171EF014
+:040048007C9D1CC5BA
+:040049007C171EF111
+:04004A007C9E1CC5B7
+:04004B007C181EF10E
+:04004C007C9F1CC5B4
+:04004D007C191EF10B
+:04004E007CA01CC6B0
+:04004F007C1A1EF108
+:040050007CA11CC6AD
+:040051007C1B1EF105
+:040052007CA21CC6AA
+:040053007C1C1EF201
+:040054007CA31CC6A7
+:040055007C1D1EF2FE
+:040056007CA41CC6A4
+:040057007C1E1EF2FB
+:040058007CA51CC7A0
+:040059007C1F1EF2F8
+:04005A007CA61CC79D
+:04005B007C201EF3F4
+:04005C007CA71CC79A
+:04005D007C211EF3F1
+:04005E007CA81CC797
+:04005F007C221EF3EE
+:040060007CA91CC893
+:040061007C231EF3EB
+:040062007CAA1CC890
+:040063007C241EF4E7
+:040064007CAB1CC88D
+:040065007C251EF4E4
+:040066007CAB1CC88B
+:040067007C261EF4E1
+:040068007CAC1CC888
+:040069007C271EF4DE
+:04006A007CAD1CC984
+:04006B007C281EF5DA
+:04006C007CAE1CC981
+:04006D007C291EF5D7
+:04006E007CAF1CC97E
+:04006F007C2A1EF5D4
+:040070007CB01CC97B
+:040071007C2B1EF5D1
+:040072007CB11CCA77
+:040073007C2C1EF6CD
+:040074007CB21CCA74
+:040075007C2D1EF6CA
+:040076007CB31CCA71
+:040077007C2E1EF6C7
+:040078007CB41CCA6E
+:040079007C2F1EF6C4
+:04007A007CB51CCB6A
+:04007B007C301EF7C0
+:04007C007CB61CCB67
+:04007D007C311EF7BD
+:04007E007CB71CCB64
+:04007F007C321EF7BA
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_7.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_7.hex
new file mode 100644
index 0000000000..6574375700
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_7.hex
@@ -0,0 +1,129 @@
+:040000007B662110EA
+:040001007ACD23365B
+:040002007B672111E6
+:040003007ACE233757
+:040004007B682111E3
+:040005007ACF233754
+:040006007B692111E0
+:040007007AD0233751
+:040008007B6A2111DD
+:040009007AD123384D
+:04000A007B6A2112DA
+:04000B007AD223384A
+:04000C007B6B2112D7
+:04000D007AD3233847
+:04000E007B6C2112D4
+:04000F007AD4233844
+:040010007B6D2112D1
+:040011007AD5233940
+:040012007B6E2113CD
+:040013007AD623393D
+:040014007B6F2113CA
+:040015007AD723393A
+:040016007B702113C7
+:040017007AD8233937
+:040018007B712114C3
+:040019007AD9233A33
+:04001A007B722114C0
+:04001B007ADA233A30
+:04001C007B732114BD
+:04001D007ADB233A2D
+:04001E007B742114BA
+:04001F007ADC233B29
+:040020007B752115B6
+:040021007ADC233B27
+:040022007B762115B3
+:040023007ADD233B24
+:040024007B772115B0
+:040025007ADE233B21
+:040026007B782115AD
+:040027007ADF233C1D
+:040028007B792116A9
+:040029007AE0233C1A
+:04002A007B7A2116A6
+:04002B007AE1233C17
+:04002C007B7B2116A3
+:04002D007AE2233D13
+:04002E007B7C2116A0
+:04002F007AE3233D10
+:040030007B7D21179C
+:040031007AE4233D0D
+:040032007B7E211799
+:040033007AE5233D0A
+:040034007B7F211796
+:040035007AE6233E06
+:040036007B80211793
+:040037007AE7233E03
+:040038007B8121188F
+:040039007AE8233E00
+:04003A007B8221188C
+:04003B007AE9233EFD
+:04003C007B83211889
+:04003D007AEA233FF9
+:04003E007B84211886
+:04003F007AEB233FF6
+:040040007B85211982
+:040041007AEC233FF3
+:040042007B8621197F
+:040043007AED2340EF
+:040044007B8621197D
+:040045007AEE2340EC
+:040046007B8721197A
+:040047007AEF2340E9
+:040048007B88211A76
+:040049007AF02340E6
+:04004A007B89211A73
+:04004B007AF12341E2
+:04004C007B8A211A70
+:04004D007AF22341DF
+:04004E007B8B211B6C
+:04004F007AF32341DC
+:040050007B8C211B69
+:040051007AF42341D9
+:040052007B8D211B66
+:040053007AF52342D5
+:040054007B8E211B63
+:040055007AF52342D3
+:040056007B8F211C5F
+:040057007AF62342D0
+:040058007B90211C5C
+:040059007AF72343CC
+:04005A007B91211C59
+:04005B007AF82343C9
+:04005C007B92211C56
+:04005D007AF92343C6
+:04005E007B93211D52
+:04005F007AFA2343C3
+:040060007B94211D4F
+:040061007AFB2344BF
+:040062007B95211D4C
+:040063007AFC2344BC
+:040064007B96211D49
+:040065007AFD2344B9
+:040066007B97211E45
+:040067007AFE2345B5
+:040068007B98211E42
+:040069007AFF2345B2
+:04006A007B99211E3F
+:04006B007B002345AE
+:04006C007B9A211E3C
+:04006D007B012345AB
+:04006E007B9B211F38
+:04006F007B022346A7
+:040070007B9C211F35
+:040071007B032346A4
+:040072007B9D211F32
+:040073007B042346A1
+:040074007B9E211F2F
+:040075007B0523469E
+:040076007B9F21202B
+:040077007B0623479A
+:040078007BA0212028
+:040079007B07234797
+:04007A007BA1212025
+:04007B007B08234794
+:04007C007BA2212022
+:04007D007B09234890
+:04007E007BA221211F
+:04007F007B0A23488D
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_8.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_8.hex
new file mode 100644
index 0000000000..776c351e94
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_8.hex
@@ -0,0 +1,129 @@
+:040000007A2B255AD8
+:04000100797F277A62
+:040002007A2C255AD5
+:040003007980277A5F
+:040004007A2D255AD2
+:040005007981277B5B
+:040006007A2E255BCE
+:040007007982277B58
+:040008007A2F255BCB
+:040009007983277B55
+:04000A007A30255BC8
+:04000B007984277C51
+:04000C007A31255BC5
+:04000D007985277C4E
+:04000E007A32255CC1
+:04000F007986277C4B
+:040010007A33255CBE
+:040011007987277D47
+:040012007A34255CBB
+:040013007988277D44
+:040014007A35255DB7
+:040015007989277D41
+:040016007A36255DB4
+:04001700798A277D3E
+:040018007A36255DB2
+:04001900798B277E3A
+:04001A007A37255EAE
+:04001B00798C277E37
+:04001C007A38255EAB
+:04001D00798D277E34
+:04001E007A39255EA8
+:04001F00798E277F30
+:040020007A3A255EA5
+:04002100798F277F2D
+:040022007A3B255FA1
+:040023007990277F2A
+:040024007A3C255F9E
+:040025007990278027
+:040026007A3D255F9B
+:040027007991278024
+:040028007A3E256097
+:040029007992278021
+:04002A007A3F256094
+:04002B00799327811D
+:04002C007A40256091
+:04002D00799427811A
+:04002E007A4125608E
+:04002F007995278117
+:040030007A4225618A
+:040031007996278213
+:040032007A43256187
+:040033007997278210
+:040034007A44256184
+:04003500799827820D
+:040036007A45256280
+:04003700799927820A
+:040038007A4625627D
+:04003900799A278306
+:04003A007A4725627A
+:04003B00799B278303
+:04003C007A48256277
+:04003D00799C278300
+:04003E007A49256373
+:04003F00799D2784FC
+:040040007A4A256370
+:04004100799E2784F9
+:040042007A4B25636D
+:04004300799F2784F6
+:040044007A4C256469
+:0400450079A02785F2
+:040046007A4C256467
+:0400470079A12785EF
+:040048007A4D256464
+:0400490079A22785EC
+:04004A007A4E256560
+:04004B0079A32786E8
+:04004C007A4F25655D
+:04004D0079A32786E6
+:04004E007A5025655A
+:04004F0079A42786E3
+:040050007A51256557
+:0400510079A52786E0
+:040052007A52256653
+:0400530079A62787DC
+:040054007A53256650
+:0400550079A72787D9
+:040056007A5425664D
+:0400570079A82787D6
+:040058007A55256749
+:0400590079A92788D2
+:04005A007A56256746
+:04005B0079AA2788CF
+:04005C007A57256743
+:04005D0079AB2788CC
+:04005E007A58256740
+:04005F0079AC2789C8
+:040060007A5925683C
+:0400610079AD2789C5
+:040062007A5A256839
+:0400630079AE2789C2
+:040064007A5B256836
+:0400650079AF278ABE
+:040066007A5C256932
+:0400670079B0278ABB
+:040068007A5D25692F
+:0400690079B1278AB8
+:04006A007A5E25692C
+:04006B0079B2278AB5
+:04006C007A5F256A28
+:04006D0079B3278BB1
+:04006E007A60256A25
+:04006F0079B4278BAE
+:040070007A61256A22
+:0400710079B5278BAB
+:040072007A62256A1F
+:0400730079B6278CA7
+:040074007A62256B1C
+:0400750079B7278CA4
+:040076007A63256B19
+:0400770079B7278CA2
+:040078007A64256B16
+:0400790079B8278D9E
+:04007A007A65256C12
+:04007B0079B9278D9B
+:04007C007A66256C0F
+:04007D0079BA278D98
+:04007E007A67256C0C
+:04007F0079BB278E94
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_9.hex b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_9.hex
new file mode 100644
index 0000000000..3eb43ba7e2
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_16b_fold_1_9.hex
@@ -0,0 +1,129 @@
+:0400000078CA2997FA
+:04000100780C2BB19B
+:0400020078CB2998F6
+:04000300780D2BB297
+:0400040078CC2998F3
+:04000500780E2BB294
+:0400060078CD2998F0
+:04000700780F2BB291
+:0400080078CE2999EC
+:04000900780F2BB38E
+:04000A0078CF2999E9
+:04000B0078102BB38B
+:04000C0078D02999E6
+:04000D0078112BB388
+:04000E0078D1299AE2
+:04000F0078122BB484
+:0400100078D2299ADF
+:0400110078132BB481
+:0400120078D3299ADC
+:0400130078142BB57D
+:0400140078D4299BD8
+:0400150078152BB57A
+:0400160078D5299BD5
+:0400170078162BB577
+:0400180078D6299BD2
+:0400190078172BB673
+:04001A0078D7299CCE
+:04001B0078182BB670
+:04001C0078D7299CCC
+:04001D0078192BB66D
+:04001E0078D8299CC9
+:04001F00781A2BB769
+:0400200078D9299DC5
+:04002100781B2BB766
+:0400220078DA299DC2
+:04002300781C2BB763
+:0400240078DB299DBF
+:04002500781D2BB85F
+:0400260078DC299EBB
+:04002700781E2BB85C
+:0400280078DD299EB8
+:04002900781F2BB859
+:04002A0078DE299EB5
+:04002B00781F2BB956
+:04002C0078DF299FB1
+:04002D0078202BB953
+:04002E0078E0299FAE
+:04002F0078212BB950
+:0400300078E1299FAB
+:0400310078222BBA4C
+:0400320078E229A0A7
+:0400330078232BBA49
+:0400340078E329A0A4
+:0400350078242BBA46
+:0400360078E429A0A1
+:0400370078252BBB42
+:0400380078E529A09E
+:0400390078262BBB3F
+:04003A0078E629A19A
+:04003B0078272BBB3C
+:04003C0078E729A197
+:04003D0078282BBC38
+:04003E0078E829A194
+:04003F0078292BBC35
+:0400400078E829A291
+:04004100782A2BBC32
+:0400420078E929A28E
+:04004300782B2BBD2E
+:0400440078EA29A28B
+:04004500782C2BBD2B
+:0400460078EB29A387
+:04004700782D2BBD28
+:0400480078EC29A384
+:04004900782E2BBE24
+:04004A0078ED29A381
+:04004B00782E2BBE22
+:04004C0078EE29A47D
+:04004D00782F2BBE1F
+:04004E0078EF29A47A
+:04004F0078302BBF1B
+:0400500078F029A477
+:0400510078312BBF18
+:0400520078F129A573
+:0400530078322BBF15
+:0400540078F229A570
+:0400550078332BC011
+:0400560078F329A56D
+:0400570078342BC00E
+:0400580078F429A669
+:0400590078352BC00B
+:04005A0078F529A666
+:04005B0078362BC107
+:04005C0078F629A663
+:04005D0078372BC104
+:04005E0078F729A75F
+:04005F0078382BC200
+:0400600078F829A75C
+:0400610078392BC2FD
+:0400620078F929A759
+:04006300783A2BC2FA
+:0400640078FA29A855
+:04006500783B2BC3F6
+:0400660078FA29A853
+:04006700783C2BC3F3
+:0400680078FB29A850
+:04006900783D2BC3F0
+:04006A0078FC29A94C
+:04006B00783E2BC4EC
+:04006C0078FD29A949
+:04006D00783E2BC4EA
+:04006E0078FE29A946
+:04006F00783F2BC4E7
+:0400700078FF29AA42
+:0400710078402BC5E3
+:04007200790029AA3E
+:0400730078412BC5E0
+:04007400790129AA3B
+:0400750078422BC5DD
+:04007600790229AB37
+:0400770078432BC6D9
+:04007800790329AB34
+:0400790078442BC6D6
+:04007A00790429AB31
+:04007B0078452BC6D3
+:04007C00790529AC2D
+:04007D0078462BC7CF
+:04007E00790629AC2A
+:04007F0078472BC7CC
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_0.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_0.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_0.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_0.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_1.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_1.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_1.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_1.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_10.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_10.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_10.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_10.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_11.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_11.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_11.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_11.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_12.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_12.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_12.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_12.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_13.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_13.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_13.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_13.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_14.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_14.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_14.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_14.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_15.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_15.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_15.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_15.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_16.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_16.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_16.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_16.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_17.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_17.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_17.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_17.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_18.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_18.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_18.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_18.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_19.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_19.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_19.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_19.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_2.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_2.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_2.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_2.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_20.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_20.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_20.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_20.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_21.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_21.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_21.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_21.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_22.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_22.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_22.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_22.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_23.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_23.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_23.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_23.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_3.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_3.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_3.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_3.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_4.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_4.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_4.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_4.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_5.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_5.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_5.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_5.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_6.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_6.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_6.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_6.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_7.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_7.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_7.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_7.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_8.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_8.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_8.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_8.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8_9.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_9.hex
similarity index 100%
rename from libraries/dsp/correlator/src/hex/complex_subbands_8_9.hex
rename to libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_0_9.hex
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_0.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_0.hex
new file mode 100644
index 0000000000..b511ef8490
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_0.hex
@@ -0,0 +1,129 @@
+:020000004001BD
+:020001004002BB
+:020002004101BA
+:020003004102B8
+:020004004201B7
+:020005004202B5
+:020006004301B4
+:020007004302B2
+:020008004401B1
+:020009004402AF
+:02000A004501AE
+:02000B004502AC
+:02000C004601AB
+:02000D004602A9
+:02000E004701A8
+:02000F004702A6
+:020010004801A5
+:020011004803A2
+:020012004901A2
+:0200130049039F
+:020014004A019F
+:020015004A039C
+:020016004B019C
+:020017004B0399
+:020018004C0199
+:020019004C0396
+:02001A004D0196
+:02001B004D0393
+:02001C004E0193
+:02001D004E0390
+:02001E004F0190
+:02001F004F038D
+:0200200050018D
+:0200210050038A
+:0200220051018A
+:02002300510387
+:02002400520187
+:02002500520384
+:02002600530184
+:02002700530381
+:02002800540181
+:0200290054037E
+:02002A0055017E
+:02002B0055037B
+:02002C0056027A
+:02002D00560378
+:02002E00570277
+:02002F00570375
+:02003000580274
+:02003100580372
+:02003200590271
+:0200330059036F
+:020034005A026E
+:020035005A036C
+:020036005B026B
+:020037005B0369
+:020038005C0268
+:020039005C0366
+:02003A005D0265
+:02003B005D0363
+:02003C005E0262
+:02003D005E0360
+:02003E005F025F
+:02003F005F035D
+:0200400060025C
+:0200410060035A
+:02004200610259
+:02004300610357
+:02004400620256
+:02004500620354
+:02004600630253
+:02004700630351
+:02004800640250
+:0200490064034E
+:02004A0065024D
+:02004B0065044A
+:02004C0066024A
+:02004D00660447
+:02004E00670247
+:02004F00670444
+:02005000680244
+:02005100680441
+:02005200690241
+:0200530069043E
+:020054006A023E
+:020055006A043B
+:020056006B023B
+:020057006B0438
+:020058006C0238
+:020059006C0435
+:02005A006D0235
+:02005B006D0432
+:02005C006E0232
+:02005D006E042F
+:02005E006F022F
+:02005F006F042C
+:0200600070022C
+:02006100700429
+:02006200710229
+:02006300710426
+:02006400720226
+:02006500720423
+:02006600730223
+:02006700730420
+:02006800740220
+:0200690074041D
+:02006A0075021D
+:02006B0075041A
+:02006C0076021A
+:02006D00760417
+:02006E00770217
+:02006F00770414
+:02007000780214
+:02007100780411
+:02007200790211
+:0200730079040E
+:020074007A020E
+:020075007A040B
+:020076007B020B
+:020077007B0408
+:020078007C0208
+:020079007C0405
+:02007A007D0205
+:02007B007D0402
+:02007C007E0202
+:02007D007E04FF
+:02007E007F02FF
+:02007F007F04FC
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_1.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_1.hex
new file mode 100644
index 0000000000..671d60e586
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_1.hex
@@ -0,0 +1,129 @@
+:020000004003BB
+:020001004004B9
+:020002004103B8
+:020003004105B5
+:020004004203B5
+:020005004205B2
+:020006004304B1
+:020007004305AF
+:020008004404AE
+:020009004405AC
+:02000A004504AB
+:02000B004505A9
+:02000C004604A8
+:02000D004605A6
+:02000E004704A5
+:02000F004705A3
+:020010004804A2
+:020011004805A0
+:0200120049049F
+:0200130049059D
+:020014004A049C
+:020015004A059A
+:020016004B0499
+:020017004B0597
+:020018004C0496
+:020019004C0594
+:02001A004D0493
+:02001B004D0591
+:02001C004E0490
+:02001D004E058E
+:02001E004F048D
+:02001F004F068A
+:0200200050048A
+:02002100500687
+:02002200510487
+:02002300510684
+:02002400520484
+:02002500520681
+:02002600530481
+:0200270053067E
+:0200280054047E
+:0200290054067B
+:02002A0055047B
+:02002B00550678
+:02002C00560577
+:02002D00560675
+:02002E00570574
+:02002F00570672
+:02003000580571
+:0200310058066F
+:0200320059056E
+:0200330059066C
+:020034005A056B
+:020035005A0669
+:020036005B0568
+:020037005B0666
+:020038005C0565
+:020039005C0663
+:02003A005D0562
+:02003B005D0660
+:02003C005E055F
+:02003D005E075C
+:02003E005F055C
+:02003F005F0759
+:02004000600559
+:02004100600756
+:02004200610556
+:02004300610753
+:02004400620553
+:02004500620750
+:02004600630550
+:0200470063074D
+:0200480064054D
+:0200490064074A
+:02004A0065054A
+:02004B00650747
+:02004C00660547
+:02004D00660744
+:02004E00670544
+:02004F00670741
+:02005000680541
+:0200510068073E
+:0200520069053E
+:0200530069073B
+:020054006A063A
+:020055006A0738
+:020056006B0637
+:020057006B0735
+:020058006C0634
+:020059006C0831
+:02005A006D0631
+:02005B006D082E
+:02005C006E062E
+:02005D006E082B
+:02005E006F062B
+:02005F006F0828
+:02006000700628
+:02006100700825
+:02006200710625
+:02006300710822
+:02006400720622
+:0200650072081F
+:0200660073061F
+:0200670073081C
+:0200680074061C
+:02006900740819
+:02006A00750619
+:02006B00750816
+:02006C00760616
+:02006D00760813
+:02006E00770613
+:02006F00770810
+:02007000780610
+:0200710078080D
+:0200720079060D
+:0200730079080A
+:020074007A060A
+:020075007A0906
+:020076007B0607
+:020077007B0903
+:020078007C0604
+:020079007C0900
+:02007A007D0700
+:02007B007D09FD
+:02007C007E07FD
+:02007D007E09FA
+:02007E007F07FA
+:02007F007F09F7
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_10.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_10.hex
new file mode 100644
index 0000000000..801be32961
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_10.hex
@@ -0,0 +1,129 @@
+:020000003C17AB
+:020001003B18AA
+:020002003D17A8
+:020003003C18A7
+:020004003E18A4
+:020005003D19A3
+:020006003F18A1
+:020007003E19A0
+:020008003F189F
+:020009003F199D
+:02000A0040199B
+:02000B00401A99
+:02000C00411998
+:02000D00411A96
+:02000E00421995
+:02000F00421B92
+:02001000431A91
+:02001100431B8F
+:02001200441A8E
+:02001300441B8C
+:02001400451B8A
+:02001500451C88
+:02001600461B87
+:02001700461C85
+:02001800471B84
+:02001900461C83
+:02001A00481C80
+:02001B00471D7F
+:02001C00491C7D
+:02001D00481D7C
+:02001E004A1C7A
+:02001F00491E78
+:020020004B1D76
+:020021004A1E75
+:020022004C1D73
+:020023004B1E72
+:020024004D1D70
+:020025004C1F6E
+:020026004D1E6D
+:020027004D1F6B
+:020028004E1E6A
+:020029004E1F68
+:02002A004F1E67
+:02002B004F2064
+:02002C00501F63
+:02002D00502061
+:02002E00511F60
+:02002F0051215D
+:0200300052205C
+:0200310052215A
+:02003200532059
+:02003300532157
+:02003400542056
+:02003500532254
+:02003600552152
+:02003700542251
+:0200380056214F
+:0200390055224E
+:02003A0057214C
+:02003B0056234A
+:02003C00582248
+:02003D00572347
+:02003E00592245
+:02003F00582443
+:020040005A2242
+:02004100592440
+:020042005B233E
+:020043005A243D
+:020044005B233C
+:020045005B2539
+:020046005C2339
+:020047005C2536
+:020048005D2435
+:020049005D2533
+:02004A005E2432
+:02004B005E262F
+:02004C005F252E
+:02004D005F262C
+:02004E0060252B
+:02004F005F2729
+:02005000612528
+:02005100602726
+:02005200622624
+:02005300612723
+:02005400632621
+:0200550062281F
+:0200560064261E
+:0200570063281C
+:0200580065271A
+:02005900642819
+:02005A00662717
+:02005B00652915
+:02005C00672714
+:02005D00662912
+:02005E00682810
+:02005F00672A0E
+:0200600069280D
+:02006100682A0B
+:0200620069280B
+:02006300692A08
+:020064006A2907
+:020065006A2B04
+:020066006B2904
+:020067006B2B01
+:020068006C2A00
+:020069006C2BFE
+:02006A006D2AFD
+:02006B006C2CFB
+:02006C006E2AFA
+:02006D006D2CF8
+:02006E006F2BF6
+:02006F006E2DF4
+:02007000702BF3
+:020071006F2DF1
+:02007200712BF0
+:02007300702DEE
+:02007400722CEC
+:02007500712EEA
+:02007600732CE9
+:02007700722EE7
+:02007800742CE6
+:02007900732EE4
+:02007A00752DE2
+:02007B00742FE0
+:02007C00762DDF
+:02007D00752FDD
+:02007E00772EDB
+:02007F007630D9
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_11.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_11.hex
new file mode 100644
index 0000000000..7a0534e3eb
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_11.hex
@@ -0,0 +1,129 @@
+:020000003B19AA
+:020001003A1AA9
+:020002003C19A7
+:020003003B1AA6
+:020004003D1AA3
+:020005003C1BA2
+:020006003E1AA0
+:020007003D1B9F
+:020008003F1B9C
+:020009003E1C9B
+:02000A00401B99
+:02000B003F1C98
+:02000C00401B97
+:02000D00401C95
+:02000E00411C93
+:02000F00411D91
+:02001000421C90
+:02001100421D8E
+:02001200431D8C
+:02001300431E8A
+:02001400441D89
+:02001500441E87
+:02001600451D86
+:02001700451F83
+:02001800461E82
+:02001900451F81
+:02001A00471E7F
+:02001B00461F7E
+:02001C00481E7C
+:02001D0047207A
+:02001E00491F78
+:02001F00482077
+:020020004A1F75
+:02002100492173
+:020022004B2071
+:020023004A2170
+:020024004B206F
+:020025004B216D
+:020026004C206C
+:020027004C2269
+:020028004D2168
+:020029004D2266
+:02002A004E2165
+:02002B004E2362
+:02002C004F2261
+:02002D004F235F
+:02002E0050225E
+:02002F004F235D
+:0200300051225B
+:02003100502459
+:02003200522357
+:02003300512456
+:02003400532354
+:02003500522552
+:02003600542450
+:0200370053254F
+:0200380055244D
+:0200390054254C
+:02003A0056244A
+:02003B00552648
+:02003C00572546
+:02003D00562645
+:02003E00572544
+:02003F00572741
+:02004000582640
+:0200410058273E
+:0200420059263D
+:0200430059273B
+:020044005A263A
+:020045005A2837
+:020046005B2736
+:020047005A2835
+:020048005C2733
+:020049005B2931
+:02004A005D2730
+:02004B005C292E
+:02004C005E282C
+:02004D005D292B
+:02004E005F2829
+:02004F005E2A27
+:02005000602925
+:020051005F2A24
+:02005200612922
+:02005300602B20
+:0200540062291F
+:02005500612B1D
+:02005600622A1C
+:02005700622C19
+:02005800632A19
+:02005900632C16
+:02005A00642B15
+:02005B00642C13
+:02005C00652B12
+:02005D00642D10
+:02005E00662B0F
+:02005F00652D0D
+:02006000672C0B
+:02006100662E09
+:02006200682C08
+:02006300672E06
+:02006400692D04
+:02006500682E03
+:020066006A2D01
+:02006700692FFF
+:020068006B2DFE
+:020069006A2FFC
+:02006A006C2EFA
+:02006B006B30F8
+:02006C006D2EF7
+:02006D006C30F5
+:02006E006E2EF4
+:02006F006D30F2
+:020070006E2FF1
+:020071006E31EE
+:020072006F2FEE
+:020073006F31EB
+:020074007030EA
+:020075006F32E8
+:020076007130E7
+:020077007032E5
+:020078007230E4
+:020079007132E2
+:02007A007331E0
+:02007B007233DE
+:02007C007431DD
+:02007D007333DB
+:02007E007532D9
+:02007F007434D7
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_2.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_2.hex
new file mode 100644
index 0000000000..be60b04801
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_2.hex
@@ -0,0 +1,129 @@
+:020000004006B8
+:020001004007B6
+:020002004106B5
+:020003004107B3
+:020004004206B2
+:020005004207B0
+:020006004306AF
+:020007004307AD
+:020008004406AC
+:020009004407AA
+:02000A004506A9
+:02000B004507A7
+:02000C004606A6
+:02000D004607A4
+:02000E004706A3
+:02000F004707A1
+:020010004806A0
+:0200110048089D
+:0200120049069D
+:0200130049089A
+:020014004A069A
+:020015004A0897
+:020016004B0796
+:020017004B0894
+:020018004C0793
+:020019004C0891
+:02001A004D0790
+:02001B004D088E
+:02001C004E078D
+:02001D004E088B
+:02001E004F078A
+:02001F004F0888
+:02002000500787
+:02002100500885
+:02002200510784
+:02002300510882
+:02002400520781
+:0200250052097E
+:0200260053077E
+:0200270053097B
+:0200280054077B
+:02002900540978
+:02002A00550778
+:02002B00550975
+:02002C00560775
+:02002D00560972
+:02002E00570871
+:02002F0057096F
+:0200300058086E
+:0200310058096C
+:0200320059086B
+:02003300590969
+:020034005A0868
+:020035005A0966
+:020036005B0865
+:020037005B0A62
+:020038005C0862
+:020039005B0A60
+:02003A005D085F
+:02003B005C0A5D
+:02003C005E085C
+:02003D005D0A5A
+:02003E005F0859
+:02003F005E0A57
+:02004000600856
+:020041005F0A54
+:02004200610853
+:02004300600A51
+:0200440062094F
+:02004500610A4E
+:0200460063094C
+:02004700620A4B
+:02004800640949
+:02004900630A48
+:02004A00650946
+:02004B00640B44
+:02004C00660943
+:02004D00650B41
+:02004E00670940
+:02004F00660B3E
+:0200500068093D
+:02005100670B3B
+:0200520069093A
+:02005300680B38
+:020054006A0937
+:02005500690B35
+:020056006B0934
+:020057006A0B32
+:020058006C0931
+:020059006B0B2F
+:02005A006D092E
+:02005B006C0B2C
+:02005C006E0A2A
+:02005D006D0B29
+:02005E006F0A27
+:02005F006E0C25
+:02006000700A24
+:020061006F0C22
+:02006200710A21
+:02006300700C1F
+:02006400720A1E
+:02006500710C1C
+:02006600730A1B
+:02006700720C19
+:02006800740A18
+:02006900730C16
+:02006A00750A15
+:02006B00740C13
+:02006C00760A12
+:02006D00750C10
+:02006E00770A0F
+:02006F00760C0D
+:02007000780A0C
+:02007100770D09
+:02007200790B08
+:02007300780D06
+:020074007A0B05
+:02007500790D03
+:020076007B0B02
+:020077007A0D00
+:020078007C0BFF
+:020079007B0DFD
+:02007A007D0BFC
+:02007B007C0DFA
+:02007C007E0BF9
+:02007D007D0DF7
+:02007E007F0BF6
+:02007F007E0DF4
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_3.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_3.hex
new file mode 100644
index 0000000000..2715ffb5a4
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_3.hex
@@ -0,0 +1,129 @@
+:020000004008B6
+:020001003F09B5
+:020002004108B3
+:020003004009B2
+:020004004208B0
+:020005004109AF
+:020006004308AD
+:020007004209AC
+:020008004308AB
+:020009004309A9
+:02000A004408A8
+:02000B00440AA5
+:02000C004509A4
+:02000D00450AA2
+:02000E004609A1
+:02000F00460A9F
+:0200100047099E
+:02001100470A9C
+:0200120048099B
+:02001300480A99
+:02001400490998
+:02001500490A96
+:020016004A0995
+:020017004A0A93
+:020018004B0992
+:020019004B0B8F
+:02001A004C098F
+:02001B004C0B8C
+:02001C004D0A8B
+:02001D004D0B89
+:02001E004E0A88
+:02001F004E0B86
+:020020004F0A85
+:020021004F0B83
+:02002200500A82
+:02002300500B80
+:02002400510A7F
+:02002500510B7D
+:02002600520A7C
+:02002700520C79
+:02002800530A79
+:02002900530C76
+:02002A00540A76
+:02002B00540C73
+:02002C00550A73
+:02002D00550C70
+:02002E00560B6F
+:02002F00560C6D
+:02003000570B6C
+:02003100570C6A
+:02003200580B69
+:02003300580C67
+:02003400590B66
+:02003500590D63
+:020036005A0B63
+:020037005A0D60
+:020038005B0B60
+:020039005B0D5D
+:02003A005C0B5D
+:02003B005C0D5A
+:02003C005D0B5A
+:02003D005D0D57
+:02003E005E0C56
+:02003F005E0D54
+:020040005F0C53
+:020041005F0D51
+:02004200600C50
+:02004300600D4E
+:02004400610C4D
+:02004500610E4A
+:02004600620C4A
+:02004700620E47
+:02004800630C47
+:02004900630E44
+:02004A00640C44
+:02004B00640E41
+:02004C00650C41
+:02004D00650E3E
+:02004E00660D3D
+:02004F00660E3B
+:02005000670D3A
+:02005100670E38
+:02005200680D37
+:02005300680F34
+:02005400690D34
+:02005500690F31
+:020056006A0D31
+:020057006A0F2E
+:020058006B0D2E
+:020059006B0F2B
+:02005A006C0D2B
+:02005B006C0F28
+:02005C006D0D28
+:02005D006D0F25
+:02005E006E0E24
+:02005F006E0F22
+:020060006F0E21
+:020061006F101E
+:02006200700E1E
+:0200630070101B
+:02006400710E1B
+:02006500711018
+:02006600720E18
+:02006700721015
+:02006800730E15
+:02006900731012
+:02006A00740E12
+:02006B0074100F
+:02006C00750E0F
+:02006D0075100C
+:02006E00760F0B
+:02006F00761108
+:02007000770F08
+:02007100771105
+:02007200780F05
+:02007300781102
+:02007400790F02
+:020075007911FF
+:020076007A0FFF
+:020077007A11FC
+:020078007B0FFC
+:020079007B11F9
+:02007A007C0FF9
+:02007B007C11F6
+:02007C007D0FF6
+:02007D007D12F2
+:02007E007E0FF3
+:02007F007E12EF
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_4.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_4.hex
new file mode 100644
index 0000000000..a3a2d8c9a9
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_4.hex
@@ -0,0 +1,129 @@
+:020000003F0AB5
+:020001003F0BB3
+:02000200400AB2
+:02000300400BB0
+:02000400410AAF
+:02000500410BAD
+:02000600420AAC
+:02000700420CA9
+:02000800430BA8
+:02000900430CA6
+:02000A00440BA5
+:02000B00440CA3
+:02000C00450BA2
+:02000D00450CA0
+:02000E00460B9F
+:02000F00460C9D
+:02001000470B9C
+:02001100470D99
+:02001200480B99
+:02001300480D96
+:02001400490C95
+:02001500490D93
+:020016004A0C92
+:020017004A0D90
+:020018004B0C8F
+:020019004B0D8D
+:02001A004C0C8C
+:02001B004C0D8A
+:02001C004D0C89
+:02001D004D0E86
+:02001E004E0C86
+:02001F004E0E83
+:020020004F0D82
+:020021004F0E80
+:02002200500D7F
+:02002300500E7D
+:02002400510D7C
+:02002500510E7A
+:02002600520D79
+:02002700520E77
+:02002800530D76
+:02002900530F73
+:02002A00540D73
+:02002B00540F70
+:02002C00550D70
+:02002D00550F6D
+:02002E00560E6C
+:02002F00560F6A
+:02003000570E69
+:02003100570F67
+:02003200580E66
+:02003300580F64
+:02003400590E63
+:02003500591060
+:020036005A0E60
+:020037005A105D
+:020038005B0E5D
+:020039005B105A
+:02003A005C0F59
+:02003B005C1057
+:02003C005D0F56
+:02003D005D1054
+:02003E005E0F53
+:02003F005E1051
+:020040005F0F50
+:020041005F114D
+:02004200600F4D
+:0200430060114A
+:02004400610F4A
+:02004500611147
+:02004600620F47
+:02004700611145
+:02004800631043
+:02004900621142
+:02004A00641040
+:02004B0063123E
+:02004C0065103D
+:02004D0064123B
+:02004E0066103A
+:02004F00651238
+:02005000671037
+:02005100661235
+:02005200681034
+:02005300671232
+:02005400691130
+:0200550068122F
+:020056006A112D
+:0200570069132B
+:020058006B112A
+:020059006A1328
+:02005A006C1127
+:02005B006B1325
+:02005C006D1124
+:02005D006C1322
+:02005E006E1121
+:02005F006D131F
+:020060006F121D
+:020061006E131C
+:0200620070121A
+:020063006F1418
+:02006400711217
+:02006500701415
+:02006600721214
+:02006700711412
+:02006800731211
+:0200690072140F
+:02006A0074120E
+:02006B0073140C
+:02006C0075120B
+:02006D00741409
+:02006E00761307
+:02006F00751505
+:02007000771304
+:02007100761502
+:02007200781301
+:020073007715FF
+:020074007813FF
+:020075007815FC
+:020076007913FC
+:020077007915F9
+:020078007A13F9
+:020079007A16F5
+:02007A007B14F5
+:02007B007B16F2
+:02007C007C14F2
+:02007D007C16EF
+:02007E007D14EF
+:02007F007D16EC
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_5.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_5.hex
new file mode 100644
index 0000000000..6a1f253536
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_5.hex
@@ -0,0 +1,129 @@
+:020000003F0CB3
+:020001003F0DB1
+:02000200400CB0
+:02000300400EAD
+:02000400410DAC
+:02000500410EAA
+:02000600420DA9
+:02000700420EA7
+:02000800430DA6
+:02000900430EA4
+:02000A00440DA3
+:02000B00430EA2
+:02000C00450DA0
+:02000D00440F9E
+:02000E00460E9C
+:02000F00450F9B
+:02001000470E99
+:02001100460F98
+:02001200480E96
+:02001300470F95
+:02001400490E93
+:02001500480F92
+:020016004A0E90
+:0200170049108E
+:020018004B0F8C
+:020019004A108B
+:02001A004C0F89
+:02001B004B1088
+:02001C004D0F86
+:02001D004C1085
+:02001E004E0F83
+:02001F004D1082
+:020020004F0F80
+:020021004E117E
+:02002200500F7D
+:020023004F117B
+:0200240050107A
+:02002500501178
+:02002600511077
+:02002700511175
+:02002800521074
+:02002900521172
+:02002A00531071
+:02002B0053126E
+:02002C0054106E
+:02002D0054126B
+:02002E0055116A
+:02002F00551268
+:02003000561167
+:02003100561265
+:02003200571164
+:02003300571361
+:02003400581161
+:0200350058135E
+:0200360059115E
+:0200370059135B
+:020038005A125A
+:020039005A1358
+:02003A005B1257
+:02003B005B1355
+:02003C005C1254
+:02003D005C1451
+:02003E005D1251
+:02003F005D144E
+:020040005E124E
+:020041005E144B
+:020042005F134A
+:020043005F1448
+:02004400601347
+:02004500601445
+:02004600611344
+:02004700611541
+:02004800621341
+:0200490062153E
+:02004A0063133E
+:02004B0063153B
+:02004C0064133B
+:02004D00641538
+:02004E00651437
+:02004F00651535
+:02005000661434
+:02005100661631
+:02005200671431
+:0200530067162E
+:0200540068142E
+:0200550068162B
+:0200560069142B
+:02005700691628
+:020058006A1527
+:020059006A1625
+:02005A006B1524
+:02005B006B1721
+:02005C006C1521
+:02005D006C171E
+:02005E006D151E
+:02005F006D171B
+:020060006E151B
+:020061006E1718
+:020062006F1617
+:020063006F1715
+:02006400701614
+:02006500701811
+:02006600711611
+:0200670070180F
+:0200680072160E
+:0200690071180C
+:02006A0073160B
+:02006B00721809
+:02006C00741707
+:02006D00731905
+:02006E00751704
+:02006F00741902
+:02007000761701
+:020071007519FF
+:020072007717FE
+:020073007619FC
+:020074007817FB
+:020075007719F9
+:020076007917F8
+:02007700781AF5
+:020078007A18F4
+:02007900791AF2
+:02007A007B18F1
+:02007B007A1AEF
+:02007C007C18EE
+:02007D007B1AEC
+:02007E007D18EB
+:02007F007C1AE9
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_6.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_6.hex
new file mode 100644
index 0000000000..ef089a75ed
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_6.hex
@@ -0,0 +1,129 @@
+:020000003E0EB2
+:020001003E0FB0
+:020002003F0FAE
+:020003003F10AC
+:02000400400FAB
+:020005004010A9
+:02000600410FA8
+:020007004110A6
+:02000800420FA5
+:020009004210A3
+:02000A004310A1
+:02000B0043119F
+:02000C0044109E
+:02000D0044119C
+:02000E0045109B
+:02000F00451199
+:02001000461098
+:02001100461196
+:02001200471095
+:02001300471292
+:02001400481191
+:0200150048128F
+:0200160049118E
+:0200170049128C
+:020018004A118B
+:020019004A1289
+:02001A004B1188
+:02001B004B1385
+:02001C004C1284
+:02001D004C1382
+:02001E004D1281
+:02001F004D137F
+:020020004E127E
+:020021004E137C
+:020022004F127B
+:020023004F1478
+:02002400501278
+:02002500501475
+:02002600511374
+:02002700511472
+:02002800521371
+:0200290052146F
+:02002A0053136E
+:02002B0052156C
+:02002C0054136B
+:02002D00531569
+:02002E00551467
+:02002F00541566
+:02003000561464
+:02003100551563
+:02003200571461
+:0200330056165F
+:0200340058145E
+:0200350057165C
+:0200360059145B
+:02003700581659
+:020038005A1557
+:02003900591656
+:02003A005B1554
+:02003B005A1653
+:02003C005C1551
+:02003D005B174F
+:02003E005D154E
+:02003F005C174C
+:020040005E164A
+:020041005D1749
+:020042005F1647
+:020043005E1746
+:020044005F1645
+:020045005F1842
+:02004600601642
+:0200470060183F
+:0200480061163F
+:0200490061183C
+:02004A0062173B
+:02004B00621839
+:02004C00631738
+:02004D00631935
+:02004E00641735
+:02004F00641932
+:02005000651732
+:0200510065192F
+:0200520066182E
+:0200530066192C
+:0200540067182B
+:02005500671A28
+:02005600681828
+:02005700681A25
+:02005800691825
+:02005900691A22
+:02005A006A1921
+:02005B006A1A1F
+:02005C006B191E
+:02005D006B1B1B
+:02005E006C191B
+:02005F006C1B18
+:020060006D1918
+:020061006D1B15
+:020062006E1915
+:020063006E1B12
+:020064006F1A11
+:020065006F1C0E
+:02006600701A0E
+:02006700701C0B
+:02006800711A0B
+:02006900711C08
+:02006A00721A08
+:02006B00721C05
+:02006C00731B04
+:02006D00721D02
+:02006E00741B01
+:02006F00731DFF
+:02007000751BFE
+:02007100741DFC
+:02007200761BFB
+:02007300751DF9
+:02007400771BF8
+:02007500761EF5
+:02007600781CF4
+:02007700771EF2
+:02007800791CF1
+:02007900781EEF
+:02007A007A1CEE
+:02007B00791EEC
+:02007C007B1CEB
+:02007D007A1EE9
+:02007E007C1DE7
+:02007F007B1FE5
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_7.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_7.hex
new file mode 100644
index 0000000000..1c605c4631
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_7.hex
@@ -0,0 +1,129 @@
+:020000003E11AF
+:020001003E12AD
+:020002003F11AC
+:020003003E12AB
+:020004004011A9
+:020005003F12A8
+:020006004111A6
+:020007004012A5
+:020008004212A2
+:020009004113A1
+:02000A0043129F
+:02000B0042139E
+:02000C0044129C
+:02000D0043139B
+:02000E00451299
+:02000F00441497
+:02001000461395
+:02001100451494
+:02001200471392
+:02001300461491
+:02001400471390
+:0200150047148E
+:0200160048138D
+:0200170048158A
+:02001800491489
+:02001900491587
+:02001A004A1486
+:02001B004A1584
+:02001C004B1483
+:02001D004B1581
+:02001E004C1480
+:02001F004C167D
+:020020004D157C
+:020021004D167A
+:020022004E1579
+:020023004E1677
+:020024004F1576
+:020025004F1773
+:02002600501573
+:02002700501770
+:0200280051166F
+:0200290051176D
+:02002A0052166C
+:02002B0052176A
+:02002C00531669
+:02002D00531866
+:02002E00541765
+:02002F00541863
+:02003000551762
+:02003100551860
+:0200320056175F
+:0200330056195C
+:0200340057175C
+:02003500571959
+:02003600581858
+:02003700571957
+:02003800591855
+:02003900581954
+:02003A005A1852
+:02003B00591A50
+:02003C005B184F
+:02003D005A1A4D
+:02003E005C194B
+:02003F005B1A4A
+:020040005D1948
+:020041005C1A47
+:020042005E1945
+:020043005D1B43
+:020044005F1942
+:020045005E1B40
+:02004600601A3E
+:020047005F1B3D
+:02004800611A3B
+:02004900601C39
+:02004A00621A38
+:02004B00611C36
+:02004C00631A35
+:02004D00621C33
+:02004E00631B32
+:02004F00631C30
+:02005000641B2F
+:02005100641D2C
+:02005200651B2C
+:02005300651D29
+:02005400661B29
+:02005500661D26
+:02005600671C25
+:02005700671D23
+:02005800681C22
+:02005900681E1F
+:02005A00691C1F
+:02005B00691E1C
+:02005C006A1C1C
+:02005D006A1E19
+:02005E006B1D18
+:02005F006B1F15
+:020060006C1D15
+:020061006C1F12
+:020062006D1D12
+:020063006D1F0F
+:020064006E1E0E
+:020065006E1F0C
+:020066006F1E0B
+:020067006F2008
+:02006800701E08
+:02006900702005
+:02006A00711E05
+:02006B00702003
+:02006C00721F01
+:02006D007121FF
+:02006E00731FFE
+:02006F007221FC
+:02007000741FFB
+:020071007321F9
+:02007200751FF8
+:020073007421F6
+:020074007620F4
+:020075007522F2
+:020076007720F1
+:020077007622EF
+:020078007820EE
+:020079007722EC
+:02007A007920EB
+:02007B007822E9
+:02007C007A21E7
+:02007D007923E5
+:02007E007B21E4
+:02007F007A23E2
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_8.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_8.hex
new file mode 100644
index 0000000000..dbc2ad22ad
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_8.hex
@@ -0,0 +1,129 @@
+:020000003D13AE
+:020001003D14AC
+:020002003E13AB
+:020003003E14A9
+:020004003F13A8
+:020005003F14A6
+:020006004014A4
+:020007004015A2
+:020008004114A1
+:0200090041159F
+:02000A0042149E
+:02000B0042159C
+:02000C0043149B
+:02000D00431698
+:02000E00441597
+:02000F00441695
+:02001000451594
+:02001100441693
+:02001200461591
+:0200130045178F
+:0200140047168D
+:0200150046178C
+:0200160048168A
+:02001700471789
+:02001800491687
+:02001900481786
+:02001A004A1783
+:02001B00491882
+:02001C004B1780
+:02001D004A187F
+:02001E004C177D
+:02001F004B187C
+:020020004D177A
+:020021004C1978
+:020022004D1877
+:020023004D1975
+:020024004E1874
+:020025004E1972
+:020026004F1871
+:020027004F1A6E
+:0200280050196D
+:02002900501A6B
+:02002A0051196A
+:02002B00511A68
+:02002C00521967
+:02002D00521B64
+:02002E00531964
+:02002F00531B61
+:02003000541A60
+:02003100541B5E
+:02003200551A5D
+:02003300551C5A
+:02003400561A5A
+:02003500561C57
+:02003600571B56
+:02003700571C54
+:02003800581B53
+:02003900571C52
+:02003A00591B50
+:02003B00581D4E
+:02003C005A1B4D
+:02003D00591D4B
+:02003E005B1C49
+:02003F005A1D48
+:020040005C1C46
+:020041005B1E44
+:020042005D1C43
+:020043005C1E41
+:020044005E1D3F
+:020045005D1E3E
+:020046005F1D3C
+:020047005E1F3A
+:02004800601D39
+:020049005F1F37
+:02004A00611E35
+:02004B00601F34
+:02004C00621E32
+:02004D00612030
+:02004E00621E30
+:02004F0062202D
+:02005000631E2D
+:0200510063202A
+:02005200641F29
+:02005300642027
+:02005400651F26
+:02005500652123
+:02005600661F23
+:02005700662120
+:0200580067201F
+:0200590067211D
+:02005A0068201C
+:02005B00682219
+:02005C00692019
+:02005D00692216
+:02005E006A2016
+:02005F006A2213
+:020060006B2112
+:020061006B230F
+:020062006C210F
+:020063006B230D
+:020064006D210C
+:020065006C230A
+:020066006E2208
+:020067006D2406
+:020068006F2205
+:020069006E2403
+:02006A00702202
+:02006B006F2400
+:02006C007122FF
+:02006D007024FD
+:02006E007223FB
+:02006F007125F9
+:020070007323F8
+:020071007225F6
+:020072007423F5
+:020073007325F3
+:020074007524F1
+:020075007426EF
+:020076007624EE
+:020077007526EC
+:020078007724EB
+:020079007626E9
+:02007A007825E7
+:02007B007727E5
+:02007C007825E5
+:02007D007827E2
+:02007E007925E2
+:02007F007927DF
+:00000001FF
diff --git a/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_9.hex b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_9.hex
new file mode 100644
index 0000000000..ab9ebc73a7
--- /dev/null
+++ b/libraries/dsp/correlator/src/hex/complex_subbands_8b_fold_1_9.hex
@@ -0,0 +1,129 @@
+:020000003D15AC
+:020001003C16AB
+:020002003D15AA
+:020003003D16A8
+:020004003E15A7
+:020005003E17A4
+:020006003F16A3
+:020007003F17A1
+:020008004016A0
+:0200090040179E
+:02000A0041169D
+:02000B0041189A
+:02000C00421799
+:02000D00421897
+:02000E00431796
+:02000F00431894
+:02001000441793
+:02001100441990
+:0200120045188F
+:0200130045198D
+:0200140046188C
+:0200150046198A
+:02001600471889
+:02001700461A87
+:02001800481985
+:02001900471A84
+:02001A00491982
+:02001B00481A81
+:02001C004A197F
+:02001D00491B7D
+:02001E004B1A7B
+:02001F004A1B7A
+:020020004C1A78
+:020021004B1B77
+:020022004D1A75
+:020023004C1C73
+:020024004E1B71
+:020025004D1C70
+:020026004E1B6F
+:020027004E1C6D
+:020028004F1B6C
+:020029004F1D69
+:02002A00501C68
+:02002B00501D66
+:02002C00511C65
+:02002D00511D63
+:02002E00521C62
+:02002F00521E5F
+:02003000531D5E
+:02003100531E5C
+:02003200541D5B
+:02003300541E59
+:02003400551D58
+:02003500551F55
+:02003600561E54
+:02003700561F52
+:02003800571E51
+:02003900561F50
+:02003A00581E4E
+:02003B0057204C
+:02003C00591F4A
+:02003D00582049
+:02003E005A1F47
+:02003F00592046
+:020040005B1F44
+:020041005A2142
+:020042005C2040
+:020043005B213F
+:020044005D203D
+:020045005C223B
+:020046005E203A
+:020047005D2238
+:020048005F2136
+:020049005E2235
+:02004A005F2134
+:02004B005F2331
+:02004C00602131
+:02004D0060232E
+:02004E0061222D
+:02004F0061232B
+:0200500062222A
+:02005100622427
+:02005200632227
+:02005300632424
+:02005400642323
+:02005500642421
+:02005600652320
+:0200570065251D
+:0200580066231D
+:0200590065251B
+:02005A0067231A
+:02005B00662518
+:02005C00682416
+:02005D00672614
+:02005E00692413
+:02005F00682611
+:020060006A2410
+:0200610069260E
+:020062006B250C
+:020063006A270A
+:020064006C2509
+:020065006B2707
+:020066006D2506
+:020067006C2704
+:020068006E2602
+:020069006D2800
+:02006A006F26FF
+:02006B006E28FD
+:02006C007026FC
+:02006D006F28FA
+:02006E007127F8
+:02006F007029F6
+:020070007127F6
+:020071007129F3
+:020072007227F3
+:020073007229F0
+:020074007328EF
+:02007500732AEC
+:020076007428EC
+:02007700742AE9
+:020078007528E9
+:02007900752AE6
+:02007A007629E5
+:02007B00752BE3
+:02007C007729E2
+:02007D00762BE0
+:02007E007829DF
+:02007F00772BDD
+:00000001FF
diff --git a/libraries/dsp/correlator/src/python/gen_hex_files_complex_subbands.py b/libraries/dsp/correlator/src/python/gen_hex_files_complex_subbands.py
index 655f5ce18c..6501e209f2 100644
--- a/libraries/dsp/correlator/src/python/gen_hex_files_complex_subbands.py
+++ b/libraries/dsp/correlator/src/python/gen_hex_files_complex_subbands.py
@@ -28,11 +28,12 @@ from mem_init_file import list_to_hex
 # Description:
 # . 
 
-NOF_INPUTS = 24
+NOF_INPUTS = 24 # Must be even when NOF_FOLDS>0
+NOF_FOLDS = 0 
+NOF_INPUT_STREAMS = NOF_INPUTS/pow(2, NOF_FOLDS)
 COMPLEX_WIDTH = 8 
 NOF_CHANNELS = 64
-NOF_TIMESAMPLES = 1
-NOF_WORDS_PER_BLOCK =NOF_TIMESAMPLES*NOF_CHANNELS
+NOF_WORDS_PER_BLOCK = NOF_CHANNELS*pow(2, NOF_FOLDS)
 
 MAX_AMPLITUDE = pow(2, COMPLEX_WIDTH)/2-1 # Stay in the positive bit range
 AMPL_INCR = 1
@@ -62,13 +63,13 @@ for input_nr in range(NOF_INPUTS):
         print 'input_nr',input_nr, 'channel_nr', channel_nr, 'ampl',ampl,'phase_deg', phase_deg
         sample = complex_phasor_to_binomial(ampl, phase_deg)
         channel_block.append(sample)
-    input_lists.append(NOF_TIMESAMPLES*channel_block)
+    input_lists.append(channel_block)
 
 # =============================================
 # Convert complex type to concatenated unsigned
 # =============================================
 for input_nr in range(NOF_INPUTS):
-    for word in range(NOF_WORDS_PER_BLOCK):
+    for word in range(NOF_CHANNELS):
         re = int(round(input_lists[input_nr][word].real))
         im = int(round(input_lists[input_nr][word].imag))
         print 'Input', input_nr, 'Channel', word, 're,im', re, im
@@ -77,9 +78,20 @@ for input_nr in range(NOF_INPUTS):
         concat_bits = re_bits & im_bits
         input_lists[input_nr][word] = concat_bits.data
 
+# ==========================================================
+# Interleave the lists if user wants folded correlator input
+# . Note: no support for more than 1 fold yet.
+# ==========================================================
+if NOF_FOLDS==1:
+    input_stream_lists = []
+    for input_stream_nr in range(NOF_INPUT_STREAMS):
+        input_stream_lists.append( interleave([input_lists[2*input_stream_nr], input_lists[2*input_stream_nr+1]] ) )
+elif NOF_FOLDS==0:
+    input_stream_lists = input_lists
+
 # ====================
 # Write the HEX files
 # ====================
-for input_nr in range(NOF_INPUTS):
-    list_to_hex( input_lists[input_nr], PATH+"/"+FILENAME+"_"+str(COMPLEX_WIDTH)+'_'+str(input_nr)+".hex", MEM_WIDTH, MEM_DEPTH)
+for input_stream_nr in range(NOF_INPUT_STREAMS):
+    list_to_hex( input_stream_lists[input_stream_nr], PATH+"/"+FILENAME+"_"+str(COMPLEX_WIDTH)+'b_fold_'+str(NOF_FOLDS)+'_'+str(input_stream_nr)+".hex", MEM_WIDTH, MEM_DEPTH)
 
diff --git a/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd b/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd
new file mode 100644
index 0000000000..263342ce77
--- /dev/null
+++ b/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd
@@ -0,0 +1,139 @@
+--------------------------------------------------------------------------------
+--
+-- Copyright (C) 2014
+-- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/>
+-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+--------------------------------------------------------------------------------
+
+LIBRARY IEEE, common_lib, dp_lib;
+USE IEEE.std_logic_1164.ALL;
+USE IEEE.numeric_std.ALL;
+USE common_lib.common_pkg.ALL;
+USE dp_lib.dp_stream_pkg.ALL;
+
+-- Purpose:
+-- Description:
+
+ENTITY corr_unfolder IS
+  GENERIC (
+    g_nof_inputs  : NATURAL;     -- Number of inputs
+    g_nof_unfolds : NATURAL := 0 -- Number of times to unfold
+  );
+  PORT (
+    rst            : IN  STD_LOGIC;
+    clk            : IN  STD_LOGIC;
+
+    snk_in_arr     : IN  t_dp_sosi_arr(g_nof_inputs-1 DOWNTO 0);
+
+    src_out_arr    : OUT t_dp_sosi_arr(g_nof_inputs*pow2(g_nof_unfolds)-1 DOWNTO 0)
+  );
+END corr_unfolder;
+
+ARCHITECTURE str OF corr_unfolder IS
+
+  COMPONENT corr_unfolder IS
+    GENERIC (
+      g_nof_inputs  : NATURAL;
+      g_nof_unfolds : NATURAL := 0 
+    ); 
+    PORT (
+      rst            : IN  STD_LOGIC;
+      clk            : IN  STD_LOGIC;
+  
+      snk_in_arr     : IN  t_dp_sosi_arr(g_nof_inputs-1 DOWNTO 0);
+  
+      src_out_arr    : OUT t_dp_sosi_arr(g_nof_inputs*pow2(g_nof_unfolds)-1 DOWNTO 0)
+    );
+  END COMPONENT;
+
+  CONSTANT c_nof_demuxes : NATURAL := g_nof_inputs; 
+
+  SIGNAL output_sel_arr           : STD_LOGIC_VECTOR(c_nof_demuxes-1 DOWNTO 0);
+  SIGNAL nxt_output_sel_arr       : STD_LOGIC_VECTOR(c_nof_demuxes-1 DOWNTO 0);
+
+  SIGNAL demux_src_out_2arr_2     : t_dp_sosi_2arr_2(c_nof_demuxes-1 DOWNTO 0);
+  SIGNAL nxt_demux_src_out_2arr_2 : t_dp_sosi_2arr_2(c_nof_demuxes-1 DOWNTO 0);
+  SIGNAL demux_src_out_arr        : t_dp_sosi_arr(2*c_nof_demuxes-1 DOWNTO 0);
+
+BEGIN
+
+  gen_arch: IF g_nof_unfolds/=0 GENERATE
+    -----------------------------------------------------------------------------
+    -- Simple 2-output demux logic
+    -----------------------------------------------------------------------------
+    gen_demux_comb: FOR i IN 0 TO c_nof_demuxes-1 GENERATE
+      nxt_output_sel_arr(i) <= NOT output_sel_arr(i) WHEN snk_in_arr(i).valid='1' ELSE output_sel_arr(i);
+
+      nxt_demux_src_out_2arr_2(i)(0) <= snk_in_arr(i) WHEN output_sel_arr(i)='0' AND snk_in_arr(i).valid='1' ELSE c_dp_sosi_rst;
+      nxt_demux_src_out_2arr_2(i)(1) <= snk_in_arr(i) WHEN output_sel_arr(i)='1' AND snk_in_arr(i).valid='1' ELSE c_dp_sosi_rst;
+    END GENERATE;
+
+    -----------------------------------------------------------------------------
+    -- Wire the 2D demux output array to 1D array to match entity I/O type
+    -----------------------------------------------------------------------------
+    gen_demux_inputs_0: FOR i IN 0 TO c_nof_demuxes-1 GENERATE
+       demux_src_out_arr(2*i)   <= demux_src_out_2arr_2(i)(0);
+       demux_src_out_arr(2*i+1) <= demux_src_out_2arr_2(i)(1);
+    END GENERATE;
+  
+    -----------------------------------------------------------------------------
+    -- If g_nof_unfolds=1, this is the last stage. Otherwise, add a stage.
+    -----------------------------------------------------------------------------
+    gen_corr_folder: IF g_nof_unfolds>1 GENERATE
+      u_corr_folder : corr_unfolder
+      GENERIC MAP (
+        g_nof_inputs  => c_nof_demuxes*2, -- Next stage has all our demux outputs as inputs
+        g_nof_unfolds => g_nof_unfolds-1
+      )
+      PORT MAP (
+        rst         => rst,
+        clk         => clk,
+                    
+        snk_in_arr  => demux_src_out_arr,                   
+        src_out_arr => src_out_arr
+      );
+    END GENERATE;
+  
+    gen_src_out_arr: IF g_nof_unfolds=1 GENERATE
+      src_out_arr <= demux_src_out_arr;
+    END GENERATE;
+  
+    -----------------------------------------------------------------------------
+    -- Registers
+    -----------------------------------------------------------------------------
+    p_clk: PROCESS(clk, rst)
+    BEGIN
+      IF rst='1' THEN
+        demux_src_out_2arr_2 <= (OTHERS=>(OTHERS=>c_dp_sosi_rst));
+        output_sel_arr       <= (OTHERS=>'0');
+      ELSIF rising_edge(clk) THEN
+        demux_src_out_2arr_2 <= nxt_demux_src_out_2arr_2;
+        output_sel_arr       <= nxt_output_sel_arr;
+      END IF;
+    END PROCESS;
+
+  END GENERATE;
+
+  -----------------------------------------------------------------------------
+  -- Wire output to input if g_nof_unfolds=0
+  -----------------------------------------------------------------------------
+  gen_wire_out_to_in: IF g_nof_unfolds=0 GENERATE
+    src_out_arr <= snk_in_arr;
+  END GENERATE;
+
+END str;
+
diff --git a/libraries/dsp/correlator/src/vhdl/correlator.vhd b/libraries/dsp/correlator/src/vhdl/correlator.vhd
index 6b083ca4ef..5fe4d7bd00 100644
--- a/libraries/dsp/correlator/src/vhdl/correlator.vhd
+++ b/libraries/dsp/correlator/src/vhdl/correlator.vhd
@@ -26,13 +26,14 @@ USE common_lib.common_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
 
 -- Purpose:
--- . Calculate the cross- and auto correlations of g_nof_inputs inputs.
+-- . Calculate the cross- and auto correlations of c_nof_inputs inputs.
 -- Description:
 -- . 
 
 ENTITY correlator IS
   GENERIC (
-    g_nof_inputs         : NATURAL;
+    g_nof_input_streams  : NATURAL;
+    g_nof_input_folds    : NATURAL := 0;  -- 2**g_nof_input_folds = number of inputs carried on one input stream
     g_nof_pre_mult_folds : NATURAL := 0;  -- Number of pre-multiplier stage folds.
     g_data_w             : NATURAL := 16; -- Complex data width
     g_conjugate          : BOOLEAN := TRUE;
@@ -43,7 +44,7 @@ ENTITY correlator IS
     rst            : IN  STD_LOGIC;
     clk            : IN  STD_LOGIC;
 
-    snk_in_arr     : IN  t_dp_sosi_arr(g_nof_inputs-1 DOWNTO 0);
+    snk_in_arr     : IN  t_dp_sosi_arr(g_nof_input_streams-1 DOWNTO 0);
 
     src_out_arr    : OUT t_dp_sosi_arr(1-1 DOWNTO 0) -- Single output for now
   );
@@ -51,7 +52,8 @@ END correlator;
 
 ARCHITECTURE str OF correlator IS
 
-  CONSTANT c_nof_visibilities                : NATURAL := (g_nof_inputs*(g_nof_inputs+1))/2;
+  CONSTANT c_nof_inputs                      : NATURAL := g_nof_input_streams*pow2(g_nof_input_folds);
+  CONSTANT c_nof_visibilities                : NATURAL := (c_nof_inputs*(c_nof_inputs+1))/2;
 
   -----------------------------------------------------------------------------
   -- The array of multiplier input streams can be folded, e.g.:
@@ -74,6 +76,8 @@ ARCHITECTURE str OF correlator IS
   CONSTANT c_mult_output_w                   : NATURAL := 2*g_data_w;
   CONSTANT c_acc_data_w                      : NATURAL := c_mult_output_w + ceil_log2(c_integration_period);
 
+  SIGNAL corr_unfolder_src_out_arr           : t_dp_sosi_arr(c_nof_inputs-1 DOWNTO 0);
+  SIGNAL corr_permutator_snk_in_arr          : t_dp_sosi_arr(c_nof_inputs-1 DOWNTO 0);
   SIGNAL corr_permutator_src_out_2arr_2      : t_dp_sosi_2arr_2(c_nof_visibilities-1 DOWNTO 0); -- Array of pairs
   SIGNAL corr_folder_snk_in_2arr_2           : t_dp_sosi_2arr_2(c_nof_visibilities-1 DOWNTO 0); -- Array of pairs, not folded yet
   SIGNAL corr_folder_src_out_2arr_2          : t_dp_sosi_2arr_2(c_nof_mults-1 DOWNTO 0);        -- Array of pairs, folded 
@@ -87,18 +91,52 @@ ARCHITECTURE str OF correlator IS
 
 BEGIN
 
+  ------------------------------------------------------------------------------
+  -- Unfold input streams
+  ------------------------------------------------------------------------------
+  u_corr_unfolder : ENTITY work.corr_unfolder
+  GENERIC MAP (
+    g_nof_inputs  => g_nof_input_streams,
+    g_nof_unfolds => g_nof_input_folds 
+  )
+  PORT MAP (
+    rst         => rst,
+    clk         => clk,
+
+    snk_in_arr  => snk_in_arr,
+
+    src_out_arr => corr_unfolder_src_out_arr
+  );
+
+  -----------------------------------------------------------------------------
+  -- Unfolder -> permutator pipeline to re-align the unfolder output
+  -----------------------------------------------------------------------------
+  gen_dp_pipeline_corr_unfolder_src_out_arr : FOR i IN 0 TO c_nof_inputs-1 GENERATE
+    u_dp_pipeline : ENTITY dp_lib.dp_pipeline
+    GENERIC MAP (
+      g_pipeline => 0 + (pow2(g_nof_input_folds) - i REM pow2(g_nof_input_folds)-1)
+    )
+    PORT MAP (
+      rst         => rst,
+      clk         => clk,
+  
+      snk_in      => corr_unfolder_src_out_arr(i),
+      src_out     => corr_permutator_snk_in_arr(i)
+    );
+  END GENERATE;
+
   -----------------------------------------------------------------------------
   -- Create all unique pair permutations of the input streams
   -----------------------------------------------------------------------------
   u_corr_permutator : ENTITY work.corr_permutator
   GENERIC MAP (
-    g_nof_inputs => g_nof_inputs
+    g_nof_inputs => c_nof_inputs
   )
   PORT MAP (
     clk            => clk,
     rst            => rst,
 
-    snk_in_arr     => snk_in_arr,
+    snk_in_arr     => corr_permutator_snk_in_arr, --corr_unfolder_src_out_arr, --snk_in_arr,
     src_out_2arr_2 => corr_permutator_src_out_2arr_2
   );     
 
diff --git a/libraries/dsp/correlator/tb/vhdl/tb_correlator.vhd b/libraries/dsp/correlator/tb/vhdl/tb_correlator.vhd
index 7f7b4d3de2..f00a3fd18a 100644
--- a/libraries/dsp/correlator/tb/vhdl/tb_correlator.vhd
+++ b/libraries/dsp/correlator/tb/vhdl/tb_correlator.vhd
@@ -36,7 +36,9 @@ END tb_correlator;
 ARCHITECTURE tb OF tb_correlator IS
 
   CONSTANT c_nof_inputs         : NATURAL := 10;
-  CONSTANT c_nof_pre_mult_folds : NATURAL := 0;
+  CONSTANT c_nof_input_folds    : NATURAL := 1;
+  CONSTANT c_nof_input_streams  : NATURAL := c_nof_inputs / pow2(c_nof_input_folds);
+  CONSTANT c_nof_pre_mult_folds : NATURAL := 1;
   CONSTANT c_complex_data_w     : NATURAL := 8;
   CONSTANT c_conjugate          : BOOLEAN := TRUE;
   CONSTANT c_nof_channels       : NATURAL := 64;
@@ -45,10 +47,10 @@ ARCHITECTURE tb OF tb_correlator IS
   CONSTANT c_nof_visibilities   : NATURAL := (c_nof_inputs*(c_nof_inputs+1))/2;
 
   -- Gap size on the correlator input depends on the number of folds
-  CONSTANT c_block_period       : NATURAL := pow2(c_nof_pre_mult_folds);
+  CONSTANT c_block_period       : NATURAL := 1; --pow2(c_nof_pre_mult_folds); -- To do: figure out the block period as function of both folding factors.
 
   -- Block generator
-  CONSTANT c_bg_block_size      : NATURAL := c_nof_channels;
+  CONSTANT c_bg_block_size      : NATURAL := c_nof_channels*pow2(c_nof_input_folds);
   CONSTANT c_bg_gapsize         : NATURAL := c_bg_block_size*(c_block_period-1);
 
   -- Indicate the integration period with the sync. In the correlator, the
@@ -76,12 +78,12 @@ ARCHITECTURE tb OF tb_correlator IS
   SIGNAL mm_clk                 : STD_LOGIC := '1';
   SIGNAL mm_rst                 : STD_LOGIC;
 
-  SIGNAL block_gen_src_out_arr  : t_dp_sosi_arr(c_nof_inputs-1 DOWNTO 0);
+  SIGNAL block_gen_src_out_arr  : t_dp_sosi_arr(c_nof_input_streams-1 DOWNTO 0);
 
-  SIGNAL dp_fifo_sc_src_out_arr : t_dp_sosi_arr(c_nof_inputs-1 DOWNTO 0);
-  SIGNAL dp_fifo_sc_src_in_arr  : t_dp_siso_arr(c_nof_inputs-1 DOWNTO 0);
+  SIGNAL dp_fifo_sc_src_out_arr : t_dp_sosi_arr(c_nof_input_streams-1 DOWNTO 0);
+  SIGNAL dp_fifo_sc_src_in_arr  : t_dp_siso_arr(c_nof_input_streams-1 DOWNTO 0);
 
-  SIGNAL correlator_snk_in_arr  : t_dp_sosi_arr(c_nof_inputs-1 DOWNTO 0);
+  SIGNAL correlator_snk_in_arr  : t_dp_sosi_arr(c_nof_input_streams-1 DOWNTO 0);
   SIGNAL correlator_src_out_arr : t_dp_sosi_arr(1-1 DOWNTO 0);
 
   SIGNAL ram_diag_data_buf_mosi : t_mem_mosi;
@@ -127,10 +129,10 @@ BEGIN
   -----------------------------------------------------------------------------
   u_mms_diag_block_gen : ENTITY diag_lib.mms_diag_block_gen
   GENERIC MAP (
-    g_nof_output_streams => c_nof_inputs,
+    g_nof_output_streams => c_nof_input_streams,
     g_buf_dat_w          => 2*c_complex_data_w,
     g_buf_addr_w         => ceil_log2(TO_UINT(c_bg_ctrl.samples_per_packet)),
-    g_file_name_prefix   => "../../../libraries/dsp/correlator/src/hex/complex_subbands_" & NATURAL'IMAGE(c_complex_data_w),
+    g_file_name_prefix   => "../../../libraries/dsp/correlator/src/hex/complex_subbands_" & NATURAL'IMAGE(c_complex_data_w) & "b_" & "fold_" & NATURAL'IMAGE(c_nof_input_folds),
     g_diag_block_gen_rst => c_bg_ctrl
   )
   PORT MAP (
@@ -149,13 +151,13 @@ BEGIN
   -- . We'll use FIFO buffers and dp_gap to read out the FIFOs to introduce
   --   gaps.
   -----------------------------------------------------------------------------
-  gen_dp_fifo_sc : FOR i IN 0 TO c_nof_inputs-1 GENERATE
+  gen_dp_fifo_sc : FOR i IN 0 TO c_nof_input_streams-1 GENERATE
     u_dp_fifo_sc : ENTITY dp_lib.dp_fifo_sc
     GENERIC MAP (
       g_data_w         => 2*c_complex_data_w,
       g_use_ctrl       => FALSE,
       g_use_complex    => TRUE,
-      g_fifo_size      => c_nof_channels,
+      g_fifo_size      => c_bg_block_size,
       g_fifo_af_margin => 0
     )
     PORT MAP (
@@ -173,7 +175,7 @@ BEGIN
     );
   END GENERATE;
 
-  gen_dp_src_out_timer : FOR i IN 0 TO c_nof_inputs-1 GENERATE
+  gen_dp_src_out_timer : FOR i IN 0 TO c_nof_input_streams-1 GENERATE
     u_dp_src_out_timer : ENTITY dp_lib.dp_src_out_timer
     GENERIC MAP (
       g_block_period => c_block_period
@@ -194,7 +196,8 @@ BEGIN
   -----------------------------------------------------------------------------
   u_correlator : ENTITY work.correlator
   GENERIC MAP (
-    g_nof_inputs         => c_nof_inputs,
+    g_nof_input_streams  => c_nof_input_streams,
+    g_nof_input_folds    => c_nof_input_folds,
     g_nof_pre_mult_folds => c_nof_pre_mult_folds,
     g_data_w             => c_complex_data_w,
     g_conjugate          => c_conjugate,
-- 
GitLab