From 028b10689698b8831e31c6b28846d3be6c4fac2f Mon Sep 17 00:00:00 2001 From: alon Date: Wed, 10 Apr 2024 13:28:15 +0300 Subject: [PATCH 1/3] upp --- .../gr-caribouLite/lib/caribouLiteSource_impl.cc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc index 243b328..702c8bc 100644 --- a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc +++ b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc @@ -100,13 +100,23 @@ namespace gr { { auto out_samples = static_cast(output_items[0]); auto out_meta = _provide_meta == true ? static_cast(output_items[1]) : (uint8_t*) NULL ; - int ret = _radio->ReadSamples(out_samples, static_cast(noutput_items), out_meta); + uint8_t* pps; + int read_samples = _radio->ReadSamples(out_samples, static_cast(noutput_items), pps); + + const pmt::pmt_t key = pmt::from_bool(true); + for (int i = 0; i < read_samples; i++) + { + const pmt::pmt_t value = pmt::from_uint64(pps[i]); + if (pps[i] == 1) { + add_item_tag(0, i, key, value); + } + } - if (ret <= 0) + if (read_samples <= 0) { return 0; } - return ret; + return read_samples; } } /* namespace caribouLite */ From cfa6ca105e6c5d368535ffdd8def15ed9d89eb28 Mon Sep 17 00:00:00 2001 From: alon Date: Wed, 10 Apr 2024 18:19:38 +0300 Subject: [PATCH 2/3] added tags --- .../gr-caribouLite/lib/caribouLiteSource_impl.cc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc index 702c8bc..0212148 100644 --- a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc +++ b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc @@ -100,22 +100,16 @@ namespace gr { { auto out_samples = static_cast(output_items[0]); auto out_meta = _provide_meta == true ? static_cast(output_items[1]) : (uint8_t*) NULL ; - uint8_t* pps; - int read_samples = _radio->ReadSamples(out_samples, static_cast(noutput_items), pps); + int read_samples = _radio->ReadSamples(out_samples, static_cast(noutput_items), out_meta); + if (read_samples <= 0) { return 0;} - const pmt::pmt_t key = pmt::from_bool(true); for (int i = 0; i < read_samples; i++) { - const pmt::pmt_t value = pmt::from_uint64(pps[i]); - if (pps[i] == 1) { - add_item_tag(0, i, key, value); + if (out_meta[i] == 1) { + add_item_tag(0, i, pmt::string_to_symbol("pps") ,pmt::from_bool(true)); } } - if (read_samples <= 0) - { - return 0; - } return read_samples; } From 3705017ea6558307fcae6360872384e554fddaab Mon Sep 17 00:00:00 2001 From: alon Date: Sun, 14 Apr 2024 13:11:05 +0300 Subject: [PATCH 3/3] get handle into gr-cariboulite --- software/gr-caribouLite/lib/caribouLiteSource_impl.cc | 5 +++++ software/gr-caribouLite/lib/caribouLiteSource_impl.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc index 0212148..665c2f2 100644 --- a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc +++ b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc @@ -86,6 +86,11 @@ namespace gr { _radio->StartReceiving(); } + uint64_t caribouLiteSource_impl::getHandle() const + { + return (uint64_t)((void*)(_radio)); + } + // virtual destructor //------------------------------------------------------------------------------------------------------------- caribouLiteSource_impl::~caribouLiteSource_impl() diff --git a/software/gr-caribouLite/lib/caribouLiteSource_impl.h b/software/gr-caribouLite/lib/caribouLiteSource_impl.h index 27bdb53..6081a21 100644 --- a/software/gr-caribouLite/lib/caribouLiteSource_impl.h +++ b/software/gr-caribouLite/lib/caribouLiteSource_impl.h @@ -48,6 +48,8 @@ namespace gr gr_vector_const_void_star &input_items, gr_vector_void_star &output_items ); + + uint64_t caribouLiteSource_impl::getHandle() const; }; } // namespace caribouLite