PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RRC and TTCN3 test

This commit is contained in:
Xavier Arteaga 2020-03-27 07:41:27 +01:00 committed by Xavier Arteaga
parent 051e8fcc52
commit cbaba9c0bd
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srsue/test/ttcn3/hdr/lte_ttcn3_phy.h
View File

@ -87,7 +87,7 @@ public:
// Cell search and selection procedures
cell_search_ret_t cell_search(phy_cell_t* found_cell);
bool cell_select(const phy_cell_t* cell) override;
bool cell_select(const phy_cell_t* cell, float cfo) override;
bool cell_is_camping();
void reset();

2
srsue/test/ttcn3/src/lte_ttcn3_phy.cc
View File

@ -151,7 +151,7 @@ phy_interface_rrc_lte::cell_search_ret_t lte_ttcn3_phy::cell_search(phy_cell_t*
return ret;
};
bool lte_ttcn3_phy::cell_select(const phy_cell_t* rrc_cell)
bool lte_ttcn3_phy::cell_select(const phy_cell_t* rrc_cell, float cfo)
{
// try to find RRC cell in current cell map
for (auto& cell : cells) {

22
srsue/test/upper/rrc_meas_test.cc
View File

@ -55,7 +55,7 @@ public:
void set_config_mbsfn_mcch(const srslte::mcch_msg_t& mcch) override {}
cell_search_ret_t cell_search(phy_cell_t* cell) override { return {}; }
bool cell_is_camping() override { return false; }
bool cell_select(const phy_cell_t* cell = nullptr) override { return false; }
bool cell_select(const phy_cell_t* cell = nullptr, float cfo = 0.0f) override { return false; }
void reset() override {}
void enable_pregen_signals(bool enable) override {}
@ -492,18 +492,18 @@ int meas_obj_test()
log1->info("Test7: PHY finds new neighbours in frequency 1 and 2, check RRC instructs to search them\n");
std::vector<rrc_interface_phy_lte::phy_meas_t> phy_meas = {};
phy_meas.push_back({0, 0, 1, 31});
phy_meas.push_back({-1, 0, 1, 32});
phy_meas.push_back({-2, 0, 1, 33});
phy_meas.push_back({-3, 0, 1, 34});
phy_meas.push_back({0, 0, 0.0f, 1, 31});
phy_meas.push_back({-1, 0, 0.0f, 1, 32});
phy_meas.push_back({-2, 0, 0.0f, 1, 33});
phy_meas.push_back({-3, 0, 0.0f, 1, 34});
rrctest.new_cell_meas(phy_meas);
rrctest.run_tti(1);
phy_meas = {};
phy_meas.push_back({-4, 0, 1, 35});
phy_meas.push_back({-5, 0, 1, 36});
phy_meas.push_back({-6, 0, 1, 37});
phy_meas.push_back({1, 0, 1, 30});
phy_meas.push_back({0, 0, 2, 31});
phy_meas.push_back({-4, 0, 0.0f, 1, 35});
phy_meas.push_back({-5, 0, 0.0f, 1, 36});
phy_meas.push_back({-6, 0, 0.0f, 1, 37});
phy_meas.push_back({1, 0, 0.0f, 1, 30});
phy_meas.push_back({0, 0, 0.0f, 2, 31});
rrctest.new_cell_meas(phy_meas);
rrctest.run_tti(1);
@ -624,7 +624,7 @@ void send_report(rrc_test& rrctest,
if (earfcn.size() == pci.size()) {
e = earfcn[i];
}
phy_meas.push_back({r, -5, e, pci[i]});
phy_meas.push_back({r, -5, 0.0f, e, pci[i]});
}
rrctest.new_cell_meas(phy_meas);
rrctest.run_tti(1);