fixeria
/
srsRAN
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SRSENB: Add GUI window for every cell/carrier

This commit is contained in:
Xavier Arteaga 2020-06-19 15:47:17 +02:00 committed by Xavier Arteaga
parent 0b02f8948c
commit 443378adcb
2 changed files with 75 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
srsenb/hdr/phy/sf_worker.h
View File

@ -47,10 +47,12 @@ public:
uint32_t get_nof_rnti(); uint32_t get_nof_rnti();
/* These are used by the GUI plotting tools */ /* These are used by the GUI plotting tools */
int read_ce_abs(float* ce_abs); uint32_t get_nof_carriers();
int read_ce_arg(float* ce_abs); int get_carrier_pci(uint32_t cc_idx);
int read_pusch_d(cf_t* pusch_d); int read_ce_abs(uint32_t cc_idx, float* ce_abs);
int read_pucch_d(cf_t* pusch_d); int read_ce_arg(uint32_t cc_idx, float* ce_abs);
int read_pusch_d(uint32_t cc_idx, cf_t* pusch_d);
int read_pucch_d(uint32_t cc_idx, cf_t* pusch_d);
void start_plot(); void start_plot();
uint32_t get_metrics(phy_metrics_t metrics[ENB_METRICS_MAX_USERS]); uint32_t get_metrics(phy_metrics_t metrics[ENB_METRICS_MAX_USERS]);

113
srsenb/src/phy/sf_worker.cc
View File

@ -317,24 +317,32 @@ void sf_worker::start_plot()
#endif #endif
} }
int sf_worker::read_ce_abs(float* ce_abs) uint32_t sf_worker::get_nof_carriers()
{ {
return cc_workers[0]->read_ce_abs(ce_abs); return phy->get_nof_carriers();
}
int sf_worker::get_carrier_pci(uint32_t cc_idx)
{
return phy->get_cell(cc_idx).id;
}
int sf_worker::read_ce_abs(uint32_t cc_idx, float* ce_abs)
{
return cc_workers[cc_idx]->read_ce_abs(ce_abs);
} }
int sf_worker::read_ce_arg(float* ce_arg) int sf_worker::read_ce_arg(uint32_t cc_idx, float* ce_arg)
{ {
return cc_workers[0]->read_ce_arg(ce_arg); return cc_workers[cc_idx]->read_ce_arg(ce_arg);
} }
int sf_worker::read_pusch_d(cf_t* pdsch_d) int sf_worker::read_pusch_d(uint32_t cc_idx, cf_t* pdsch_d)
{ {
return cc_workers[0]->read_pusch_d(pdsch_d); return cc_workers[cc_idx]->read_pusch_d(pdsch_d);
} }
int sf_worker::read_pucch_d(cf_t* pdsch_d) int sf_worker::read_pucch_d(uint32_t cc_idx, cf_t* pdsch_d)
{ {
return cc_workers[0]->read_pucch_d(pdsch_d); return cc_workers[cc_idx]->read_pucch_d(pdsch_d);
} }
sf_worker::~sf_worker() sf_worker::~sf_worker()
@ -351,59 +359,76 @@ sf_worker::~sf_worker()
***********************************************************/ ***********************************************************/
#ifdef ENABLE_GUI #ifdef ENABLE_GUI
plot_real_t pce, pce_arg; struct plot_cc_s {
plot_scatter_t pconst; plot_real_t pce, pce_arg;
plot_scatter_t pconst2; plot_scatter_t pconst;
plot_scatter_t pconst2;
};
static std::map<uint32_t, plot_cc_s> plots;
#define SCATTER_PUSCH_BUFFER_LEN (20 * 6 * SRSLTE_SF_LEN_RE(SRSLTE_MAX_PRB, SRSLTE_CP_NORM)) #define SCATTER_PUSCH_BUFFER_LEN (20 * 6 * SRSLTE_SF_LEN_RE(SRSLTE_MAX_PRB, SRSLTE_CP_NORM))
float tmp_plot[SCATTER_PUSCH_BUFFER_LEN]; static float tmp_plot[SCATTER_PUSCH_BUFFER_LEN];
float tmp_plot_arg[SCATTER_PUSCH_BUFFER_LEN]; static float tmp_plot_arg[SCATTER_PUSCH_BUFFER_LEN];
cf_t tmp_plot2[SRSLTE_SF_LEN_RE(SRSLTE_MAX_PRB, SRSLTE_CP_NORM)]; static cf_t tmp_plot2[SRSLTE_SF_LEN_RE(SRSLTE_MAX_PRB, SRSLTE_CP_NORM)];
cf_t tmp_pucch_plot[SRSLTE_PUCCH_MAX_BITS / 2]; static cf_t tmp_pucch_plot[SRSLTE_PUCCH_MAX_BITS / 2];
void* plot_thread_run(void* arg) void* plot_thread_run(void* arg)
{ {
auto worker = (srsenb::sf_worker*)arg; auto worker = (srsenb::sf_worker*)arg;
sdrgui_init_title("srsENB"); for (uint32_t cc_idx = 0; cc_idx < worker->get_nof_carriers(); cc_idx++) {
plot_real_init(&pce); plot_cc_s& p = plots[cc_idx];
plot_real_setTitle(&pce, (char*)"Channel Response - Magnitude");
plot_real_setLabels(&pce, (char*)"Index", (char*)"dB");
plot_real_setYAxisScale(&pce, -40, 40);
plot_real_init(&pce_arg); char title[32] = {};
plot_real_setTitle(&pce_arg, (char*)"Channel Response - Argument"); snprintf(title, sizeof(title), "srsENB PCI %d", worker->get_carrier_pci(cc_idx));
plot_real_setLabels(&pce_arg, (char*)"Angle", (char*)"deg");
plot_real_setYAxisScale(&pce_arg, -180, 180);
plot_scatter_init(&pconst); printf("Creating plot window '%s'...\n", title);
plot_scatter_setTitle(&pconst, (char*)"PUSCH - Equalized Symbols");
plot_scatter_setXAxisScale(&pconst, -4, 4);
plot_scatter_setYAxisScale(&pconst, -4, 4);
plot_scatter_init(&pconst2); sdrgui_init_title(title);
plot_scatter_setTitle(&pconst2, (char*)"PUCCH - Equalized Symbols");
plot_scatter_setXAxisScale(&pconst2, -4, 4);
plot_scatter_setYAxisScale(&pconst2, -4, 4);
plot_real_addToWindowGrid(&pce, (char*)"srsenb", 0, 0); plot_real_init(&p.pce);
plot_real_addToWindowGrid(&pce_arg, (char*)"srsenb", 1, 0); plot_real_setTitle(&p.pce, (char*)"Channel Response - Magnitude");
plot_scatter_addToWindowGrid(&pconst, (char*)"srsenb", 0, 1); plot_real_setLabels(&p.pce, (char*)"Index", (char*)"dB");
plot_scatter_addToWindowGrid(&pconst2, (char*)"srsenb", 1, 1); plot_real_setYAxisScale(&p.pce, -40, 40);
plot_real_addToWindowGrid(&p.pce, title, 0, 0);
plot_real_init(&p.pce_arg);
plot_real_setTitle(&p.pce_arg, (char*)"Channel Response - Argument");
plot_real_setLabels(&p.pce_arg, (char*)"Angle", (char*)"deg");
plot_real_setYAxisScale(&p.pce_arg, -180, 180);
plot_real_addToWindowGrid(&p.pce_arg, title, 1, 0);
plot_scatter_init(&p.pconst);
plot_scatter_setTitle(&p.pconst, (char*)"PUSCH - Equalized Symbols");
plot_scatter_setXAxisScale(&p.pconst, -4, 4);
plot_scatter_setYAxisScale(&p.pconst, -4, 4);
plot_scatter_addToWindowGrid(&p.pconst, title, 0, 1);
plot_scatter_init(&p.pconst2);
plot_scatter_setTitle(&p.pconst2, (char*)"PUCCH - Equalized Symbols");
plot_scatter_setXAxisScale(&p.pconst2, -4, 4);
plot_scatter_setYAxisScale(&p.pconst2, -4, 4);
plot_scatter_addToWindowGrid(&p.pconst2, title, 1, 1);
}
int n, n_arg, n_pucch; int n, n_arg, n_pucch;
while (true) { while (true) {
sem_wait(&plot_sem); sem_wait(&plot_sem);
n = worker->read_pusch_d(tmp_plot2); for (auto& e : plots) {
n_pucch = worker->read_pucch_d(tmp_pucch_plot); uint32_t cc_idx = e.first;
plot_scatter_setNewData(&pconst, tmp_plot2, n); plot_cc_s& p = e.second;
plot_scatter_setNewData(&pconst2, tmp_pucch_plot, n_pucch);
n = worker->read_ce_abs(tmp_plot); n = worker->read_pusch_d(cc_idx, tmp_plot2);
plot_real_setNewData(&pce, tmp_plot, n); n_pucch = worker->read_pucch_d(cc_idx, tmp_pucch_plot);
plot_scatter_setNewData(&p.pconst, tmp_plot2, n);
plot_scatter_setNewData(&p.pconst2, tmp_pucch_plot, n_pucch);
n_arg = worker->read_ce_arg(tmp_plot_arg); n = worker->read_ce_abs(cc_idx, tmp_plot);
plot_real_setNewData(&pce_arg, tmp_plot_arg, n_arg); plot_real_setNewData(&p.pce, tmp_plot, n);
n_arg = worker->read_ce_arg(cc_idx, tmp_plot_arg);
plot_real_setNewData(&p.pce_arg, tmp_plot_arg, n_arg);
}
} }
return nullptr; return nullptr;
} }