From 73857235f0651293eb9396c9ef81058b6935c0db Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Thu, 30 Nov 2017 06:15:58 +0700 Subject: preprocess_tx_burst: fix the output message During the code refactoring (4bd990b), the first part of the output message was accidently dropped. Let's fix this. --- lib/transmitter/preprocess_tx_burst_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transmitter') diff --git a/lib/transmitter/preprocess_tx_burst_impl.cc b/lib/transmitter/preprocess_tx_burst_impl.cc index 5a89390..5fbac98 100644 --- a/lib/transmitter/preprocess_tx_burst_impl.cc +++ b/lib/transmitter/preprocess_tx_burst_impl.cc @@ -86,7 +86,7 @@ namespace gr { // Prepare an output message pmt::pmt_t blob_out = pmt::make_blob(burst_bits, burst_len); - pmt::pmt_t msg_out = pmt::cons(pmt::PMT_NIL, blob_out); + pmt::pmt_t msg_out = pmt::cons(pmt::car(msg_in), blob_out); /* Send a message to the output */ message_port_pub(pmt::mp("bursts_out"), msg_out); -- cgit v1.2.3 From 012323230549af786f04fd94fc85ab7fbfa7a53d Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sat, 9 Dec 2017 20:16:44 +0700 Subject: txtime_setter_impl: fix wrong time_hint reference --- lib/transmitter/txtime_setter_impl.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/transmitter') diff --git a/lib/transmitter/txtime_setter_impl.cc b/lib/transmitter/txtime_setter_impl.cc index f6141f0..03cc82e 100644 --- a/lib/transmitter/txtime_setter_impl.cc +++ b/lib/transmitter/txtime_setter_impl.cc @@ -87,15 +87,14 @@ namespace gr { void txtime_setter_impl::process_fn_time_reference(pmt::pmt_t msg) { - pmt::pmt_t not_found = pmt::intern("not_found"); pmt::pmt_t fn_time, time_hint; fn_time = pmt::dict_ref(msg, - pmt::intern("fn_time"), not_found); + pmt::intern("fn_time"), pmt::PMT_NIL); time_hint = pmt::dict_ref(msg, - pmt::intern("fn_time"), not_found); + pmt::intern("time_hint"), pmt::PMT_NIL); - if (fn_time != not_found) { + if (fn_time != pmt::PMT_NIL) { uint32_t fn_ref = static_cast (pmt::to_uint64(pmt::car(pmt::car(fn_time)))); uint32_t ts = static_cast @@ -106,7 +105,7 @@ namespace gr { pmt::cdr(pmt::cdr(fn_time))); set_fn_time_reference(fn_ref, ts, time_secs, time_fracs); - } else if (time_hint != not_found) { + } else if (time_hint != pmt::PMT_NIL) { set_time_hint(pmt::to_uint64(pmt::car(fn_time)), pmt::to_double(pmt::cdr(fn_time))); } -- cgit v1.2.3