From 006af69782d9a87b7573c68d4a7fa8fb4ebb2129 Mon Sep 17 00:00:00 2001 From: "Wolfgang A. Mozart" Date: Tue, 16 Oct 2018 12:26:39 +0200 Subject: [PATCH] write out for txdataF_BF and txdata and minor fix for uhd load --- targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp | 2 +- targets/RT/USER/nr-ru.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp index 2ae124f29d..abeaf4e4c8 100644 --- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp +++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp @@ -1039,7 +1039,7 @@ extern "C" { if(device_adds.size() == 0) { double usrp_master_clock = 184.32e6; - std::string args = "type=x300, addr=192.168.30.2"; + std::string args = "type=x300"; // workaround for an api problem, master clock has to be set with the constructor not via set_master_clock_rate args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock); diff --git a/targets/RT/USER/nr-ru.c b/targets/RT/USER/nr-ru.c index 2a0bcfb2be..d2deba23c9 100644 --- a/targets/RT/USER/nr-ru.c +++ b/targets/RT/USER/nr-ru.c @@ -854,12 +854,16 @@ void tx_rf(RU_t *ru) { // prepare tx buffer pointers if(emulate_rf) { - if(proc->frame_tx < 2) + for (i=0; inb_tx; i++) { - LOG_M("txdataF_frame.m","txdataF_frame",&ru->common.txdataF_BF[i],fp->samples_per_subframe_wCP, 1, 1); - LOG_M("txdata_frame.m","txdata_frame",&ru->common.txdata[i],fp->samples_per_subframe, 1, 1); + if(proc->frame_tx > 0 && proc->frame_tx < 2) + { + LOG_M("txdataF_frame.m","txdataF_frame",&ru->common.txdataF_BF[i][0],fp->samples_per_subframe_wCP, 1, 1); + LOG_M("txdata_frame.m","txdata_frame",&ru->common.txdata[i][(proc->subframe_tx*fp->samples_per_subframe)-sf_extension],fp->samples_per_subframe, 1, 1); + } + else if (proc->frame_tx >= 2) oai_exit = 1; } - else oai_exit = 1; + txs = siglen+sf_extension; } else {