diff --git a/software/gr-caribouLite/grc/caribouLite_caribouLiteSource.block.yml b/software/gr-caribouLite/grc/caribouLite_caribouLiteSource.block.yml index e052b81..9251bce 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_sync}) parameters: - id: channel @@ -40,10 +40,16 @@ parameters: dtype: float default: 900000000.0 +- id: provide_sync + 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_sync});' packages: ['gnuradio-caribouLite'] link: ['gnuradio::gnuradio-caribouLite'] translations: @@ -60,5 +66,6 @@ outputs: - label: sync domain: stream dtype: byte + hide: ${False if str(provide_sync)=='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..d21747f 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_sync = false); }; } // namespace caribouLite diff --git a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc index 88463cd..d621e27 100644 --- a/software/gr-caribouLite/lib/caribouLiteSource_impl.cc +++ b/software/gr-caribouLite/lib/caribouLiteSource_impl.cc @@ -28,15 +28,33 @@ 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_sync) { - 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_sync); } // 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_sync) : gr::sync_block("caribouLiteSource", gr::io_signature::make(0, 0, 0), gr::io_signature::make(1 /* min outputs */, 1 /*max outputs */, sizeof(gr_complex))) @@ -49,12 +67,13 @@ namespace gr { _rx_bw = rx_bw; _sample_rate = sample_rate; _frequency = freq; + _mtu_size = _radio->GetNativeMtuSample(); + _provide_sync = provide_sync; + CaribouLite &cl = CaribouLite::GetInstance(false); _cl = &cl; _radio = cl.GetRadioChannel(_channel); - _mtu_size = _radio->GetNativeMtuSample(); - // setup parameters _radio->SetRxGain(rx_gain); _radio->SetAgc(enable_agc); @@ -82,16 +101,18 @@ namespace gr { auto out_sync = static_cast(output_items[1]); _metadata = new cariboulite_sample_meta[noutput_items]; - int ret = _radio->ReadSamples(out_samples, _metadata, static_cast(noutput_items)); if (ret <= 0) { //fail delete[] _metadata; return 0; - } else { //success - for (int i = 0; i < ret; i++) + } else { //success + if (_provide_sync) { - out_sync[i] = _metadata[i].sync; + for (int i = 0; i < ret; i++) + { + out_sync[i] = _metadata[i].sync; + } } delete[] _metadata; } diff --git a/software/gr-caribouLite/lib/caribouLiteSource_impl.h b/software/gr-caribouLite/lib/caribouLiteSource_impl.h index f9c8cd0..4c5e485 100644 --- a/software/gr-caribouLite/lib/caribouLiteSource_impl.h +++ b/software/gr-caribouLite/lib/caribouLiteSource_impl.h @@ -27,13 +27,20 @@ namespace gr float _sample_rate; float _frequency; size_t _mtu_size; + bool _provide_sync; + 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_sync); ~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..f9b4e8c 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(9aa68c862233e30766b0524aaf530760) */ /***********************************************************************************/ #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_sync") = 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";