diff options
| author | Andrej Rode <mail@andrejro.de> | 2017-05-18 11:43:45 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-12-13 20:19:03 -0800 |
| commit | e8d2b1f054783f150023e9d24842adf022275983 (patch) | |
| tree | 2260d6a023715f3974719f15019c069cdde70cbf /gr-dtv | |
| parent | 8628adf64d14c9d3d24e28dc4f314337d705ca63 (diff) | |
gr-dtv: move init_pilots from work to init
Instead of recomputing the pilots for each symbol, generate list
in the constructor and just read the pilots from this list
written by Team "Kommando Spektralkräfte" @ Rohde & Schwarz Engineering
Competition 2017
Diffstat (limited to 'gr-dtv')
| -rw-r--r-- | gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc | 671 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h | 7 |
2 files changed, 343 insertions, 335 deletions
diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc index 31b0ce42a5..42d21867f8 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc +++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc @@ -1138,6 +1138,11 @@ namespace gr { throw std::bad_alloc(); } num_symbols = numdatasyms + N_P2; + data_carrier_map.resize(num_symbols); + for (std::vector<int> &carrier_map : data_carrier_map){ + carrier_map.resize(MAX_CARRIERS); + } + init_pilots(); set_output_multiple(num_symbols); } @@ -1179,11 +1184,13 @@ namespace gr { } void - dvbt2_pilotgenerator_cc_impl::init_pilots(int symbol) + dvbt2_pilotgenerator_cc_impl::init_pilots() { + for (int symbol = 0; symbol < num_symbols; ++symbol){ int remainder, shift; + std::vector<int> &carrier_map = data_carrier_map[symbol]; for (int i = 0; i < C_PS; i++) { - data_carrier_map[i] = DATA_CARRIER; + carrier_map[i] = DATA_CARRIER; } switch (fft_size) { case FFTSIZE_1K: @@ -1192,52 +1199,52 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp1[i] % 1632) / dx)) % 2 && (((pp1_cp1[i] % 1632) % dx) == 0)) { - data_carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER; } } break; case PILOT_PP2: for (int i = 0; i < 20; i++) { - data_carrier_map[pp2_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp2_cp1[i] % 1632] = CONTINUAL_CARRIER; } break; case PILOT_PP3: for (int i = 0; i < 22; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp1[i] % 1632) / dx)) % 2 && (((pp3_cp1[i] % 1632) % dx) == 0)) { - data_carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER; } } break; case PILOT_PP4: for (int i = 0; i < 20; i++) { - data_carrier_map[pp4_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 1632] = CONTINUAL_CARRIER; } break; case PILOT_PP5: for (int i = 0; i < 19; i++) { - data_carrier_map[pp5_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 1632] = CONTINUAL_CARRIER; } break; case PILOT_PP6: break; case PILOT_PP7: for (int i = 0; i < 15; i++) { - data_carrier_map[pp7_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp7_cp1[i] % 1632] = CONTINUAL_CARRIER; } break; case PILOT_PP8: @@ -1250,63 +1257,63 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp1[i] % 1632) / dx)) % 2 && (((pp1_cp1[i] % 1632) % dx) == 0)) { - data_carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 1632] = CONTINUAL_CARRIER; } } for (int i = 0; i < 25; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp2[i] % 1632) / dx)) % 2 && (((pp1_cp2[i] % 1632) % dx) == 0)) { - data_carrier_map[pp1_cp2[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp2[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i] % 1632] = CONTINUAL_CARRIER; } } break; case PILOT_PP2: for (int i = 0; i < 20; i++) { - data_carrier_map[pp2_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp2_cp1[i] % 1632] = CONTINUAL_CARRIER; } for (int i = 0; i < 22; i++) { - data_carrier_map[pp2_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp2_cp2[i] % 1632] = CONTINUAL_CARRIER; } break; case PILOT_PP3: for (int i = 0; i < 22; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp1[i] % 1632) / dx)) % 2 && (((pp3_cp1[i] % 1632) % dx) == 0)) { - data_carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 1632] = CONTINUAL_CARRIER; } } for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp2[i] % 1632) / dx)) % 2 && (((pp3_cp2[i] % 1632) % dx) == 0)) { - data_carrier_map[pp3_cp2[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp2[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i] % 1632] = CONTINUAL_CARRIER; } } break; @@ -1314,27 +1321,27 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp1[i] % 1632) / dx)) % 2 && (((pp4_cp1[i] % 1632) % dx) == 0)) { - data_carrier_map[pp4_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 1632] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp2[i] % 1632) / dx)) % 2 && (((pp4_cp2[i] % 1632) % dx) == 0)) { - data_carrier_map[pp4_cp2[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp2[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i] % 1632] = CONTINUAL_CARRIER; } } break; @@ -1342,27 +1349,27 @@ namespace gr { for (int i = 0; i < 19; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp1[i] % 1632) / dx)) % 2 && (((pp5_cp1[i] % 1632) % dx) == 0)) { - data_carrier_map[pp5_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp1[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 1632] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp2[i] % 1632) / dx)) % 2 && (((pp5_cp2[i] % 1632) % dx) == 0)) { - data_carrier_map[pp5_cp2[i] % 1632] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp2[i] % 1632] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i] % 1632] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i] % 1632] = CONTINUAL_CARRIER; } } break; @@ -1370,10 +1377,10 @@ namespace gr { break; case PILOT_PP7: for (int i = 0; i < 15; i++) { - data_carrier_map[pp7_cp1[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp7_cp1[i] % 1632] = CONTINUAL_CARRIER; } for (int i = 0; i < 30; i++) { - data_carrier_map[pp7_cp2[i] % 1632] = CONTINUAL_CARRIER; + carrier_map[pp7_cp2[i] % 1632] = CONTINUAL_CARRIER; } break; case PILOT_PP8: @@ -1386,79 +1393,79 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp1[i] % 3264) / dx)) % 2 && (((pp1_cp1[i] % 3264) % dx) == 0)) { - data_carrier_map[pp1_cp1[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp1[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 3264] = CONTINUAL_CARRIER; } } for (int i = 0; i < 25; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp2[i] % 3264) / dx)) % 2 && (((pp1_cp2[i] % 3264) % dx) == 0)) { - data_carrier_map[pp1_cp2[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp2[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i] % 3264] = CONTINUAL_CARRIER; } } break; case PILOT_PP2: for (int i = 0; i < 20; i++) { - data_carrier_map[pp2_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp2_cp1[i] % 3264] = CONTINUAL_CARRIER; } for (int i = 0; i < 22; i++) { - data_carrier_map[pp2_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp2_cp2[i] % 3264] = CONTINUAL_CARRIER; } for (int i = 0; i < 2; i++) { - data_carrier_map[pp2_cp3[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp2_cp3[i] % 3264] = CONTINUAL_CARRIER; } break; case PILOT_PP3: for (int i = 0; i < 22; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp1[i] % 3264) / dx)) % 2 && (((pp3_cp1[i] % 3264) % dx) == 0)) { - data_carrier_map[pp3_cp1[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp1[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 3264] = CONTINUAL_CARRIER; } } for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp2[i] % 3264) / dx)) % 2 && (((pp3_cp2[i] % 3264) % dx) == 0)) { - data_carrier_map[pp3_cp2[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp2[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i] % 3264] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp3[i] % 3264) / dx)) % 2 && (((pp3_cp3[i] % 3264) % dx) == 0)) { - data_carrier_map[pp3_cp3[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp3[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp3[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp3_cp3[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp3[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp3_cp3[i] % 3264] = CONTINUAL_CARRIER; } } break; @@ -1466,40 +1473,40 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp1[i] % 3264) / dx)) % 2 && (((pp4_cp1[i] % 3264) % dx) == 0)) { - data_carrier_map[pp4_cp1[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp1[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 3264] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp2[i] % 3264) / dx)) % 2 && (((pp4_cp2[i] % 3264) % dx) == 0)) { - data_carrier_map[pp4_cp2[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp2[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i] % 3264] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp3[i] % 3264) / dx)) % 2 && (((pp4_cp3[i] % 3264) % dx) == 0)) { - data_carrier_map[pp4_cp3[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp3[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp3[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp4_cp3[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp3[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp4_cp3[i] % 3264] = CONTINUAL_CARRIER; } } break; @@ -1507,40 +1514,40 @@ namespace gr { for (int i = 0; i < 19; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp1[i] % 3264) / dx)) % 2 && (((pp5_cp1[i] % 3264) % dx) == 0)) { - data_carrier_map[pp5_cp1[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp1[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 3264] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp2[i] % 3264) / dx)) % 2 && (((pp5_cp2[i] % 3264) % dx) == 0)) { - data_carrier_map[pp5_cp2[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp2[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i] % 3264] = CONTINUAL_CARRIER; } } for (int i = 0; i < 3; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp3[i] % 3264) / dx)) % 2 && (((pp5_cp3[i] % 3264) % dx) == 0)) { - data_carrier_map[pp5_cp3[i] % 3264] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp3[i] % 3264] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp3[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp5_cp3[i] % 3264] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp3[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp5_cp3[i] % 3264] = CONTINUAL_CARRIER; } } break; @@ -1548,13 +1555,13 @@ namespace gr { break; case PILOT_PP7: for (int i = 0; i < 15; i++) { - data_carrier_map[pp7_cp1[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp7_cp1[i] % 3264] = CONTINUAL_CARRIER; } for (int i = 0; i < 30; i++) { - data_carrier_map[pp7_cp2[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp7_cp2[i] % 3264] = CONTINUAL_CARRIER; } for (int i = 0; i < 5; i++) { - data_carrier_map[pp7_cp3[i] % 3264] = CONTINUAL_CARRIER; + carrier_map[pp7_cp3[i] % 3264] = CONTINUAL_CARRIER; } break; case PILOT_PP8: @@ -1568,46 +1575,46 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp1[i] % 6528) / dx)) % 2 && (((pp1_cp1[i] % 6528) % dx) == 0)) { - data_carrier_map[pp1_cp1[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp1[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 25; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp2[i] % 6528) / dx)) % 2 && (((pp1_cp2[i] % 6528) % dx) == 0)) { - data_carrier_map[pp1_cp2[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp2[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i] % 6528] = CONTINUAL_CARRIER; } } break; case PILOT_PP2: for (int i = 0; i < 20; i++) { - data_carrier_map[pp2_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp2_cp1[i] % 6528] = CONTINUAL_CARRIER; } for (int i = 0; i < 22; i++) { - data_carrier_map[pp2_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp2_cp2[i] % 6528] = CONTINUAL_CARRIER; } for (int i = 0; i < 2; i++) { - data_carrier_map[pp2_cp3[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp2_cp3[i] % 6528] = CONTINUAL_CARRIER; } for (int i = 0; i < 2; i++) { - data_carrier_map[pp2_cp4[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp2_cp4[i] % 6528] = CONTINUAL_CARRIER; } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 4; i++) { - data_carrier_map[pp2_8k[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_8k[i]] = CONTINUAL_CARRIER; } } break; @@ -1615,54 +1622,54 @@ namespace gr { for (int i = 0; i < 22; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp1[i] % 6528) / dx)) % 2 && (((pp3_cp1[i] % 6528) % dx) == 0)) { - data_carrier_map[pp3_cp1[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp1[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp2[i] % 6528) / dx)) % 2 && (((pp3_cp2[i] % 6528) % dx) == 0)) { - data_carrier_map[pp3_cp2[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp2[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp3[i] % 6528) / dx)) % 2 && (((pp3_cp3[i] % 6528) % dx) == 0)) { - data_carrier_map[pp3_cp3[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp3[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp3[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp3_cp3[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp3[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp3_cp3[i] % 6528] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp3_8k[i] / dx)) % 2 && ((pp3_8k[i] % dx) == 0)) { - data_carrier_map[pp3_8k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_8k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_8k[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_8k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_8k[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_8k[i]] = CONTINUAL_CARRIER; } } } @@ -1671,67 +1678,67 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp1[i] % 6528) / dx)) % 2 && (((pp4_cp1[i] % 6528) % dx) == 0)) { - data_carrier_map[pp4_cp1[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp1[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp2[i] % 6528) / dx)) % 2 && (((pp4_cp2[i] % 6528) % dx) == 0)) { - data_carrier_map[pp4_cp2[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp2[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp3[i] % 6528) / dx)) % 2 && (((pp4_cp3[i] % 6528) % dx) == 0)) { - data_carrier_map[pp4_cp3[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp3[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp3[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp4_cp3[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp3[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp4_cp3[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp4[i] % 6528) / dx)) % 2 && (((pp4_cp4[i] % 6528) % dx) == 0)) { - data_carrier_map[pp4_cp4[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp4[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp4[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp4_cp4[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp4[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp4_cp4[i] % 6528] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_8k[i] / dx)) % 2 && ((pp4_8k[i] % dx) == 0)) { - data_carrier_map[pp4_8k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_8k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_8k[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_8k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_8k[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_8k[i]] = CONTINUAL_CARRIER; } } } @@ -1740,53 +1747,53 @@ namespace gr { for (int i = 0; i < 19; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp1[i] % 6528) / dx)) % 2 && (((pp5_cp1[i] % 6528) % dx) == 0)) { - data_carrier_map[pp5_cp1[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp1[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp2[i] % 6528) / dx)) % 2 && (((pp5_cp2[i] % 6528) % dx) == 0)) { - data_carrier_map[pp5_cp2[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp2[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 3; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp3[i] % 6528) / dx)) % 2 && (((pp5_cp3[i] % 6528) % dx) == 0)) { - data_carrier_map[pp5_cp3[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp3[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp3[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp5_cp3[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp3[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp5_cp3[i] % 6528] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp4[i] % 6528) / dx)) % 2 && (((pp5_cp4[i] % 6528) % dx) == 0)) { - data_carrier_map[pp5_cp4[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp4[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp4[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp5_cp4[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp4[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp5_cp4[i] % 6528] = CONTINUAL_CARRIER; } } break; @@ -1794,20 +1801,20 @@ namespace gr { break; case PILOT_PP7: for (int i = 0; i < 15; i++) { - data_carrier_map[pp7_cp1[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp7_cp1[i] % 6528] = CONTINUAL_CARRIER; } for (int i = 0; i < 30; i++) { - data_carrier_map[pp7_cp2[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp7_cp2[i] % 6528] = CONTINUAL_CARRIER; } for (int i = 0; i < 5; i++) { - data_carrier_map[pp7_cp3[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp7_cp3[i] % 6528] = CONTINUAL_CARRIER; } for (int i = 0; i < 3; i++) { - data_carrier_map[pp7_cp4[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp7_cp4[i] % 6528] = CONTINUAL_CARRIER; } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 5; i++) { - data_carrier_map[pp7_8k[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_8k[i]] = CONTINUAL_CARRIER; } } break; @@ -1815,28 +1822,28 @@ namespace gr { for (int i = 0; i < 47; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp8_cp4[i] % 6528) / dx)) % 2 && (((pp8_cp4[i] % 6528) % dx) == 0)) { - data_carrier_map[pp8_cp4[i] % 6528] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_cp4[i] % 6528] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_cp4[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp8_cp4[i] % 6528] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_cp4[i] % 6528] = CONTINUAL_CARRIER; + carrier_map[pp8_cp4[i] % 6528] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 5; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp8_8k[i] / dx)) % 2 && ((pp8_8k[i] % dx) == 0)) { - data_carrier_map[pp8_8k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_8k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_8k[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_8k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_8k[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_8k[i]] = CONTINUAL_CARRIER; } } } @@ -1850,77 +1857,77 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp1[i] % 13056) / dx)) % 2 && (((pp1_cp1[i] % 13056) % dx) == 0)) { - data_carrier_map[pp1_cp1[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp1[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 25; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp2[i] % 13056) / dx)) % 2 && (((pp1_cp2[i] % 13056) % dx) == 0)) { - data_carrier_map[pp1_cp2[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp2[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 44; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp1_cp5[i] % 13056) / dx)) % 2 && (((pp1_cp5[i] % 13056) % dx) == 0)) { - data_carrier_map[pp1_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp1_cp5[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp1_cp5[i] % 13056] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 4; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp1_16k[i] / dx)) % 2 && ((pp1_16k[i] % dx) == 0)) { - data_carrier_map[pp1_16k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp1_16k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp1_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp1_16k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp1_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp1_16k[i]] = CONTINUAL_CARRIER; } } } break; case PILOT_PP2: for (int i = 0; i < 20; i++) { - data_carrier_map[pp2_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp2_cp1[i] % 13056] = CONTINUAL_CARRIER; } for (int i = 0; i < 22; i++) { - data_carrier_map[pp2_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp2_cp2[i] % 13056] = CONTINUAL_CARRIER; } for (int i = 0; i < 2; i++) { - data_carrier_map[pp2_cp3[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp2_cp3[i] % 13056] = CONTINUAL_CARRIER; } for (int i = 0; i < 2; i++) { - data_carrier_map[pp2_cp4[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp2_cp4[i] % 13056] = CONTINUAL_CARRIER; } for (int i = 0; i < 41; i++) { - data_carrier_map[pp2_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp2_cp5[i] % 13056] = CONTINUAL_CARRIER; } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { - data_carrier_map[pp2_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_16k[i]] = CONTINUAL_CARRIER; } } break; @@ -1928,67 +1935,67 @@ namespace gr { for (int i = 0; i < 22; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp1[i] % 13056) / dx)) % 2 && (((pp3_cp1[i] % 13056) % dx) == 0)) { - data_carrier_map[pp3_cp1[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp1[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp2[i] % 13056) / dx)) % 2 && (((pp3_cp2[i] % 13056) % dx) == 0)) { - data_carrier_map[pp3_cp2[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp2[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp3[i] % 13056) / dx)) % 2 && (((pp3_cp3[i] % 13056) % dx) == 0)) { - data_carrier_map[pp3_cp3[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp3[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp3[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp3_cp3[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp3[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp3_cp3[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 44; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp3_cp5[i] % 13056) / dx)) % 2 && (((pp3_cp5[i] % 13056) % dx) == 0)) { - data_carrier_map[pp3_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp3_cp5[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp3_cp5[i] % 13056] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp3_16k[i] / dx)) % 2 && ((pp3_16k[i] % dx) == 0)) { - data_carrier_map[pp3_16k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp3_16k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp3_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_16k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp3_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_16k[i]] = CONTINUAL_CARRIER; } } } @@ -1997,80 +2004,80 @@ namespace gr { for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp1[i] % 13056) / dx)) % 2 && (((pp4_cp1[i] % 13056) % dx) == 0)) { - data_carrier_map[pp4_cp1[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp1[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp2[i] % 13056) / dx)) % 2 && (((pp4_cp2[i] % 13056) % dx) == 0)) { - data_carrier_map[pp4_cp2[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp2[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp3[i] % 13056) / dx)) % 2 && (((pp4_cp3[i] % 13056) % dx) == 0)) { - data_carrier_map[pp4_cp3[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp3[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp3[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp3[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp3[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp3[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp4[i] % 13056) / dx)) % 2 && (((pp4_cp4[i] % 13056) % dx) == 0)) { - data_carrier_map[pp4_cp4[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp4[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp4[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp4[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp4[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp4[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 44; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp4_cp5[i] % 13056) / dx)) % 2 && (((pp4_cp5[i] % 13056) % dx) == 0)) { - data_carrier_map[pp4_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp5[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp4_cp5[i] % 13056] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_16k[i] / dx)) % 2 && ((pp4_16k[i] % dx) == 0)) { - data_carrier_map[pp4_16k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_16k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_16k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_16k[i]] = CONTINUAL_CARRIER; } } } @@ -2079,113 +2086,113 @@ namespace gr { for (int i = 0; i < 19; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp1[i] % 13056) / dx)) % 2 && (((pp5_cp1[i] % 13056) % dx) == 0)) { - data_carrier_map[pp5_cp1[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp1[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp2[i] % 13056) / dx)) % 2 && (((pp5_cp2[i] % 13056) % dx) == 0)) { - data_carrier_map[pp5_cp2[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp2[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 3; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp3[i] % 13056) / dx)) % 2 && (((pp5_cp3[i] % 13056) % dx) == 0)) { - data_carrier_map[pp5_cp3[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp3[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp3[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp3[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp3[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp3[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp4[i] % 13056) / dx)) % 2 && (((pp5_cp4[i] % 13056) % dx) == 0)) { - data_carrier_map[pp5_cp4[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp4[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp4[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp4[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp4[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp4[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 44; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp5_cp5[i] % 13056) / dx)) % 2 && (((pp5_cp5[i] % 13056) % dx) == 0)) { - data_carrier_map[pp5_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp5[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp5_cp5[i] % 13056] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp5_16k[i] / dx)) % 2 && ((pp5_16k[i] % dx) == 0)) { - data_carrier_map[pp5_16k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp5_16k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp5_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp5_16k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp5_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp5_16k[i]] = CONTINUAL_CARRIER; } } } break; case PILOT_PP6: for (int i = 0; i < 88; i++) { - data_carrier_map[pp6_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp6_cp5[i] % 13056] = CONTINUAL_CARRIER; } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { - data_carrier_map[pp6_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp6_16k[i]] = CONTINUAL_CARRIER; } } break; case PILOT_PP7: for (int i = 0; i < 15; i++) { - data_carrier_map[pp7_cp1[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp7_cp1[i] % 13056] = CONTINUAL_CARRIER; } for (int i = 0; i < 30; i++) { - data_carrier_map[pp7_cp2[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp7_cp2[i] % 13056] = CONTINUAL_CARRIER; } for (int i = 0; i < 5; i++) { - data_carrier_map[pp7_cp3[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp7_cp3[i] % 13056] = CONTINUAL_CARRIER; } for (int i = 0; i < 3; i++) { - data_carrier_map[pp7_cp4[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp7_cp4[i] % 13056] = CONTINUAL_CARRIER; } for (int i = 0; i < 35; i++) { - data_carrier_map[pp7_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp7_cp5[i] % 13056] = CONTINUAL_CARRIER; } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 3; i++) { - data_carrier_map[pp7_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_16k[i]] = CONTINUAL_CARRIER; } } break; @@ -2193,41 +2200,41 @@ namespace gr { for (int i = 0; i < 47; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp8_cp4[i] % 13056) / dx)) % 2 && (((pp8_cp4[i] % 13056) % dx) == 0)) { - data_carrier_map[pp8_cp4[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_cp4[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_cp4[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp8_cp4[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_cp4[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp8_cp4[i] % 13056] = CONTINUAL_CARRIER; } } for (int i = 0; i < 39; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if ((((pp8_cp5[i] % 13056) / dx)) % 2 && (((pp8_cp5[i] % 13056) % dx) == 0)) { - data_carrier_map[pp8_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_cp5[i] % 13056] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp8_cp5[i] % 13056] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_cp5[i] % 13056] = CONTINUAL_CARRIER; + carrier_map[pp8_cp5[i] % 13056] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 3; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp8_16k[i] / dx)) % 2 && ((pp8_16k[i] % dx) == 0)) { - data_carrier_map[pp8_16k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_16k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_16k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_16k[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_16k[i]] = CONTINUAL_CARRIER; } } } @@ -2239,304 +2246,304 @@ namespace gr { switch (pilot_pattern) { case PILOT_PP1: for (int i = 0; i < 20; i++) { - data_carrier_map[pp1_cp1[i]] = CONTINUAL_CARRIER; + carrier_map[pp1_cp1[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 25; i++) { - data_carrier_map[pp1_cp2[i]] = CONTINUAL_CARRIER; + carrier_map[pp1_cp2[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 44; i++) { - data_carrier_map[pp1_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp1_cp5[i]] = CONTINUAL_CARRIER; } break; case PILOT_PP2: for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp2_cp1[i] / dx)) % 2 && ((pp2_cp1[i] % dx) == 0)) { - data_carrier_map[pp2_cp1[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp2_cp1[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp2_cp1[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp1[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp2_cp1[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp1[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 22; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp2_cp2[i] / dx)) % 2 && ((pp2_cp2[i] % dx) == 0)) { - data_carrier_map[pp2_cp2[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp2_cp2[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp2_cp2[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp2[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp2_cp2[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp2[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp2_cp3[i] / dx)) % 2 && ((pp2_cp3[i] % dx) == 0)) { - data_carrier_map[pp2_cp3[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp2_cp3[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp2_cp3[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp3[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp2_cp3[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp3[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp2_cp4[i] / dx)) % 2 && ((pp2_cp4[i] % dx) == 0)) { - data_carrier_map[pp2_cp4[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp2_cp4[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp2_cp4[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp4[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp2_cp4[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp4[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 41; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp2_cp5[i] / dx)) % 2 && ((pp2_cp5[i] % dx) == 0)) { - data_carrier_map[pp2_cp5[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp2_cp5[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp2_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp5[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp2_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp5[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 88; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp2_cp6[i] / dx)) % 2 && ((pp2_cp6[i] % dx) == 0)) { - data_carrier_map[pp2_cp6[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp2_cp6[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp2_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp6[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp2_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_cp6[i]] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp2_32k[i] / dx)) % 2 && ((pp2_32k[i] % dx) == 0)) { - data_carrier_map[pp2_32k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp2_32k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp2_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_32k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp2_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp2_32k[i]] = CONTINUAL_CARRIER; } } } break; case PILOT_PP3: for (int i = 0; i < 22; i++) { - data_carrier_map[pp3_cp1[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_cp1[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 20; i++) { - data_carrier_map[pp3_cp2[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_cp2[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 1; i++) { - data_carrier_map[pp3_cp3[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_cp3[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 44; i++) { - data_carrier_map[pp3_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_cp5[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 49; i++) { - data_carrier_map[pp3_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp3_cp6[i]] = CONTINUAL_CARRIER; } break; case PILOT_PP4: for (int i = 0; i < 20; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_cp1[i] / dx)) % 2 && ((pp4_cp1[i] % dx) == 0)) { - data_carrier_map[pp4_cp1[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp1[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp1[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp1[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp1[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 23; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_cp2[i] / dx)) % 2 && ((pp4_cp2[i] % dx) == 0)) { - data_carrier_map[pp4_cp2[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp2[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp2[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp2[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp2[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 1; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_cp3[i] / dx)) % 2 && ((pp4_cp3[i] % dx) == 0)) { - data_carrier_map[pp4_cp3[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp3[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp3[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp3[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp3[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp3[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_cp4[i] / dx)) % 2 && ((pp4_cp4[i] % dx) == 0)) { - data_carrier_map[pp4_cp4[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp4[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp4[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp4[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp4[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp4[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 44; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_cp5[i] / dx)) % 2 && ((pp4_cp5[i] % dx) == 0)) { - data_carrier_map[pp4_cp5[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp5[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp5[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp5[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 86; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_cp6[i] / dx)) % 2 && ((pp4_cp6[i] % dx) == 0)) { - data_carrier_map[pp4_cp6[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_cp6[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp6[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_cp6[i]] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp4_32k[i] / dx)) % 2 && ((pp4_32k[i] % dx) == 0)) { - data_carrier_map[pp4_32k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp4_32k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp4_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_32k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp4_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp4_32k[i]] = CONTINUAL_CARRIER; } } } break; case PILOT_PP5: for (int i = 0; i < 19; i++) { - data_carrier_map[pp5_cp1[i]] = CONTINUAL_CARRIER; + carrier_map[pp5_cp1[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 23; i++) { - data_carrier_map[pp5_cp2[i]] = CONTINUAL_CARRIER; + carrier_map[pp5_cp2[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 3; i++) { - data_carrier_map[pp5_cp3[i]] = CONTINUAL_CARRIER; + carrier_map[pp5_cp3[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 1; i++) { - data_carrier_map[pp5_cp4[i]] = CONTINUAL_CARRIER; + carrier_map[pp5_cp4[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 44; i++) { - data_carrier_map[pp5_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp5_cp5[i]] = CONTINUAL_CARRIER; } break; case PILOT_PP6: for (int i = 0; i < 88; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp6_cp5[i] / dx)) % 2 && ((pp6_cp5[i] % dx) == 0)) { - data_carrier_map[pp6_cp5[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp6_cp5[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp6_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp6_cp5[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp6_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp6_cp5[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 88; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp6_cp6[i] / dx)) % 2 && ((pp6_cp6[i] % dx) == 0)) { - data_carrier_map[pp6_cp6[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp6_cp6[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp6_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp6_cp6[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp6_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp6_cp6[i]] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 4; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp6_32k[i] / dx)) % 2 && ((pp6_32k[i] % dx) == 0)) { - data_carrier_map[pp6_32k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp6_32k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp6_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp6_32k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp6_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp6_32k[i]] = CONTINUAL_CARRIER; } } } break; case PILOT_PP7: for (int i = 0; i < 15; i++) { - data_carrier_map[pp7_cp1[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_cp1[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 30; i++) { - data_carrier_map[pp7_cp2[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_cp2[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 5; i++) { - data_carrier_map[pp7_cp3[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_cp3[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 3; i++) { - data_carrier_map[pp7_cp4[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_cp4[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 35; i++) { - data_carrier_map[pp7_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_cp5[i]] = CONTINUAL_CARRIER; } for (int i = 0; i < 92; i++) { - data_carrier_map[pp7_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_cp6[i]] = CONTINUAL_CARRIER; } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 2; i++) { - data_carrier_map[pp7_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp7_32k[i]] = CONTINUAL_CARRIER; } } break; @@ -2544,54 +2551,54 @@ namespace gr { for (int i = 0; i < 47; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp8_cp4[i] / dx)) % 2 && ((pp8_cp4[i] % dx) == 0)) { - data_carrier_map[pp8_cp4[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_cp4[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_cp4[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_cp4[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_cp4[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_cp4[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 39; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp8_cp5[i] / dx)) % 2 && ((pp8_cp5[i] % dx) == 0)) { - data_carrier_map[pp8_cp5[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_cp5[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_cp5[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_cp5[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_cp5[i]] = CONTINUAL_CARRIER; } } for (int i = 0; i < 89; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp8_cp6[i] / dx)) % 2 && ((pp8_cp6[i] % dx) == 0)) { - data_carrier_map[pp8_cp6[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_cp6[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_cp6[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_cp6[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_cp6[i]] = CONTINUAL_CARRIER; } } if (carrier_mode == CARRIERS_EXTENDED) { for (int i = 0; i < 6; i++) { if (miso == TRUE && miso_group == MISO_TX2) { if (((pp8_32k[i] / dx)) % 2 && ((pp8_32k[i] % dx) == 0)) { - data_carrier_map[pp8_32k[i]] = CONTINUAL_CARRIER_INVERTED; + carrier_map[pp8_32k[i]] = CONTINUAL_CARRIER_INVERTED; } else { - data_carrier_map[pp8_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_32k[i]] = CONTINUAL_CARRIER; } } else { - data_carrier_map[pp8_32k[i]] = CONTINUAL_CARRIER; + carrier_map[pp8_32k[i]] = CONTINUAL_CARRIER; } } } @@ -2607,30 +2614,30 @@ namespace gr { if (remainder == (dx * (symbol % dy))) { if (miso == TRUE && miso_group == MISO_TX2) { if ((i / dx) % 2) { - data_carrier_map[i] = SCATTERED_CARRIER_INVERTED; + carrier_map[i] = SCATTERED_CARRIER_INVERTED; } else { - data_carrier_map[i] = SCATTERED_CARRIER; + carrier_map[i] = SCATTERED_CARRIER; } } else { - data_carrier_map[i] = SCATTERED_CARRIER; + carrier_map[i] = SCATTERED_CARRIER; } } } if (miso == TRUE && miso_group == MISO_TX2) { if (symbol % 2) { - data_carrier_map[0] = SCATTERED_CARRIER_INVERTED; - data_carrier_map[C_PS - 1] = SCATTERED_CARRIER_INVERTED; + carrier_map[0] = SCATTERED_CARRIER_INVERTED; + carrier_map[C_PS - 1] = SCATTERED_CARRIER_INVERTED; } else { - data_carrier_map[0] = SCATTERED_CARRIER; - data_carrier_map[C_PS - 1] = SCATTERED_CARRIER; + carrier_map[0] = SCATTERED_CARRIER; + carrier_map[C_PS - 1] = SCATTERED_CARRIER; } } else { - data_carrier_map[0] = SCATTERED_CARRIER; - data_carrier_map[C_PS - 1] = SCATTERED_CARRIER; + carrier_map[0] = SCATTERED_CARRIER; + carrier_map[C_PS - 1] = SCATTERED_CARRIER; } if (papr_mode == PAPR_TR || papr_mode == PAPR_BOTH) { if (carrier_mode == CARRIERS_NORMAL) { @@ -2642,41 +2649,44 @@ namespace gr { switch (fft_size) { case FFTSIZE_1K: for (int i = 0; i < 10; i++) { - data_carrier_map[tr_papr_map_1k[i] + shift] = TRPAPR_CARRIER; + carrier_map[tr_papr_map_1k[i] + shift] = TRPAPR_CARRIER; } break; case FFTSIZE_2K: for (int i = 0; i < 18; i++) { - data_carrier_map[tr_papr_map_2k[i] + shift] = TRPAPR_CARRIER; + carrier_map[tr_papr_map_2k[i] + shift] = TRPAPR_CARRIER; } break; case FFTSIZE_4K: for (int i = 0; i < 36; i++) { - data_carrier_map[tr_papr_map_4k[i] + shift] = TRPAPR_CARRIER; + carrier_map[tr_papr_map_4k[i] + shift] = TRPAPR_CARRIER; } break; case FFTSIZE_8K: case FFTSIZE_8K_T2GI: for (int i = 0; i < 72; i++) { - data_carrier_map[tr_papr_map_8k[i] + shift] = TRPAPR_CARRIER; + carrier_map[tr_papr_map_8k[i] + shift] = TRPAPR_CARRIER; } break; case FFTSIZE_16K: case FFTSIZE_16K_T2GI: for (int i = 0; i < 144; i++) { - data_carrier_map[tr_papr_map_16k[i] + shift] = TRPAPR_CARRIER; + carrier_map[tr_papr_map_16k[i] + shift] = TRPAPR_CARRIER; } break; case FFTSIZE_32K: case FFTSIZE_32K_T2GI: for (int i = 0; i < 288; i++) { - data_carrier_map[tr_papr_map_32k[i] + shift] = TRPAPR_CARRIER; + carrier_map[tr_papr_map_32k[i] + shift] = TRPAPR_CARRIER; } break; } } + } } + const gr_complex zero = gr_complex(0.0, 0.0); + int dvbt2_pilotgenerator_cc_impl::general_work (int noutput_items, gr_vector_int &ninput_items, @@ -2685,17 +2695,14 @@ namespace gr { { const gr_complex *in = (const gr_complex *) input_items[0]; gr_complex *out = (gr_complex *) output_items[0]; - gr_complex zero; gr_complex *dst; int L_FC = 0; - zero = gr_complex(0.0, 0.0); if (N_FC != 0) { L_FC = 1; } for (int i = 0; i < noutput_items; i += num_symbols) { for (int j = 0; j < num_symbols; j++) { - init_pilots(j); if (j < N_P2) { for (int n = 0; n < left_nulls; n++) { *out++ = zero; @@ -2745,19 +2752,19 @@ namespace gr { *out++ = zero; } for (int n = 0; n < C_PS; n++) { - if (data_carrier_map[n] == SCATTERED_CARRIER) { + if (data_carrier_map[j][n] == SCATTERED_CARRIER) { *out++ = sp_bpsk[prbs[n + K_OFFSET] ^ pn_sequence[j]]; } - else if (data_carrier_map[n] == SCATTERED_CARRIER_INVERTED) { + else if (data_carrier_map[j][n] == SCATTERED_CARRIER_INVERTED) { *out++ = sp_bpsk_inverted[prbs[n + K_OFFSET] ^ pn_sequence[j]]; } - else if (data_carrier_map[n] == CONTINUAL_CARRIER) { + else if (data_carrier_map[j][n] == CONTINUAL_CARRIER) { *out++ = cp_bpsk[prbs[n + K_OFFSET] ^ pn_sequence[j]]; } - else if (data_carrier_map[n] == CONTINUAL_CARRIER_INVERTED) { + else if (data_carrier_map[j][n] == CONTINUAL_CARRIER_INVERTED) { *out++ = cp_bpsk_inverted[prbs[n + K_OFFSET] ^ pn_sequence[j]]; } - else if (data_carrier_map[n] == TRPAPR_CARRIER) { + else if (data_carrier_map[j][n] == TRPAPR_CARRIER) { *out++ = zero; } else { diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h index 6543e26512..9f06721d04 100644 --- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h +++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h @@ -22,8 +22,9 @@ #define INCLUDED_DTV_DVBT2_PILOTGENERATOR_CC_IMPL_H #include <gnuradio/dtv/dvbt2_pilotgenerator_cc.h> -#include <gnuradio/fft/fft.h> #include "dvb/dvb_defines.h" +#include <gnuradio/fft/fft.h> +#include <vector> #define CHIPS 2624 #define MAX_CARRIERS 27841 @@ -66,7 +67,7 @@ namespace gr { int prbs[MAX_CARRIERS]; int pn_sequence[CHIPS]; int p2_carrier_map[MAX_CARRIERS]; - int data_carrier_map[MAX_CARRIERS]; + std::vector< std::vector<int> > data_carrier_map; int fc_carrier_map[MAX_CARRIERS]; int N_P2; int C_P2; @@ -81,7 +82,7 @@ namespace gr { int miso; int miso_group; void init_prbs(void); - void init_pilots(int); + void init_pilots(void); fft::fft_complex *ofdm_fft; int ofdm_fft_size; |