Fix grc/uhd_rfnoc_radio #31
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
By default uhd_rfnoc_radio allows only 3 possible name : TX/RX, TX and RX.
Depending on the daughterboard this not enough: BasicRX allows A, B, AB
and BA. With other value gnuradio fails with :
Traceback (most recent call last):
File "/somewhere/top_block.py", line 243, in <module>
main()
File "/somewhere/top_block.py", line 231, in main
tb = top_block_cls()
File "/somewhere/top_block.py", line 101, in __init__
self.uhd_rfnoc_streamer_radio_0.set_rx_antenna("TX/RX", 0)
File "/usr/lib64/python2.7/site-packages/ettus/ettus_swig.py", line 3268, in set_rx_antenna
return _ettus_swig.rfnoc_radio_sptr_set_rx_antenna(self, ant, chan)
RuntimeError: LookupError: KeyError: key "TX/RX" not found in dict(NSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE, NSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE)
Without this modification, the rx bandwidth for channel 1 is only applied if radio is in tx mode and if 2 channels are used.
|
Thanks, this is great. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The first patch is to allows user to specify explicitly an antenna name depending on daughterboard. For example BasicRX names are limited to A, B and AB. Using an other value will result on a gnuradio fail at start time.
The second patch is to fix rx_bandwidth configuration in RX mode when more than one channel is used. Without this, set_rx_bandwitdh is only called when radio is in TX mode and 2 channels are used.