a3x/gr-digitalhf
1
0
Fork 0
mirror of https://github.com/hb9fxq/gr-digitalhf synced 2024-12-22 15:10:00 +00:00
Code Issues Releases Wiki Activity

more debugging logs added

Browse source
This commit is contained in:
cmayer 2019-05-20 15:00:33 +02:00
parent 8ff2165443
commit 69363dd4d0
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/adaptive_dfe_impl.cc
View file

@ -143,9 +143,11 @@ adaptive_dfe_impl::general_work(int noutput_items,
const int nin = ninput_items[0]; const int nin = ninput_items[0];
// GR_LOG_DEBUG(d_logger, str(boost::format("work: %d %d") % ninput_items[0] % (2*_nGuard + _nB + _nF + 1)));
assert(ninput_items[0] >= 2*_nGuard + _nB + _nF + 1); assert(ninput_items[0] >= 2*_nGuard + _nB + _nF + 1);
if (ninput_items[0] < 2*_nGuard + _nB + _nF + 1) if (ninput_items[0] < 2*_nGuard + _nB + _nF + 1)
return 0; return 0;
int const ninput = ninput_items[0] - _nGuard - _nF; int const ninput = ninput_items[0] - _nGuard - _nF;
int nout = 0; // counter for produced output items int nout = 0; // counter for produced output items
@ -429,7 +431,7 @@ void adaptive_dfe_impl::update_frame_info(pmt::pmt_t data)
gr::digital::constellation_sptr constell = _constellations[_constellation_index]; gr::digital::constellation_sptr constell = _constellations[_constellation_index];
for (int i=0, n=scr_xor.size(); i<n; ++i) { for (int i=0, n=scr_xor.size(); i<n; ++i) {
for (int j=0, m=constell->bits_per_symbol(); j<m; ++j) { for (int j=0, m=constell->bits_per_symbol(); j<m; ++j) {
_scramble_xor[i][m-j-1] = 1 - 2*bool(scr_xor[i] & (1<<j)); _scramble_xor[i][j] = 1 - 2*bool(scr_xor[i] & (1<<(m-1-j)));
// GR_LOG_DEBUG(d_logger, str(boost::format("XOR %3d %3d %d") % i % j % _scramble_xor[i][j])); // GR_LOG_DEBUG(d_logger, str(boost::format("XOR %3d %3d %d") % i % j % _scramble_xor[i][j]));
} }
} }

10
lib/doppler_correction_cc_impl.cc
View file

@ -60,6 +60,7 @@ doppler_correction_cc_impl::doppler_correction_cc_impl(unsigned int preamble_len
message_port_register_in (_port_name); message_port_register_in (_port_name);
set_msg_handler(_port_name, boost::bind(&doppler_correction_cc_impl::handle_message, this, _1)); set_msg_handler(_port_name, boost::bind(&doppler_correction_cc_impl::handle_message, this, _1));
set_tag_propagation_policy(TPP_DONT); set_tag_propagation_policy(TPP_DONT);
set_min_output_buffer(0, _preamble_length<<1);
} }
doppler_correction_cc_impl::~doppler_correction_cc_impl() doppler_correction_cc_impl::~doppler_correction_cc_impl()
@ -91,8 +92,8 @@ doppler_correction_cc_impl::handle_message(pmt::pmt_t msg)
void void
doppler_correction_cc_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required) doppler_correction_cc_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required)
{ {
ninput_items_required[0] = _preamble_length + 1; ninput_items_required[0] = std::max(int(_preamble_length + 1), noutput_items);
// GR_LOG_DEBUG(d_logger, str(boost::format("forecast: %d %d %d") % noutput_items % ninput_items_required[0] % _preamble_length)); // GR_LOG_DEBUG(d_logger, str(boost::format("forecast: %d %d %d") % noutput_items % ninput_items_required[0] % _preamble_length));
} }
int int
@ -103,9 +104,10 @@ doppler_correction_cc_impl::work(int noutput_items,
gr::thread::scoped_lock lock(d_setlock); gr::thread::scoped_lock lock(d_setlock);
gr_complex const* in = (gr_complex const*)input_items[0]; gr_complex const* in = (gr_complex const*)input_items[0];
gr_complex *out = (gr_complex *) output_items[0]; gr_complex *out = (gr_complex *) output_items[0];
// GR_LOG_DEBUG(d_logger, str(boost::format("work: %d %d") % noutput_items % _preamble_length)); if (noutput_items < _preamble_length) {
if (noutput_items < _preamble_length) GR_LOG_DEBUG(d_logger, str(boost::format("work: %d %d") % noutput_items % _preamble_length));
return 0; return 0;
}
noutput_items -= _preamble_length; noutput_items -= _preamble_length;
int nout = 0; int nout = 0;
switch (_state) { switch (_state) {