diff --git a/srsue/test/ttcn3/hdr/lte_ttcn3_phy.h b/srsue/test/ttcn3/hdr/lte_ttcn3_phy.h index 3ea945462..1e73e98b6 100644 --- a/srsue/test/ttcn3/hdr/lte_ttcn3_phy.h +++ b/srsue/test/ttcn3/hdr/lte_ttcn3_phy.h @@ -36,6 +36,7 @@ namespace srsue { class lte_ttcn3_phy : public ue_lte_phy_base { public: + void set_cells_to_meas(uint32_t earfcn, const std::set& pci) override; typedef struct { srslte_cell_t info; float power; diff --git a/srsue/test/ttcn3/src/lte_ttcn3_phy.cc b/srsue/test/ttcn3/src/lte_ttcn3_phy.cc index e7c2b328b..00324c8c3 100644 --- a/srsue/test/ttcn3/src/lte_ttcn3_phy.cc +++ b/srsue/test/ttcn3/src/lte_ttcn3_phy.cc @@ -159,7 +159,7 @@ phy_interface_rrc_lte::cell_search_ret_t lte_ttcn3_phy::cell_search(phy_cell_t* if (pcell.power >= MIN_IN_SYNC_POWER) { if (found_cell) { found_cell->earfcn = pcell.earfcn; - found_cell->cell = pcell.info; + found_cell->pci = pcell.info.id; } ret.found = cell_search_ret_t::CELL_FOUND; ret.last_freq = cell_search_ret_t::NO_MORE_FREQS; @@ -174,7 +174,7 @@ bool lte_ttcn3_phy::cell_select(phy_cell_t* rrc_cell) { // try to find RRC cell in current cell map for (auto& cell : cells) { - if (cell.info.id == rrc_cell->cell.id) { + if (cell.info.id == rrc_cell->pci) { pcell = cell; return true; } @@ -362,9 +362,16 @@ void lte_ttcn3_phy::radio_failure() void lte_ttcn3_phy::run_tti() { // send report for each cell + std::vector phy_meas; for (auto& cell : cells) { - stack->new_phy_meas(cell.power, DEFAULT_RSRQ, current_tti, cell.earfcn, cell.info.id); + rrc_interface_phy_lte::phy_meas_t m = {}; + m.pci = cell.info.id; + m.earfcn = cell.earfcn; + m.rsrp = cell.power; + m.rsrq = DEFAULT_RSRQ; + phy_meas.push_back(m); } + stack->new_cell_meas(phy_meas); // check if Pcell is in sync for (auto& cell : cells) { @@ -392,4 +399,6 @@ void lte_ttcn3_phy::run_tti() stack->run_tti(current_tti); } +void lte_ttcn3_phy::set_cells_to_meas(uint32_t earfcn, const std::set& pci) {} + } // namespace srsue