aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/output/SDR.cpp6
-rw-r--r--src/output/UHD.cpp27
-rw-r--r--src/output/UHD.h2
3 files changed, 22 insertions, 13 deletions
diff --git a/src/output/SDR.cpp b/src/output/SDR.cpp
index ac25061..ba296de 100644
--- a/src/output/SDR.cpp
+++ b/src/output/SDR.cpp
@@ -382,10 +382,10 @@ void SDR::set_parameter(const string& parameter, const string& value)
throw ParameterError("Parameter " + parameter + " is read-only.");
}
else {
- stringstream ss;
- ss << "Parameter '" << parameter
+ stringstream ss_err;
+ ss_err << "Parameter '" << parameter
<< "' is not exported by controllable " << get_rc_name();
- throw ParameterError(ss.str());
+ throw ParameterError(ss_err.str());
}
}
diff --git a/src/output/UHD.cpp b/src/output/UHD.cpp
index 55beacc..cee35c7 100644
--- a/src/output/UHD.cpp
+++ b/src/output/UHD.cpp
@@ -260,13 +260,24 @@ void UHD::transmit_frame(const struct FrameData& frame)
const size_t sizeIn = frame.buf.size() / sizeof(complexf);
const complexf* in_data = reinterpret_cast<const complexf*>(&frame.buf[0]);
+ uhd::tx_metadata_t md_tx;
+
+ // TODO check for enableSync?
+ if (frame.ts.timestamp_valid) {
+ uhd::time_spec_t timespec(frame.ts.timestamp_sec, frame.ts.pps_offset());
+ md_tx.time_spec = timespec;
+ md_tx.has_time_spec = true;
+ }
+ else {
+ md_tx.has_time_spec = false;
+ }
+
+
size_t usrp_max_num_samps = m_tx_stream->get_max_num_samps();
size_t num_acc_samps = 0; //number of accumulated samples
while (m_running.load() and (not m_conf.muting) and (num_acc_samps < sizeIn)) {
size_t samps_to_send = std::min(sizeIn - num_acc_samps, usrp_max_num_samps);
- uhd::tx_metadata_t md_tx = md;
-
// ensure the the last packet has EOB set if the timestamps has been
// refreshed and need to be reconsidered.
md_tx.end_of_burst = (
@@ -282,7 +293,7 @@ void UHD::transmit_frame(const struct FrameData& frame)
num_acc_samps += num_tx_samps;
- md_tx.time_spec = md.time_spec +
+ md_tx.time_spec = md_tx.time_spec +
uhd::time_spec_t(0, num_tx_samps/m_conf.sampleRate);
if (num_tx_samps == 0) {
@@ -334,14 +345,14 @@ size_t UHD::receive_frame(
m_rx_stream->issue_stream_cmd(cmd);
- uhd::rx_metadata_t md;
+ uhd::rx_metadata_t md_rx;
constexpr double timeout = 60;
- size_t samples_read = m_rx_stream->recv(buf, num_samples, md, timeout);
+ size_t samples_read = m_rx_stream->recv(buf, num_samples, md_rx, timeout);
// Update the ts with the effective receive TS
- ts.timestamp_sec = md.time_spec.get_full_secs();
- ts.timestamp_pps = md.time_spec.get_frac_secs() * 16384000.0;
+ ts.timestamp_sec = md_rx.time_spec.get_full_secs();
+ ts.timestamp_pps = md_rx.time_spec.get_frac_secs() * 16384000.0;
return samples_read;
}
@@ -442,7 +453,7 @@ void UHD::print_async_thread()
etiLog.level(alert) <<
"Received Async UHD Message '" <<
uhd_async_message << "' at time " <<
- md.time_spec.get_real_secs();
+ async_md.time_spec.get_real_secs();
}
}
diff --git a/src/output/UHD.h b/src/output/UHD.h
index 4d3eecc..448fb3f 100644
--- a/src/output/UHD.h
+++ b/src/output/UHD.h
@@ -107,8 +107,6 @@ class UHD : public Output::SDRDevice
size_t num_underflows_previous = 0;
size_t num_late_packets_previous = 0;
- uhd::tx_metadata_t md;
-
// Used to print statistics once a second
std::chrono::steady_clock::time_point last_print_time;