summaryrefslogtreecommitdiff
path: root/gr-uhd
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Update to modern CMake usageAndrej Rode2019-03-044-84/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes using target based setting of includes and link libraries. This will transitively add the includes and linking flags to dependent targets. This is still a work in progress since only the dynamic libraries have been touched and not all of include_directories directives are gone yet. cmake: remove GR_INCLUDE_SUBDIRECTORY macro Previously this macro was used to inject subdirectories in the current CMake namespace. This is generally undesired and pollutes the current context. previously GNU Radio CMake had a non-default option ENABLE_STATIC_LIBS to build both, shared libraries and static libraries. This seems to be a construction taken over from autotools and serves no purpuose in CMake and complicates the library building. cmake: remove GR_LIBTOOL and la generation support This looks like it was primarily used to support projects using autotools, but comments state that the generated .la files aren't compatible with autotools anyway. cmake: Bump required CMake version to 3.8 UseSWIG cmake uses syntax which requires at least CMake 3.8 and is non-trivial to change
* cleanup: use quotes for local includesAndrej Rode2019-02-011-3/+3
| | | | Local includes are not found if defined in angle brackets.
* uhd: Re-add freq_hopping.py exampleMartin Braun2019-01-112-0/+268
| | | | | | | This was accidentally removed in 6d9a164, which was supposed to eliminate the WX-GUI examples. This commit also makes the example compatible with the current state of GNU Radio and in particular Python 3.
* uhd: grc: Don't set antenna if no value is givenMartin Braun2019-01-041-0/+2
| | | | | | For some attributes in the GRC bindings, we'd skip the setters at make() time when no value was given. This also adds this behaviour for the antenna.
* cmake: Only go into grc/ subdirs when ENABLE_GRC=ONMartin Braun2018-12-171-1/+3
|
* uhd: Fix even more GRC binding issuesMartin Braun2018-12-171-14/+1
| | | | | | | | - The callback for gain would always use normalized gain, which would cause errors since the non-normalized gain range would cause exceptions - The "Show Command Port" menu was removed, it didn't work, but no other block has this.
* uhd: More fixes to GRC bindings (time/clock source, etc.)Martin Braun2018-12-161-3/+20
| | | | | | | | | - Subdev spec wasn't being applied at all - time/clock source, neither - Sync wouldn't stay the same value when it was set to "don't sync" - Bandwidth is no longer set when the value is 0, allowing for a default behaviour - OTW format wasn't being applied properly
* uhd: Fix GRC bindings (gain, freq...)Martin Braun2018-12-152-9/+26
| | | | | The YML file generated during CMake was simply not correct. Frequency, gain, etc. weren't propagated properly to the underlying C++ object.
* uhd: Remove unused and deprecated type io_type_tMartin Braun2018-12-124-11/+0
| | | | | | | UHD used to have a type called io_type_t which is referenced in GNU Radio, but never used. There were cases where SWIG would create invalid code around this type. Since it's no longer used in GNU Radio, and deprecated in UHD, removing it from gr-uhd is a twofer.
* uhd: Remove unused constants to fix compiler warningsMartin Braun2018-12-121-2/+0
|
* uhd: added asynchronous messages handling to the sinkPiotr Krysik2018-12-113-6/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | UHD asynchronous messages are needed in order to obtain information about issues happening on Tx side (Underflows, Sequence Errors, Time Errors). This change adds handling of these messages to the usrp sink by adding async_event_loop() function executed in a separate thread (_async_event_thread) where these messages are: - received from the USRP, - transformed into PMT messages, - sent to the new "async_msgs" message output port. On the top level the output PMT messages are (message_type, content) pairs: - message_type is always "uhd_async_msg", - content is a dictionary with key names taken from uhd::async_metadata_t. - there is no 'has_time_spec' as in PMT it's not needed. There just won't be 'time_spec' in the PMT message when 'has_time_spec' is false. - there is no 'user_payload' - but it can be easily added in the future as pmt blob. Example message from the 'async_msgs' output is below: (uhd_async_msg (channel . 0) (time_spec 4 . 0.0608192) (event_code burst_ack)) Reviewed-By: Martin Braun <martin.braun@ettus.com>
* gr-uhd: Remove blind exception handling for argument type castingBrennan Ashton2018-11-151-4/+4
|
* gr-uhd: Improve input parameter exception handling for uhd_appBrennan Ashton2018-11-151-3/+5
|
* uhd: Fix UHD apps to use Qt5Martin Braun2018-11-152-15/+17
| | | | Qt4 no longer supported.
* uhd: Fix Python issuesMartin Braun2018-11-152-5/+5
| | | | | - Import order for uhd_fft - Convert iterators to lists
* uhd: Update USRP block arguments in PythonMartin Braun2018-11-121-1/+2
| | | | | | | | The gnuradio.uhd.{usrp_source,usrp_sink,amsg_source} blocks have a custom ctor in Python which requires manual tracking of the available arguments. This updates the Python module with respect to the C++ API. Co-Authored-By: Ben Kempke <bpkempke@umich.edu>
* Add missing includes which will fail after reformatAndrej Rode2018-11-121-0/+1
| | | | | | | Includes in files depending on these headers will be reordered after reformatting. This change adds the missing includes before that happens.
* uhd: Fix call to enable_tags(), use 0 instead of -1 as defaultMarc L2018-10-231-2/+2
| | | | | 1f857d3 changed variable "which" to be unsigned, so the default can't be -1.
* gr-uhd: uhd_fft allows double clicking waterfall plot to re-tuneMarc Lichtman2018-10-231-0/+6
|
* uhd: Fix bugs in usrp yamlMarc L2018-10-231-6/+8
|
* uhd: Minor fixes to GRC bindingsMartin Braun2018-10-231-66/+69
| | | | | | | | | - Show/Hide LO settings now works the right way round - Gain Type changed from bool to enum - Fix Pylint warning on the YML generation code Reviewed-by: Marcus Müller <mmueller@gnuradio.org> Reviewed-by: Håkon Vagsether <hauk142@gmail.com>
* uhd: Re-enable GRC bindingsMartin Braun2018-10-121-1/+1
| | | | | This reverts 331ccf8a. The GRC bindings were disabled temporarily because of Cheetah/Mako incompatibilities which were resolved.
* uhd: add missing braceAndrej Rode2018-09-011-0/+1
|
* Merge remote-tracking branch 'origin/next' into merge_nextMarcus Müller2018-08-3164-17774/+471
|\
| * Remove examples depending on removed dxpsk_(de)modMarcus Müller2018-08-264-7769/+0
| |
| * Some typo fixes for UHDHåkon Vågsether2018-07-301-14/+14
| |
| * Unbreak boost 1.67. Constrain the delay in message_strobe to integer ↵Peter Horvath2018-07-081-2/+2
| | | | | | | | milliseconds.
| * Merge branch 'python3_fix' into nextAndrej Rode2018-06-2414-758/+426
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual merge conflict resolution has been applied to following conflicts: * Typos: * gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py * gr-blocks/python/blocks/qa_wavfile.py * gr-filter/examples/gr_filtdes_api.py * grc/blocks/parameter.xml * gr-uhd/python/uhd/__init__.py * ValueError -> RuntimeError: * gr-blocks/python/blocks/qa_hier_block2.py * relative Imports & other Py3k: * gr-digital/python/digital/psk_constellations.py * gr-digital/python/digital/qam_constellations.py * gr-digital/python/digital/test_soft_decisions.py * gr-digital/python/digital/gfsk.py * SequenceCompleter: * gr-utils/python/modtool/modtool_add.py * gr-utils/python/modtool/modtool_rename.py * gr-utils/python/modtool/modtool_rm.py * Updated API on next: * gr-blocks/grc/blocks_file_source.xml * gr-blocks/python/blocks/qa_file_source_sink.py * gr-qtgui/grc/qtgui_time_sink_x.xml * GRC Py3k Updates: * grc/core/Block.py * grc/core/Constants.py * grc/core/Platform.py * grc/core/utils/odict.py * grc/gui/Actions.py * grc/gui/Block.py * grc/gui/Executor.py * grc/gui/Port.py
| | * python: Py3k compatAndrej Rode2018-06-232-7/+7
| | |
| | * Added YAML blocks that needed manual editingHåkon Vågsether2017-10-106-698/+358
| | |
| | * Merge branch 'next' into python3Johnathan Corgan2017-10-058-20/+82
| | |\
| | * \ Merge remote-tracking branch 'github/pr/1435' into python3Johnathan Corgan2017-09-221-1/+1
| | |\ \
| | | * | Fix typos from switch to Python 3Håkon Vågsether2017-08-211-1/+1
| | | | |
| | * | | Merge branch 'next' into python3Johnathan Corgan2017-08-271-0/+4
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: gr-uhd/grc/gen_uhd_usrp_blocks.py
| | * | | Merge branch 'next' into python3Johnathan Corgan2017-07-131-1/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt
| | * \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-06-221-14/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-uhd/apps/uhd_app.py
| | * \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-06-221-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-runtime/python/gnuradio/gr/tag_utils.py
| | * \ \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-06-071-2/+8
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-04-171-16/+21
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-04-031-3/+2
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-03-221-6/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/Modules/GrSwig.cmake
| | * \ \ \ \ \ \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-03-221-0/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-03-164-48/+42
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-blocks/swig/blocks_swig.py.in gr-uhd/apps/uhd_app.py
| | * | | | | | | | | | | | uhd: disable grc directory temporarily due to cheetah requirementJohnathan Corgan2017-02-261-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | python3: update non-GRC components to use python2 or python3Douglas Anderson2017-02-266-550/+559
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into nextMartin Braun2018-02-035-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-10-058-20/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/examples/CMakeLists.txt gr-uhd/lib/usrp_source_impl.cc gr-uhd/lib/usrp_source_impl.h
| * | | | | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-08-271-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-runtime/include/gnuradio/logger.h
| * | | | | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-07-131-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/python/grc_gnuradio/blks2/packet.py gr-uhd/lib/usrp_sink_impl.cc
| * | | | | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-06-221-14/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |