summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2017-04-23 06:09:07 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2017-04-23 06:09:07 -0700
commit082711cc3f7d910e50609695224e7a3c994a4c73 (patch)
tree352e8e65a8592c5e79e6ec57e444b82a301e28b8
parentd0afc2f7e08f3024b4a5a67573201a6707df5805 (diff)
parent13d08d1e5e68707b187e871d588aad3b7b39d2e1 (diff)
Merge remote-tracking branch 'gnuradio-github/pr/1292'
Diffstat
-rw-r--r--gr-digital/lib/correlate_access_code_bb_impl.cc10
-rw-r--r--gr-digital/lib/correlate_access_code_bb_ts_impl.cc11
-rw-r--r--gr-digital/lib/correlate_access_code_ff_ts_impl.cc11
-rw-r--r--gr-digital/lib/correlate_access_code_tag_bb_impl.cc13
-rw-r--r--gr-digital/lib/correlate_access_code_tag_ff_impl.cc13
5 files changed, 24 insertions, 34 deletions
diff --git a/gr-digital/lib/correlate_access_code_bb_impl.cc b/gr-digital/lib/correlate_access_code_bb_impl.cc
index 532871a407..a01eb6a2b5 100644
--- a/gr-digital/lib/correlate_access_code_bb_impl.cc
+++ b/gr-digital/lib/correlate_access_code_bb_impl.cc
@@ -27,14 +27,13 @@
#include "correlate_access_code_bb_impl.h"
#include <gnuradio/io_signature.h>
#include <gnuradio/blocks/count_bits.h>
+#include <boost/format.hpp>
#include <stdexcept>
#include <cstdio>
namespace gr {
namespace digital {
-#define VERBOSE 0
-
correlate_access_code_bb::sptr
correlate_access_code_bb::make(const std::string &access_code, int threshold)
{
@@ -51,6 +50,7 @@ namespace gr {
d_threshold(threshold)
{
if(!set_access_code(access_code)) {
+ GR_LOG_ERROR(d_logger, "access_code is > 64 bits");
throw std::out_of_range ("access_code is > 64 bits");
}
}
@@ -109,14 +109,12 @@ namespace gr {
// test for access code with up to threshold errors
new_flag = (nwrong <= d_threshold);
-#if VERBOSE
if(new_flag) {
- fprintf(stderr, "access code found: %llx\n", d_access_code);
+ GR_LOG_DEBUG(d_logger, boost::format("access code found: %llx") % d_access_code);
}
else {
- fprintf(stderr, "%llx ==> %llx\n", d_access_code, d_data_reg);
+ GR_LOG_DEBUG(d_logger, boost::format("%llx ==> %llx") % d_access_code % d_data_reg);
}
-#endif
// shift in new data and new flag
d_data_reg = (d_data_reg << 1) | (in[i] & 0x1);
diff --git a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
index e2fe37d8bb..91b57feac3 100644
--- a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
+++ b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
@@ -26,6 +26,7 @@
#include "correlate_access_code_bb_ts_impl.h"
#include <gnuradio/io_signature.h>
+#include <boost/format.hpp>
#include <stdexcept>
#include <volk/volk.h>
#include <cstdio>
@@ -34,8 +35,6 @@
namespace gr {
namespace digital {
-#define VERBOSE 0
-
correlate_access_code_bb_ts::sptr
correlate_access_code_bb_ts::make(const std::string &access_code,
int threshold,
@@ -58,6 +57,7 @@ namespace gr {
set_tag_propagation_policy(TPP_DONT);
if(!set_access_code(access_code)) {
+ GR_LOG_ERROR(d_logger, "access_code is > 64 bits");
throw std::out_of_range ("access_code is > 64 bits");
}
@@ -91,10 +91,9 @@ namespace gr {
for(unsigned i=0; i < d_len; i++){
d_access_code = (d_access_code << 1) | (access_code[i] & 1);
}
- if(VERBOSE) {
- std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl;
- std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl;
- }
+
+ GR_LOG_DEBUG(d_logger, boost::format("Access code: %llx") % d_access_code);
+ GR_LOG_DEBUG(d_logger, boost::format("Mask: %llx") % d_mask);
return true;
}
diff --git a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
index dfbac40505..21ff3fbda0 100644
--- a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
+++ b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
@@ -27,6 +27,7 @@
#include "correlate_access_code_ff_ts_impl.h"
#include <gnuradio/io_signature.h>
#include <gnuradio/math.h>
+#include <boost/format.hpp>
#include <stdexcept>
#include <volk/volk.h>
#include <cstdio>
@@ -35,8 +36,6 @@
namespace gr {
namespace digital {
-#define VERBOSE 0
-
correlate_access_code_ff_ts::sptr
correlate_access_code_ff_ts::make(const std::string &access_code,
int threshold,
@@ -58,6 +57,7 @@ namespace gr {
set_tag_propagation_policy(TPP_DONT);
if(!set_access_code(access_code)) {
+ GR_LOG_ERROR(d_logger, "access_code is > 64 bits");
throw std::out_of_range ("access_code is > 64 bits");
}
@@ -91,10 +91,9 @@ namespace gr {
for(unsigned i=0; i < d_len; i++){
d_access_code = (d_access_code << 1) | (access_code[i] & 1);
}
- if(VERBOSE) {
- std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl;
- std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl;
- }
+
+ GR_LOG_DEBUG(d_logger, boost::format("Access code: %llx") % d_access_code);
+ GR_LOG_DEBUG(d_logger, boost::format("Mask: %llx") % d_mask);
return true;
}
diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
index de2e1a06c3..753efa7a51 100644
--- a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
+++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc
@@ -26,6 +26,7 @@
#include "correlate_access_code_tag_bb_impl.h"
#include <gnuradio/io_signature.h>
+#include <boost/format.hpp>
#include <stdexcept>
#include <volk/volk.h>
#include <cstdio>
@@ -34,8 +35,6 @@
namespace gr {
namespace digital {
-#define VERBOSE 0
-
correlate_access_code_tag_bb::sptr
correlate_access_code_tag_bb::make(const std::string &access_code,
int threshold,
@@ -56,6 +55,7 @@ namespace gr {
d_threshold(threshold), d_len(0)
{
if(!set_access_code(access_code)) {
+ GR_LOG_ERROR(d_logger, "access_code is > 64 bits");
throw std::out_of_range ("access_code is > 64 bits");
}
@@ -85,10 +85,8 @@ namespace gr {
d_access_code = (d_access_code << 1) | (access_code[i] & 1);
}
- if(VERBOSE) {
- std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl;
- std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl;
- }
+ GR_LOG_DEBUG(d_logger, boost::format("Access code: %llx") % d_access_code);
+ GR_LOG_DEBUG(d_logger, boost::format("Mask: %llx") % d_mask);
return true;
}
@@ -116,8 +114,7 @@ namespace gr {
// shift in new data
d_data_reg = (d_data_reg << 1) | (in[i] & 0x1);
if(nwrong <= d_threshold) {
- if(VERBOSE)
- std::cerr << "writing tag at sample " << abs_out_sample_cnt + i << std::endl;
+ GR_LOG_DEBUG(d_logger, boost::format("writing tag at sample %llu") % (abs_out_sample_cnt + i));
add_item_tag(0, //stream ID
abs_out_sample_cnt + i, //sample
d_key, //frame info
diff --git a/gr-digital/lib/correlate_access_code_tag_ff_impl.cc b/gr-digital/lib/correlate_access_code_tag_ff_impl.cc
index 5f44ddeeeb..6efacbb08b 100644
--- a/gr-digital/lib/correlate_access_code_tag_ff_impl.cc
+++ b/gr-digital/lib/correlate_access_code_tag_ff_impl.cc
@@ -27,6 +27,7 @@
#include "correlate_access_code_tag_ff_impl.h"
#include <gnuradio/io_signature.h>
#include <gnuradio/math.h>
+#include <boost/format.hpp>
#include <stdexcept>
#include <volk/volk.h>
#include <cstdio>
@@ -35,8 +36,6 @@
namespace gr {
namespace digital {
-#define VERBOSE 0
-
correlate_access_code_tag_ff::sptr
correlate_access_code_tag_ff::make(const std::string &access_code,
int threshold,
@@ -57,6 +56,7 @@ namespace gr {
d_threshold(threshold), d_len(0)
{
if(!set_access_code(access_code)) {
+ GR_LOG_ERROR(d_logger, "access_code is > 64 bits");
throw std::out_of_range ("access_code is > 64 bits");
}
@@ -86,10 +86,8 @@ namespace gr {
d_access_code = (d_access_code << 1) | (access_code[i] & 1);
}
- if(VERBOSE) {
- std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl;
- std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl;
- }
+ GR_LOG_DEBUG(d_logger, boost::format("Access code: %llx") % d_access_code);
+ GR_LOG_DEBUG(d_logger, boost::format("Mask: %llx") % d_mask);
return true;
}
@@ -117,8 +115,7 @@ namespace gr {
// shift in new data
d_data_reg = (d_data_reg << 1) | (gr::branchless_binary_slicer(in[i]) & 0x1);
if(nwrong <= d_threshold) {
- if(VERBOSE)
- std::cerr << "writing tag at sample " << abs_out_sample_cnt + i << std::endl;
+ GR_LOG_DEBUG(d_logger, boost::format("writing tag at sample %llu") % (abs_out_sample_cnt + i));
add_item_tag(0, //stream ID
abs_out_sample_cnt + i, //sample
d_key, //frame info
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 01:29:08 +0000