diff --git a/software/gr-caribouLite/grc/caribouLite_caribouLiteSource.block.yml b/software/gr-caribouLite/grc/caribouLite_caribouLiteSource.block.yml index 236d391..ed5058d 100644 --- a/software/gr-caribouLite/grc/caribouLite_caribouLiteSource.block.yml +++ b/software/gr-caribouLite/grc/caribouLite_caribouLiteSource.block.yml @@ -7,7 +7,7 @@ templates: imports: from gnuradio import caribouLite make: - caribouLite.caribouLiteSource(${channel}, ${enable_agc}, ${rx_gain}, ${rx_bw}, ${sample_rate}, ${freq}) + caribouLite.caribouLiteSource(${channel}, ${enable_agc}, ${rx_gain}, ${rx_bw}, ${sample_rate}, ${freq}, ${provide_meta}) parameters: - id: channel @@ -40,10 +40,17 @@ parameters: dtype: float default: 900000000.0 +- id: provide_meta + label: output meta data + dtype: enum + options: ['True', 'False'] + hide: part + default: 'False' + cpp_templates: includes: ['#include '] declarations: 'caribouLite::caribouLiteSource::sptr ${id};' - make: 'this->${id} = caribouLite::caribouLiteSource::make(${channel}, ${enable_agc}, ${rx_gain}, ${rx_bw}, ${sample_rate}, ${freq});' + make: 'this->${id} = caribouLite::caribouLiteSource::make(${channel}, ${enable_agc}, ${rx_gain}, ${rx_bw}, ${sample_rate}, ${freq}, ${provide_meta});' packages: ['gnuradio-caribouLite'] link: ['gnuradio::gnuradio-caribouLite'] translations: @@ -57,4 +64,9 @@ outputs: domain: stream dtype: complex +- label: meta + domain: stream + dtype: byte + hide: ${False if str(provide_meta)=='True' else True} + file_format: 1 diff --git a/software/gr-caribouLite/include/gnuradio/caribouLite/caribouLiteSource.h b/software/gr-caribouLite/include/gnuradio/caribouLite/caribouLiteSource.h index bb6ffd3..848654f 100644 --- a/software/gr-caribouLite/include/gnuradio/caribouLite/caribouLiteSource.h +++ b/software/gr-caribouLite/include/gnuradio/caribouLite/caribouLiteSource.h @@ -32,7 +32,13 @@ namespace gr { * class. caribouLite::caribouLiteSource::make is the public interface for * creating new instances. */ - static sptr make(int channel=0, bool enable_agc=false, float rx_gain=40, float rx_bw=2500000, float sample_rate=4000000, float freq=900000000); + static sptr make(int channel=0, + bool enable_agc=false, + float rx_gain=40, + float rx_bw=2500000, + float sample_rate=4000000, + float freq=900000000, + bool provide_meta = false); }; } // namespace caribouLite diff --git a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc index 316b2b8..243b328 100644 --- a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc +++ b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc @@ -10,7 +10,6 @@ namespace gr { namespace caribouLite { - using output_type = gr_complex; void detectBoard() { @@ -29,18 +28,37 @@ namespace gr { } //------------------------------------------------------------------------------------------------------------- - caribouLiteSource::sptr caribouLiteSource::make(int channel, bool enable_agc, float rx_gain, float rx_bw, float sample_rate, float freq) + caribouLiteSource::sptr caribouLiteSource::make(int channel, + bool enable_agc, + float rx_gain, + float rx_bw, + float sample_rate, + float freq, + bool provide_meta) { - return gnuradio::make_block_sptr(channel, enable_agc, rx_gain, rx_bw, sample_rate, freq); + return gnuradio::make_block_sptr(channel, + enable_agc, + rx_gain, + rx_bw, + sample_rate, + freq, + provide_meta); } // public constructor //------------------------------------------------------------------------------------------------------------- - caribouLiteSource_impl::caribouLiteSource_impl(int channel, bool enable_agc, float rx_gain, float rx_bw, float sample_rate, float freq) + caribouLiteSource_impl::caribouLiteSource_impl(int channel, + bool enable_agc, + float rx_gain, + float rx_bw, + float sample_rate, + float freq, + bool provide_meta) : gr::sync_block("caribouLiteSource", gr::io_signature::make(0, 0, 0), - gr::io_signature::make(1 /* min outputs */, 1 /*max outputs */, sizeof(output_type))) + gr::io_signature::make(1, 2, {sizeof(gr_complex), sizeof(uint8_t)}) + ) { detectBoard(); @@ -50,10 +68,11 @@ namespace gr { _rx_bw = rx_bw; _sample_rate = sample_rate; _frequency = freq; + _provide_meta = provide_meta; + CaribouLite &cl = CaribouLite::GetInstance(false); _cl = &cl; _radio = cl.GetRadioChannel(_channel); - _mtu_size = _radio->GetNativeMtuSample(); // setup parameters @@ -79,9 +98,14 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - auto out = static_cast(output_items[0]); - int ret = _radio->ReadSamples(out, static_cast(noutput_items)); - if (ret <= 0) return 0; + 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); + + if (ret <= 0) + { + return 0; + } return ret; } diff --git a/software/gr-caribouLite/lib/caribouLiteSource_impl.h b/software/gr-caribouLite/lib/caribouLiteSource_impl.h index 17a6a97..27bdb53 100644 --- a/software/gr-caribouLite/lib/caribouLiteSource_impl.h +++ b/software/gr-caribouLite/lib/caribouLiteSource_impl.h @@ -27,12 +27,20 @@ namespace gr float _sample_rate; float _frequency; size_t _mtu_size; - + bool _provide_meta; + + cariboulite_sample_meta* _metadata; CaribouLite* _cl; CaribouLiteRadio *_radio; public: - caribouLiteSource_impl(int channel, bool enable_agc, float rx_gain, float rx_bw, float sample_rate, float freq); + caribouLiteSource_impl(int channel, + bool enable_agc, + float rx_gain, + float rx_bw, + float sample_rate, + float freq, + bool provide_meta); ~caribouLiteSource_impl(); int work( diff --git a/software/gr-caribouLite/python/caribouLite/bindings/caribouLiteSource_python.cc b/software/gr-caribouLite/python/caribouLite/bindings/caribouLiteSource_python.cc index 83b88af..54bb71b 100644 --- a/software/gr-caribouLite/python/caribouLite/bindings/caribouLiteSource_python.cc +++ b/software/gr-caribouLite/python/caribouLite/bindings/caribouLiteSource_python.cc @@ -1,5 +1,5 @@ /* - * Copyright 2023 Free Software Foundation, Inc. + * Copyright 2024 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(caribouLiteSource.h) */ -/* BINDTOOL_HEADER_FILE_HASH(9ce2846f2939a8b8e624a4612154ad52) */ +/* BINDTOOL_HEADER_FILE_HASH(2af106876738c9927aadb177d064272d) */ /***********************************************************************************/ #include @@ -30,30 +30,26 @@ namespace py = pybind11; void bind_caribouLiteSource(py::module& m) { - using caribouLiteSource = gr::caribouLite::caribouLiteSource; + using caribouLiteSource = ::gr::caribouLite::caribouLiteSource; - py::class_>(m, "caribouLiteSource", D(caribouLiteSource)) + py::class_>( + m, "caribouLiteSource", D(caribouLiteSource)) .def(py::init(&caribouLiteSource::make), - D(caribouLiteSource,make) - ) - - + py::arg("channel") = 0, + py::arg("enable_agc") = false, + py::arg("rx_gain") = 40, + py::arg("rx_bw") = 2500000, + py::arg("sample_rate") = 4000000, + py::arg("freq") = 900000000, + py::arg("provide_meta") = false, + D(caribouLiteSource, make)) ; - - - - } - - - - - - - - diff --git a/software/gr-caribouLite/python/caribouLite/bindings/docstrings/caribouLiteSource_pydoc_template.h b/software/gr-caribouLite/python/caribouLite/bindings/docstrings/caribouLiteSource_pydoc_template.h index d70dc2f..694e399 100644 --- a/software/gr-caribouLite/python/caribouLite/bindings/docstrings/caribouLiteSource_pydoc_template.h +++ b/software/gr-caribouLite/python/caribouLite/bindings/docstrings/caribouLiteSource_pydoc_template.h @@ -1,5 +1,5 @@ /* - * Copyright 2023 Free Software Foundation, Inc. + * Copyright 2024 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -15,13 +15,10 @@ */ - - static const char *__doc_gr_caribouLite_caribouLiteSource = R"doc()doc"; +static const char* __doc_gr_caribouLite_caribouLiteSource = R"doc()doc"; - static const char *__doc_gr_caribouLite_caribouLiteSource_caribouLiteSource = R"doc()doc"; +static const char* __doc_gr_caribouLite_caribouLiteSource_caribouLiteSource = R"doc()doc"; - static const char *__doc_gr_caribouLite_caribouLiteSource_make = R"doc()doc"; - - +static const char* __doc_gr_caribouLite_caribouLiteSource_make = R"doc()doc"; diff --git a/software/libcariboulite/src/CaribouLite.hpp b/software/libcariboulite/src/CaribouLite.hpp index bef414b..3cabbda 100644 --- a/software/libcariboulite/src/CaribouLite.hpp +++ b/software/libcariboulite/src/CaribouLite.hpp @@ -183,8 +183,8 @@ public: bool GetIsTransmittingCw(void); // Synchronous Reading and Writing - int ReadSamples(std::complex* samples, size_t num_to_read); - int ReadSamples(std::complex* samples, size_t num_to_read); + int ReadSamples(std::complex* samples, size_t num_to_read, uint8_t* meta = NULL); + int ReadSamples(std::complex* samples, size_t num_to_read, uint8_t* meta = NULL); int WriteSamples(std::complex* samples, size_t num_to_write); int WriteSamples(std::complex* samples, size_t num_to_write); diff --git a/software/libcariboulite/src/CaribouLiteRadioCpp.cpp b/software/libcariboulite/src/CaribouLiteRadioCpp.cpp index 8fd65dc..d509cff 100644 --- a/software/libcariboulite/src/CaribouLiteRadioCpp.cpp +++ b/software/libcariboulite/src/CaribouLiteRadioCpp.cpp @@ -1,4 +1,5 @@ #include "CaribouLite.hpp" +#include //================================================================= void CaribouLiteRadio::CaribouLiteRxThread(CaribouLiteRadio* radio) @@ -68,15 +69,15 @@ void CaribouLiteRadio::CaribouLiteRxThread(CaribouLiteRadio* radio) } //================================================================== -int CaribouLiteRadio::ReadSamples(std::complex* samples, size_t num_to_read) +int CaribouLiteRadio::ReadSamples(std::complex* samples, size_t num_to_read, uint8_t* meta) { - if (samples == 0) + if (samples == NULL) { printf("samples_is_null=%d", _read_samples==NULL); return 0; } - int ret = ReadSamples((std::complex*)NULL, num_to_read); + int ret = ReadSamples((std::complex*)NULL, num_to_read, meta); //printf("ret = %d\n", ret); if (ret <= 0) { @@ -94,7 +95,7 @@ int CaribouLiteRadio::ReadSamples(std::complex* samples, size_t num_to_re } //================================================================== -int CaribouLiteRadio::ReadSamples(std::complex* samples, size_t num_to_read) +int CaribouLiteRadio::ReadSamples(std::complex* samples, size_t num_to_read, uint8_t* meta) { if (!_rx_is_active || _read_samples == NULL || _read_metadata == NULL || num_to_read == 0) { @@ -119,6 +120,11 @@ int CaribouLiteRadio::ReadSamples(std::complex* samples, size_t num_to_re samples[i] = {_read_samples[i].i, _read_samples[i].q}; } } + + if (meta) + { + memcpy(meta, _read_metadata, (size_t)ret); + } return ret; }