- clean working copy for leaving SVN

This commit is contained in:
2022-06-28 18:44:48 +02:00
parent 96412c8a95
commit a5d637bcba
9 changed files with 7905 additions and 1939 deletions
+3360
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -3194,7 +3194,7 @@
</param>
<param>
<key>dev</key>
<value>remote=tcp://192.168.1.100:55132,remote:driver=uhd</value>
<value>remote=tcp://192.168.1.125:55132,remote:driver=uhd</value>
</param>
<param>
<key>_enabled</key>
+2465
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
# this module will be imported in the into your flowgraph
Executable
+258
View File
@@ -0,0 +1,258 @@
#!/usr/bin/env python2
# -*- coding: utf-8 -*-
##################################################
# GNU Radio Python Flow Graph
# Title: UHD Wide-band FM Modulator
# Author: Example
# Description: Loopback test
# Generated: Sat Jul 13 12:16:01 2019
##################################################
from distutils.version import StrictVersion
if __name__ == '__main__':
import ctypes
import sys
if sys.platform.startswith('linux'):
try:
x11 = ctypes.cdll.LoadLibrary('libX11.so')
x11.XInitThreads()
except:
print "Warning: failed to XInitThreads()"
from PyQt5 import Qt, QtCore
from gnuradio import analog
from gnuradio import blocks
from gnuradio import eng_notation
from gnuradio import gr
from gnuradio import uhd
from gnuradio.eng_option import eng_option
from gnuradio.filter import firdes
from gnuradio.qtgui import Range, RangeWidget
from optparse import OptionParser
import sys
import time
from gnuradio import qtgui
class fm_mod_uhd(gr.top_block, Qt.QWidget):
def __init__(self, audio_rate=50000, freq=2.45e9, freq_offset=0, samp_rate=500e3):
gr.top_block.__init__(self, "UHD Wide-band FM Modulator")
Qt.QWidget.__init__(self)
self.setWindowTitle("UHD Wide-band FM Modulator")
qtgui.util.check_set_qss()
try:
self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc'))
except:
pass
self.top_scroll_layout = Qt.QVBoxLayout()
self.setLayout(self.top_scroll_layout)
self.top_scroll = Qt.QScrollArea()
self.top_scroll.setFrameStyle(Qt.QFrame.NoFrame)
self.top_scroll_layout.addWidget(self.top_scroll)
self.top_scroll.setWidgetResizable(True)
self.top_widget = Qt.QWidget()
self.top_scroll.setWidget(self.top_widget)
self.top_layout = Qt.QVBoxLayout(self.top_widget)
self.top_grid_layout = Qt.QGridLayout()
self.top_layout.addLayout(self.top_grid_layout)
self.settings = Qt.QSettings("GNU Radio", "fm_mod_uhd")
self.restoreGeometry(self.settings.value("geometry", type=QtCore.QByteArray))
##################################################
# Parameters
##################################################
self.audio_rate = audio_rate
self.freq = freq
self.freq_offset = freq_offset
self.samp_rate = samp_rate
##################################################
# Variables
##################################################
self.tun_tx_gain = tun_tx_gain = 20
self.tun_freq = tun_freq = 105.4e6
self.tone_ampl = tone_ampl = 0.15
self.tone2 = tone2 = 220
self.tone1 = tone1 = 440
##################################################
# Blocks
##################################################
self._tun_tx_gain_range = Range(0, 40, 1, 20, 200)
self._tun_tx_gain_win = RangeWidget(self._tun_tx_gain_range, self.set_tun_tx_gain, 'UHD Tx Gain', "counter_slider", float)
self.top_grid_layout.addWidget(self._tun_tx_gain_win, 4, 0, 1, 2)
for r in range(4, 5):
self.top_grid_layout.setRowStretch(r, 1)
for c in range(0, 2):
self.top_grid_layout.setColumnStretch(c, 1)
self._tun_freq_range = Range(88.5e6, 108e6, 0.5e6, 105.4e6, 200)
self._tun_freq_win = RangeWidget(self._tun_freq_range, self.set_tun_freq, 'UHD Freq (Hz)', "counter_slider", float)
self.top_grid_layout.addWidget(self._tun_freq_win, 3, 0, 1, 4)
for r in range(3, 4):
self.top_grid_layout.setRowStretch(r, 1)
for c in range(0, 4):
self.top_grid_layout.setColumnStretch(c, 1)
self._tone_ampl_range = Range(0, 1, .001, 0.15, 200)
self._tone_ampl_win = RangeWidget(self._tone_ampl_range, self.set_tone_ampl, 'Tone Amplitude', "counter_slider", float)
self.top_grid_layout.addWidget(self._tone_ampl_win, 1, 2, 1, 2)
for r in range(1, 2):
self.top_grid_layout.setRowStretch(r, 1)
for c in range(2, 4):
self.top_grid_layout.setColumnStretch(c, 1)
self._tone2_range = Range(0, 880, 1, 220, 200)
self._tone2_win = RangeWidget(self._tone2_range, self.set_tone2, 'Tone 2', "counter_slider", float)
self.top_grid_layout.addWidget(self._tone2_win, 0, 2, 1, 2)
for r in range(0, 1):
self.top_grid_layout.setRowStretch(r, 1)
for c in range(2, 4):
self.top_grid_layout.setColumnStretch(c, 1)
self._tone1_range = Range(0, 880, 1, 440, 200)
self._tone1_win = RangeWidget(self._tone1_range, self.set_tone1, 'Tone 1', "counter_slider", float)
self.top_grid_layout.addWidget(self._tone1_win, 0, 0, 1, 2)
for r in range(0, 1):
self.top_grid_layout.setRowStretch(r, 1)
for c in range(0, 2):
self.top_grid_layout.setColumnStretch(c, 1)
self.uhd_usrp_sink_0 = uhd.usrp_sink(
",".join(("", "")),
uhd.stream_args(
cpu_format="fc32",
channels=range(1),
),
)
self.uhd_usrp_sink_0.set_samp_rate(samp_rate)
self.uhd_usrp_sink_0.set_center_freq(tun_freq, 0)
self.uhd_usrp_sink_0.set_gain(tun_tx_gain, 0)
self.uhd_usrp_sink_0.set_antenna('TX/RX', 0)
self.blocks_add_xx = blocks.add_vff(1)
self.analog_wfm_tx_0 = analog.wfm_tx(
audio_rate=audio_rate,
quad_rate=int(samp_rate),
tau=75e-6,
max_dev=75e3,
fh=-1.0,
)
self.analog_sig_source_x_1 = analog.sig_source_f(audio_rate, analog.GR_COS_WAVE, tone2, tone_ampl, 0)
self.analog_sig_source_x_0 = analog.sig_source_f(audio_rate, analog.GR_COS_WAVE, tone1, tone_ampl, 0)
##################################################
# Connections
##################################################
self.connect((self.analog_sig_source_x_0, 0), (self.blocks_add_xx, 0))
self.connect((self.analog_sig_source_x_1, 0), (self.blocks_add_xx, 1))
self.connect((self.analog_wfm_tx_0, 0), (self.uhd_usrp_sink_0, 0))
self.connect((self.blocks_add_xx, 0), (self.analog_wfm_tx_0, 0))
def closeEvent(self, event):
self.settings = Qt.QSettings("GNU Radio", "fm_mod_uhd")
self.settings.setValue("geometry", self.saveGeometry())
event.accept()
def get_audio_rate(self):
return self.audio_rate
def set_audio_rate(self, audio_rate):
self.audio_rate = audio_rate
self.analog_sig_source_x_1.set_sampling_freq(self.audio_rate)
self.analog_sig_source_x_0.set_sampling_freq(self.audio_rate)
def get_freq(self):
return self.freq
def set_freq(self, freq):
self.freq = freq
def get_freq_offset(self):
return self.freq_offset
def set_freq_offset(self, freq_offset):
self.freq_offset = freq_offset
def get_samp_rate(self):
return self.samp_rate
def set_samp_rate(self, samp_rate):
self.samp_rate = samp_rate
self.uhd_usrp_sink_0.set_samp_rate(self.samp_rate)
def get_tun_tx_gain(self):
return self.tun_tx_gain
def set_tun_tx_gain(self, tun_tx_gain):
self.tun_tx_gain = tun_tx_gain
self.uhd_usrp_sink_0.set_gain(self.tun_tx_gain, 0)
def get_tun_freq(self):
return self.tun_freq
def set_tun_freq(self, tun_freq):
self.tun_freq = tun_freq
self.uhd_usrp_sink_0.set_center_freq(self.tun_freq, 0)
def get_tone_ampl(self):
return self.tone_ampl
def set_tone_ampl(self, tone_ampl):
self.tone_ampl = tone_ampl
self.analog_sig_source_x_1.set_amplitude(self.tone_ampl)
self.analog_sig_source_x_0.set_amplitude(self.tone_ampl)
def get_tone2(self):
return self.tone2
def set_tone2(self, tone2):
self.tone2 = tone2
self.analog_sig_source_x_1.set_frequency(self.tone2)
def get_tone1(self):
return self.tone1
def set_tone1(self, tone1):
self.tone1 = tone1
self.analog_sig_source_x_0.set_frequency(self.tone1)
def argument_parser():
description = 'Loopback test'
parser = OptionParser(usage="%prog: [options]", option_class=eng_option, description=description)
parser.add_option(
"", "--audio-rate", dest="audio_rate", type="intx", default=50000,
help="Set Audio Rate [default=%default]")
parser.add_option(
"-f", "--freq", dest="freq", type="eng_float", default=eng_notation.num_to_str(2.45e9),
help="Set Default Frequency [default=%default]")
parser.add_option(
"-o", "--freq-offset", dest="freq_offset", type="eng_float", default=eng_notation.num_to_str(0),
help="Set Rx Frequency Offset [default=%default]")
parser.add_option(
"", "--samp-rate", dest="samp_rate", type="eng_float", default=eng_notation.num_to_str(500e3),
help="Set Sample Rate [default=%default]")
return parser
def main(top_block_cls=fm_mod_uhd, options=None):
if options is None:
options, _ = argument_parser().parse_args()
qapp = Qt.QApplication(sys.argv)
tb = top_block_cls(audio_rate=options.audio_rate, freq=options.freq, freq_offset=options.freq_offset, samp_rate=options.samp_rate)
tb.start()
tb.show()
def quitting():
tb.stop()
tb.wait()
qapp.aboutToQuit.connect(quitting)
qapp.exec_()
if __name__ == '__main__':
main()
+8
View File
@@ -341,6 +341,10 @@
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>numGapBits</key>
<value>10</value>
</param>
<param>
<key>id</key>
<value>jay_bit_slicer_0</value>
@@ -357,6 +361,10 @@
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>doPrintPackets</key>
<value>1</value>
</param>
<param>
<key>sampleRate</key>
<value>audio_rate</value>
+194 -1938
View File
File diff suppressed because it is too large Load Diff
Executable
+246
View File
@@ -0,0 +1,246 @@
#!/usr/bin/env python2
# -*- coding: utf-8 -*-
##################################################
# GNU Radio Python Flow Graph
# Title: Top Block
# Generated: Sat Apr 18 16:20:12 2020
##################################################
if __name__ == '__main__':
import ctypes
import sys
if sys.platform.startswith('linux'):
try:
x11 = ctypes.cdll.LoadLibrary('libX11.so')
x11.XInitThreads()
except:
print "Warning: failed to XInitThreads()"
from gnuradio import analog
from gnuradio import eng_notation
from gnuradio import gr
from gnuradio.eng_option import eng_option
from gnuradio.filter import firdes
from gnuradio.wxgui import forms
from grc_gnuradio import wxgui as grc_wxgui
from optparse import OptionParser
import soapy
import wx
class top_block(grc_wxgui.top_block_gui):
def __init__(self):
grc_wxgui.top_block_gui.__init__(self, title="Top Block")
_icon_path = "/usr/share/icons/hicolor/32x32/apps/gnuradio-grc.png"
self.SetIcon(wx.Icon(_icon_path, wx.BITMAP_TYPE_ANY))
##################################################
# Variables
##################################################
self.f_ctr_fine = f_ctr_fine = 0e3
self.f_ctr_coarse = f_ctr_coarse = 500e6
self.samp_rate = samp_rate = 2e6
self.rx_ftune = rx_ftune = 500e6
self.power_tx_dB = power_tx_dB = 0
self.offset_Hz = offset_Hz = 0
self.f_tune = f_tune = f_ctr_coarse + f_ctr_fine
self.f_fine = f_fine = 0
##################################################
# Blocks
##################################################
_power_tx_dB_sizer = wx.BoxSizer(wx.VERTICAL)
self._power_tx_dB_text_box = forms.text_box(
parent=self.GetWin(),
sizer=_power_tx_dB_sizer,
value=self.power_tx_dB,
callback=self.set_power_tx_dB,
label='Tx-Power',
converter=forms.float_converter(),
proportion=0,
)
self._power_tx_dB_slider = forms.slider(
parent=self.GetWin(),
sizer=_power_tx_dB_sizer,
value=self.power_tx_dB,
callback=self.set_power_tx_dB,
minimum=0,
maximum=1,
num_steps=100,
style=wx.SL_HORIZONTAL,
cast=float,
proportion=1,
)
self.Add(_power_tx_dB_sizer)
self.soapy_sink_0 = \
soapy.sink(1, "driver=remote,remote=moon,remote:driver=uhd", '', samp_rate, "fc32", '')
self.soapy_sink_0.set_frequency(0, f_tune)
self.soapy_sink_0.set_gain(0, power_tx_dB*40)
self.soapy_sink_0.set_gain_mode(0, False)
self._rx_ftune_chooser = forms.drop_down(
parent=self.GetWin(),
value=self.rx_ftune,
callback=self.set_rx_ftune,
label='rx_ftune',
choices=[100e6, 200e6, 300e6, 433.92e6, 500e6, 700e6, 900e6],
labels=['100 MHz','200 MHz','300 MHz','400 MHz','500 MHz','700 MHz','900 MHz'],
)
self.Add(self._rx_ftune_chooser)
_f_fine_sizer = wx.BoxSizer(wx.VERTICAL)
self._f_fine_text_box = forms.text_box(
parent=self.GetWin(),
sizer=_f_fine_sizer,
value=self.f_fine,
callback=self.set_f_fine,
label='f_fine',
converter=forms.float_converter(),
proportion=0,
)
self._f_fine_slider = forms.slider(
parent=self.GetWin(),
sizer=_f_fine_sizer,
value=self.f_fine,
callback=self.set_f_fine,
minimum=-100e3,
maximum=100e3,
num_steps=200,
style=wx.SL_HORIZONTAL,
cast=float,
proportion=1,
)
self.Add(_f_fine_sizer)
_f_ctr_fine_sizer = wx.BoxSizer(wx.VERTICAL)
self._f_ctr_fine_text_box = forms.text_box(
parent=self.GetWin(),
sizer=_f_ctr_fine_sizer,
value=self.f_ctr_fine,
callback=self.set_f_ctr_fine,
label='f_ctr_fine',
converter=forms.float_converter(),
proportion=0,
)
self._f_ctr_fine_slider = forms.slider(
parent=self.GetWin(),
sizer=_f_ctr_fine_sizer,
value=self.f_ctr_fine,
callback=self.set_f_ctr_fine,
minimum=-1000e3,
maximum=1000e3,
num_steps=100,
style=wx.SL_HORIZONTAL,
cast=float,
proportion=1,
)
self.Add(_f_ctr_fine_sizer)
_f_ctr_coarse_sizer = wx.BoxSizer(wx.VERTICAL)
self._f_ctr_coarse_text_box = forms.text_box(
parent=self.GetWin(),
sizer=_f_ctr_coarse_sizer,
value=self.f_ctr_coarse,
callback=self.set_f_ctr_coarse,
label='f_ctr_coarse',
converter=forms.float_converter(),
proportion=0,
)
self._f_ctr_coarse_slider = forms.slider(
parent=self.GetWin(),
sizer=_f_ctr_coarse_sizer,
value=self.f_ctr_coarse,
callback=self.set_f_ctr_coarse,
minimum=88e6,
maximum=1000e6,
num_steps=20,
style=wx.SL_HORIZONTAL,
cast=float,
proportion=1,
)
self.Add(_f_ctr_coarse_sizer)
self.analog_sig_source_x_0 = analog.sig_source_c(samp_rate, analog.GR_COS_WAVE, 0, 0.5, 0)
##################################################
# Connections
##################################################
self.connect((self.analog_sig_source_x_0, 0), (self.soapy_sink_0, 0))
def get_f_ctr_fine(self):
return self.f_ctr_fine
def set_f_ctr_fine(self, f_ctr_fine):
self.f_ctr_fine = f_ctr_fine
self.set_f_tune(self.f_ctr_coarse + self.f_ctr_fine)
self._f_ctr_fine_slider.set_value(self.f_ctr_fine)
self._f_ctr_fine_text_box.set_value(self.f_ctr_fine)
def get_f_ctr_coarse(self):
return self.f_ctr_coarse
def set_f_ctr_coarse(self, f_ctr_coarse):
self.f_ctr_coarse = f_ctr_coarse
self.set_f_tune(self.f_ctr_coarse + self.f_ctr_fine)
self._f_ctr_coarse_slider.set_value(self.f_ctr_coarse)
self._f_ctr_coarse_text_box.set_value(self.f_ctr_coarse)
def get_samp_rate(self):
return self.samp_rate
def set_samp_rate(self, samp_rate):
self.samp_rate = samp_rate
self.analog_sig_source_x_0.set_sampling_freq(self.samp_rate)
def get_rx_ftune(self):
return self.rx_ftune
def set_rx_ftune(self, rx_ftune):
self.rx_ftune = rx_ftune
self._rx_ftune_chooser.set_value(self.rx_ftune)
def get_power_tx_dB(self):
return self.power_tx_dB
def set_power_tx_dB(self, power_tx_dB):
self.power_tx_dB = power_tx_dB
self._power_tx_dB_slider.set_value(self.power_tx_dB)
self._power_tx_dB_text_box.set_value(self.power_tx_dB)
self.soapy_sink_0.set_gain(0, self.power_tx_dB*40)
def get_offset_Hz(self):
return self.offset_Hz
def set_offset_Hz(self, offset_Hz):
self.offset_Hz = offset_Hz
def get_f_tune(self):
return self.f_tune
def set_f_tune(self, f_tune):
self.f_tune = f_tune
self.soapy_sink_0.set_frequency(0, self.f_tune)
def get_f_fine(self):
return self.f_fine
def set_f_fine(self, f_fine):
self.f_fine = f_fine
self._f_fine_slider.set_value(self.f_fine)
self._f_fine_text_box.set_value(self.f_fine)
def main(top_block_cls=top_block, options=None):
tb = top_block_cls()
tb.Start(True)
tb.Wait()
if __name__ == '__main__':
main()
+1372
View File
File diff suppressed because it is too large Load Diff