diff options
| -rw-r--r-- | flowgraphs/qam_sim.grc | 14 | ||||
| -rwxr-xr-x | flowgraphs/qam_sim.py | 6 | ||||
| -rw-r--r-- | flowgraphs/qpsk_hw.grc | 44 | ||||
| -rwxr-xr-x | flowgraphs/qpsk_hw.py | 186 | ||||
| -rw-r--r-- | flowgraphs/qpsk_sim.grc | 4 | ||||
| -rwxr-xr-x | flowgraphs/qpsk_sim.py | 14 |
6 files changed, 63 insertions, 205 deletions
diff --git a/flowgraphs/qam_sim.grc b/flowgraphs/qam_sim.grc index f1f9cc9..472e9d4 100644 --- a/flowgraphs/qam_sim.grc +++ b/flowgraphs/qam_sim.grc @@ -151,7 +151,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [184, 436.0] + coordinate: [216, 436.0] rotation: 0 state: true - name: nfilts @@ -448,7 +448,7 @@ blocks: block_tags: 'False' comment: '' epsilon: '1.0' - freq_offset: '0' + freq_offset: 1e-3 maxoutbuf: '0' minoutbuf: '0' noise_voltage: 100e-3 @@ -481,7 +481,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [600, 748.0] + coordinate: [608, 748.0] rotation: 0 state: enabled - name: digital_constellation_decoder_cb_0 @@ -550,8 +550,8 @@ blocks: comment: '' maxoutbuf: '0' minoutbuf: '0' - mu: 5e-3 - num_taps: '5' + mu: 2e-3 + num_taps: '15' sps: '1' states: bus_sink: false @@ -559,7 +559,7 @@ blocks: bus_structure: null coordinate: [520, 1156.0] rotation: 0 - state: true + state: enabled - name: digital_pfb_clock_sync_xxx_0 id: digital_pfb_clock_sync_xxx parameters: @@ -747,7 +747,7 @@ blocks: color1: '"blue"' color10: '"red"' color2: '"red"' - color3: '"red"' + color3: '"green"' color4: '"red"' color5: '"red"' color6: '"red"' diff --git a/flowgraphs/qam_sim.py b/flowgraphs/qam_sim.py index bd8589b..4d65f2c 100755 --- a/flowgraphs/qam_sim.py +++ b/flowgraphs/qam_sim.py @@ -155,7 +155,7 @@ class qam_sim(gr.top_block, Qt.QWidget): '', '', '', '', ''] widths = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - colors = ["blue", "red", "red", "red", "red", + colors = ["blue", "red", "green", "red", "red", "red", "red", "red", "red", "red"] styles = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0] @@ -184,7 +184,7 @@ class qam_sim(gr.top_block, Qt.QWidget): self.fadingui_netsink_0 = fadingui.netsink(address='udp://localhost:31416', dtype="complex", vlen=1) self.fadingui_ber_0 = fadingui.ber(vgl=testvec + list(np.zeros(4)), vlen=frame_len,address='udp://localhost:31415') self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, 2 * np.pi / 100, rrc_taps, 32, 16, 1.5, 1) - self.digital_lms_dd_equalizer_cc_0 = digital.lms_dd_equalizer_cc(5, 5e-3, 1, qam_const) + self.digital_lms_dd_equalizer_cc_0 = digital.lms_dd_equalizer_cc(15, 2e-3, 1, qam_const) self.digital_corr_est_cc_0 = digital.corr_est_cc(access_code, 1, len(access_code) // 2, 0.9, digital.THRESHOLD_ABSOLUTE) self.digital_constellation_modulator_0 = digital.generic_mod( constellation=qam_const, @@ -198,7 +198,7 @@ class qam_sim(gr.top_block, Qt.QWidget): self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, ((2*carrier_freq)/(3*10e8))/samp_rate, False, 4.0, 21, (0,1.8), (1,0.12), 8 ) self.channels_channel_model_0 = channels.channel_model( noise_voltage=100e-3, - frequency_offset=0, + frequency_offset=1e-3, epsilon=1.0, taps=[np.exp(1j * 30 / 180 * np.pi)], noise_seed=243, diff --git a/flowgraphs/qpsk_hw.grc b/flowgraphs/qpsk_hw.grc index 1a3d562..5ace489 100644 --- a/flowgraphs/qpsk_hw.grc +++ b/flowgraphs/qpsk_hw.grc @@ -8,7 +8,7 @@ options: description: '' gen_cmake: 'On' gen_linking: dynamic - generate_options: qt_gui + generate_options: no_gui hier_block_src_path: '.:' id: qpsk_hw max_nouts: '0' @@ -36,7 +36,7 @@ blocks: id: variable parameters: comment: '' - value: 2 * np.array([(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), + value: 2* np.array([(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (-0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)]) @@ -131,7 +131,7 @@ blocks: id: variable parameters: comment: '' - value: 5e5 + value: 800e3 states: bus_sink: false bus_source: false @@ -198,7 +198,7 @@ blocks: bus_structure: null coordinate: [1064, 1080.0] rotation: 0 - state: true + state: disabled - name: blocks_repack_bits_bb_0 id: blocks_repack_bits_bb parameters: @@ -460,11 +460,11 @@ blocks: bus_structure: null coordinate: [704, 316.0] rotation: 0 - state: enabled + state: disabled - name: fadingui_netsink_1 id: fadingui_netsink parameters: - address: udp://localhost:31415 + address: udp://localhost:31418 affinity: '' alias: '' comment: '' @@ -476,11 +476,11 @@ blocks: bus_structure: null coordinate: [768, 916.0] rotation: 0 - state: disabled + state: enabled - name: fadingui_netsink_3 id: fadingui_netsink parameters: - address: udp://localhost:31415 + address: udp://localhost:31419 affinity: '' alias: '' comment: '' @@ -496,7 +496,7 @@ blocks: - name: fadingui_netsink_4 id: fadingui_netsink parameters: - address: udp://localhost:31415 + address: udp://localhost:31417 affinity: '' alias: '' comment: '' @@ -509,6 +509,22 @@ blocks: coordinate: [528, 916.0] rotation: 0 state: enabled +- name: fadingui_netsink_4_0 + id: fadingui_netsink + parameters: + address: udp://localhost:31416 + affinity: '' + alias: '' + comment: '' + type: complex + veclen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [968, 660.0] + rotation: 0 + state: enabled - name: fadingui_phasecorrection_0 id: fadingui_phasecorrection parameters: @@ -627,9 +643,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1128, 784.0] + coordinate: [1280, 784.0] rotation: 0 - state: true + state: disabled - name: qtgui_time_sink_x_0 id: qtgui_time_sink_x parameters: @@ -726,7 +742,7 @@ blocks: bus_structure: null coordinate: [1248, 1060.0] rotation: 0 - state: true + state: disabled - name: uhd_usrp_sink_0 id: uhd_usrp_sink parameters: @@ -1314,7 +1330,7 @@ blocks: norm_gain9: 'False' num_mboards: '1' otw: '' - rx_agc0: Default + rx_agc0: Disabled rx_agc1: Default rx_agc10: Default rx_agc11: Default @@ -1472,6 +1488,7 @@ connections: - [digital_corr_est_cc_0, '0', fadingui_phasecorrection_0, '0'] - [digital_corr_est_cc_0, '1', blocks_complex_to_mag_0, '0'] - [digital_lms_dd_equalizer_cc_0, '0', digital_corr_est_cc_0, '0'] +- [digital_lms_dd_equalizer_cc_0, '0', fadingui_netsink_1, '0'] - [digital_lms_dd_equalizer_cc_0, '0', qtgui_const_sink_x_0_0, '1'] - [digital_pfb_clock_sync_xxx_0, '0', digital_cma_equalizer_cc_0, '0'] - [digital_pfb_clock_sync_xxx_0, '0', digital_lms_dd_equalizer_cc_0, '0'] @@ -1481,6 +1498,7 @@ connections: - [fadingui_phasecorrection_0, '0', fadingui_netsink_3, '0'] - [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_0_0, '2'] - [fadingui_phasecorrection_0, '0', virtual_sink_2, '0'] +- [uhd_usrp_source_0, '0', fadingui_netsink_4_0, '0'] - [uhd_usrp_source_0, '0', virtual_sink_1, '0'] - [virtual_source_0, '0', digital_constellation_decoder_cb_0, '0'] - [virtual_source_1, '0', digital_pfb_clock_sync_xxx_0, '0'] diff --git a/flowgraphs/qpsk_hw.py b/flowgraphs/qpsk_hw.py index 741f405..c13a26d 100755 --- a/flowgraphs/qpsk_hw.py +++ b/flowgraphs/qpsk_hw.py @@ -9,26 +9,11 @@ # Author: Naoki Sean Pross, Sara Cinzia Halter # GNU Radio version: 3.8.2.0 -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 -from gnuradio import qtgui -from gnuradio.filter import firdes -import sip from gnuradio import blocks import numpy from gnuradio import digital from gnuradio import gr +from gnuradio.filter import firdes import sys import signal from argparse import ArgumentParser @@ -39,40 +24,11 @@ import time import fadingui import numpy as np -from gnuradio import qtgui -class qpsk_hw(gr.top_block, Qt.QWidget): +class qpsk_hw(gr.top_block): def __init__(self): gr.top_block.__init__(self, "QPSK Hardware") - Qt.QWidget.__init__(self) - self.setWindowTitle("QPSK Hardware") - 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", "qpsk_hw") - - try: - if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): - self.restoreGeometry(self.settings.value("geometry").toByteArray()) - else: - self.restoreGeometry(self.settings.value("geometry")) - except: - pass ################################################## # Variables @@ -81,11 +37,11 @@ class qpsk_hw(gr.top_block, Qt.QWidget): self.sps = sps = 4 self.nfilts = nfilts = 32 self.excess_bw = excess_bw = 0.35 - self.samp_rate = samp_rate = 5e5 + self.samp_rate = samp_rate = 800e3 self.rrc_taps = rrc_taps = firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), excess_bw, 45*nfilts) self.qpsk_const = qpsk_const = digital.constellation_qpsk().base() self.frame_len = frame_len = len(testvec) +4 - self.access_code_symbols = access_code_symbols = 2 * np.array([(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (-0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)]) + self.access_code_symbols = access_code_symbols = 2* np.array([(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (-0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)]) ################################################## # Blocks @@ -100,6 +56,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget): ) self.uhd_usrp_source_0.set_clock_source('external', 0) self.uhd_usrp_source_0.set_center_freq(2.4e9, 0) + self.uhd_usrp_source_0.set_rx_agc(False, 0) self.uhd_usrp_source_0.set_normalized_gain(1, 0) self.uhd_usrp_source_0.set_antenna('RX2', 0) self.uhd_usrp_source_0.set_samp_rate(samp_rate) @@ -119,94 +76,11 @@ class qpsk_hw(gr.top_block, Qt.QWidget): self.uhd_usrp_sink_0.set_antenna('TX/RX', 0) self.uhd_usrp_sink_0.set_samp_rate(samp_rate) self.uhd_usrp_sink_0.set_time_unknown_pps(uhd.time_spec()) - self.qtgui_time_sink_x_0 = qtgui.time_sink_f( - 1024, #size - samp_rate / sps, #samp_rate - "", #name - 1 #number of inputs - ) - self.qtgui_time_sink_x_0.set_update_time(0.10) - self.qtgui_time_sink_x_0.set_y_axis(0, 10) - - self.qtgui_time_sink_x_0.set_y_label('Amplitude', "") - - self.qtgui_time_sink_x_0.enable_tags(True) - self.qtgui_time_sink_x_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, qtgui.TRIG_SLOPE_POS, 0.0, 0, 0, "") - self.qtgui_time_sink_x_0.enable_autoscale(False) - self.qtgui_time_sink_x_0.enable_grid(False) - self.qtgui_time_sink_x_0.enable_axis_labels(True) - self.qtgui_time_sink_x_0.enable_control_panel(False) - self.qtgui_time_sink_x_0.enable_stem_plot(False) - - - labels = ['Signal 1', 'Signal 2', 'Signal 3', 'Signal 4', 'Signal 5', - 'Signal 6', 'Signal 7', 'Signal 8', 'Signal 9', 'Signal 10'] - widths = [1, 1, 1, 1, 1, - 1, 1, 1, 1, 1] - colors = ['blue', 'red', 'green', 'black', 'cyan', - 'magenta', 'yellow', 'dark red', 'dark green', 'dark blue'] - alphas = [1.0, 1.0, 1.0, 1.0, 1.0, - 1.0, 1.0, 1.0, 1.0, 1.0] - styles = [1, 1, 1, 1, 1, - 1, 1, 1, 1, 1] - markers = [-1, -1, -1, -1, -1, - -1, -1, -1, -1, -1] - - - for i in range(1): - if len(labels[i]) == 0: - self.qtgui_time_sink_x_0.set_line_label(i, "Data {0}".format(i)) - else: - self.qtgui_time_sink_x_0.set_line_label(i, labels[i]) - self.qtgui_time_sink_x_0.set_line_width(i, widths[i]) - self.qtgui_time_sink_x_0.set_line_color(i, colors[i]) - self.qtgui_time_sink_x_0.set_line_style(i, styles[i]) - self.qtgui_time_sink_x_0.set_line_marker(i, markers[i]) - self.qtgui_time_sink_x_0.set_line_alpha(i, alphas[i]) - - self._qtgui_time_sink_x_0_win = sip.wrapinstance(self.qtgui_time_sink_x_0.pyqwidget(), Qt.QWidget) - self.top_grid_layout.addWidget(self._qtgui_time_sink_x_0_win) - self.qtgui_const_sink_x_0_0 = qtgui.const_sink_c( - 1024, #size - "", #name - 3 #number of inputs - ) - self.qtgui_const_sink_x_0_0.set_update_time(0.10) - self.qtgui_const_sink_x_0_0.set_y_axis(-2, 2) - self.qtgui_const_sink_x_0_0.set_x_axis(-2, 2) - self.qtgui_const_sink_x_0_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, qtgui.TRIG_SLOPE_POS, 0.0, 0, "") - self.qtgui_const_sink_x_0_0.enable_autoscale(False) - self.qtgui_const_sink_x_0_0.enable_grid(False) - self.qtgui_const_sink_x_0_0.enable_axis_labels(True) - - - labels = ['', '', '', '', '', - '', '', '', '', ''] - widths = [1, 1, 1, 1, 1, - 1, 1, 1, 1, 1] - colors = ["blue", "red", "dark green", "red", "red", - "red", "red", "red", "red", "red"] - styles = [0, 0, 0, 0, 0, - 0, 0, 0, 0, 0] - markers = [0, 0, 0, 0, 0, - 0, 0, 0, 0, 0] - alphas = [1.0, 1.0, 1.0, 1.0, 1.0, - 1.0, 1.0, 1.0, 1.0, 1.0] - - for i in range(3): - if len(labels[i]) == 0: - self.qtgui_const_sink_x_0_0.set_line_label(i, "Data {0}".format(i)) - else: - self.qtgui_const_sink_x_0_0.set_line_label(i, labels[i]) - self.qtgui_const_sink_x_0_0.set_line_width(i, widths[i]) - self.qtgui_const_sink_x_0_0.set_line_color(i, colors[i]) - self.qtgui_const_sink_x_0_0.set_line_style(i, styles[i]) - self.qtgui_const_sink_x_0_0.set_line_marker(i, markers[i]) - self.qtgui_const_sink_x_0_0.set_line_alpha(i, alphas[i]) - - self._qtgui_const_sink_x_0_0_win = sip.wrapinstance(self.qtgui_const_sink_x_0_0.pyqwidget(), Qt.QWidget) - self.top_grid_layout.addWidget(self._qtgui_const_sink_x_0_0_win) self.fadingui_phasecorrection_0 = fadingui.phasecorrection(frame_len) + self.fadingui_netsink_4_0 = fadingui.netsink(address='udp://localhost:31416', dtype="complex", vlen=1) + self.fadingui_netsink_4 = fadingui.netsink(address='udp://localhost:31417', dtype="complex", vlen=1) + self.fadingui_netsink_3 = fadingui.netsink(address='udp://localhost:31419', dtype="complex", vlen=1) + self.fadingui_netsink_1 = fadingui.netsink(address='udp://localhost:31418', dtype="complex", vlen=1) self.fadingui_ber_0 = fadingui.ber(vgl=testvec + list(np.zeros(4)), vlen=frame_len,address='udp://localhost:31420') self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, 2 * np.pi / 100, rrc_taps, 32, 16, 1.5, 1) self.digital_lms_dd_equalizer_cc_0 = digital.lms_dd_equalizer_cc(15, 3e-3, 1, qpsk_const) @@ -225,7 +99,6 @@ class qpsk_hw(gr.top_block, Qt.QWidget): self.blocks_stream_to_vector_0 = blocks.stream_to_vector(gr.sizeof_char*1, frame_len) self.blocks_stream_mux_0 = blocks.stream_mux(gr.sizeof_char*1, [len(testvec), 4]) self.blocks_repack_bits_bb_0 = blocks.repack_bits_bb(2, 8, "", False, gr.GR_LSB_FIRST) - self.blocks_complex_to_mag_0 = blocks.complex_to_mag(1) self.analog_random_source_x_0 = blocks.vector_source_b(list(map(int, numpy.random.randint(0, 255, 400))), True) @@ -234,7 +107,6 @@ class qpsk_hw(gr.top_block, Qt.QWidget): # Connections ################################################## self.connect((self.analog_random_source_x_0, 0), (self.blocks_stream_mux_0, 1)) - self.connect((self.blocks_complex_to_mag_0, 0), (self.qtgui_time_sink_x_0, 0)) self.connect((self.blocks_repack_bits_bb_0, 0), (self.blocks_stream_to_vector_0, 0)) self.connect((self.blocks_stream_mux_0, 0), (self.digital_constellation_modulator_0, 0)) self.connect((self.blocks_stream_to_vector_0, 0), (self.fadingui_ber_0, 0)) @@ -242,22 +114,17 @@ class qpsk_hw(gr.top_block, Qt.QWidget): self.connect((self.blocks_vector_source_x_0, 0), (self.blocks_stream_mux_0, 0)) self.connect((self.digital_constellation_decoder_cb_0, 0), (self.blocks_tagged_stream_align_0, 0)) self.connect((self.digital_constellation_modulator_0, 0), (self.uhd_usrp_sink_0, 0)) - self.connect((self.digital_corr_est_cc_0, 1), (self.blocks_complex_to_mag_0, 0)) self.connect((self.digital_corr_est_cc_0, 0), (self.fadingui_phasecorrection_0, 0)) self.connect((self.digital_lms_dd_equalizer_cc_0, 0), (self.digital_corr_est_cc_0, 0)) - self.connect((self.digital_lms_dd_equalizer_cc_0, 0), (self.qtgui_const_sink_x_0_0, 1)) + self.connect((self.digital_lms_dd_equalizer_cc_0, 0), (self.fadingui_netsink_1, 0)) self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_lms_dd_equalizer_cc_0, 0)) - self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.qtgui_const_sink_x_0_0, 0)) + self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.fadingui_netsink_4, 0)) self.connect((self.fadingui_phasecorrection_0, 0), (self.digital_constellation_decoder_cb_0, 0)) - self.connect((self.fadingui_phasecorrection_0, 0), (self.qtgui_const_sink_x_0_0, 2)) + self.connect((self.fadingui_phasecorrection_0, 0), (self.fadingui_netsink_3, 0)) self.connect((self.uhd_usrp_source_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) + self.connect((self.uhd_usrp_source_0, 0), (self.fadingui_netsink_4_0, 0)) - def closeEvent(self, event): - self.settings = Qt.QSettings("GNU Radio", "qpsk_hw") - self.settings.setValue("geometry", self.saveGeometry()) - event.accept() - def get_testvec(self): return self.testvec @@ -272,7 +139,6 @@ class qpsk_hw(gr.top_block, Qt.QWidget): def set_sps(self, sps): self.sps = sps self.set_rrc_taps(firdes.root_raised_cosine(self.nfilts, self.nfilts, 1.0/float(self.sps), self.excess_bw, 45*self.nfilts)) - self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate / self.sps) def get_nfilts(self): return self.nfilts @@ -293,7 +159,6 @@ class qpsk_hw(gr.top_block, Qt.QWidget): def set_samp_rate(self, samp_rate): self.samp_rate = samp_rate - self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate / self.sps) self.uhd_usrp_sink_0.set_samp_rate(self.samp_rate) self.uhd_usrp_source_0.set_samp_rate(self.samp_rate) @@ -330,34 +195,21 @@ class qpsk_hw(gr.top_block, Qt.QWidget): def main(top_block_cls=qpsk_hw, options=None): if gr.enable_realtime_scheduling() != gr.RT_OK: print("Error: failed to enable real-time scheduling.") - - if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): - style = gr.prefs().get_string('qtgui', 'style', 'raster') - Qt.QApplication.setGraphicsSystem(style) - qapp = Qt.QApplication(sys.argv) - tb = top_block_cls() - tb.start() - - tb.show() - def sig_handler(sig=None, frame=None): - Qt.QApplication.quit() + tb.stop() + tb.wait() + + sys.exit(0) signal.signal(signal.SIGINT, sig_handler) signal.signal(signal.SIGTERM, sig_handler) - timer = Qt.QTimer() - timer.start(500) - timer.timeout.connect(lambda: None) + tb.start() - def quitting(): - tb.stop() - tb.wait() + tb.wait() - qapp.aboutToQuit.connect(quitting) - qapp.exec_() if __name__ == '__main__': main() diff --git a/flowgraphs/qpsk_sim.grc b/flowgraphs/qpsk_sim.grc index 850743d..de46d9a 100644 --- a/flowgraphs/qpsk_sim.grc +++ b/flowgraphs/qpsk_sim.grc @@ -94,7 +94,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [184, 252.0] + coordinate: [224, 252.0] rotation: 0 state: enabled - name: frame_len @@ -179,7 +179,7 @@ blocks: id: variable parameters: comment: '' - value: '[0x1f, 0x35] + [0x12, 0x48] ' + value: '[0x1f, 0x35] + [0x12, 0x48, 0x12, 0x45] ' states: bus_sink: false bus_source: false diff --git a/flowgraphs/qpsk_sim.py b/flowgraphs/qpsk_sim.py index 6c3bdd1..a7820ae 100755 --- a/flowgraphs/qpsk_sim.py +++ b/flowgraphs/qpsk_sim.py @@ -32,7 +32,7 @@ class qpsk_sim(gr.top_block): ################################################## # Variables ################################################## - self.testvec = testvec = [0x1f, 0x35] + [0x12, 0x48] + self.testvec = testvec = [0x1f, 0x35] + [0x12, 0x48, 0x12, 0x45] self.sps = sps = 4 self.nfilts = nfilts = 32 self.excess_bw = excess_bw = 0.35 @@ -79,14 +79,6 @@ class qpsk_sim(gr.top_block): self.blocks_stream_to_vector_0 = blocks.stream_to_vector(gr.sizeof_char*1, frame_len) self.blocks_stream_mux_0 = blocks.stream_mux(gr.sizeof_char*1, [len(testvec), 4]) self.blocks_repack_bits_bb_0 = blocks.repack_bits_bb(2, 8, "", False, gr.GR_LSB_FIRST) - self.blocks_file_sink_3 = blocks.file_sink(gr.sizeof_gr_complex*1, 'data/qpsk_equalized.dat', False) - self.blocks_file_sink_3.set_unbuffered(False) - self.blocks_file_sink_2 = blocks.file_sink(gr.sizeof_gr_complex*1, 'data/qpsk_sync.dat', False) - self.blocks_file_sink_2.set_unbuffered(False) - self.blocks_file_sink_1 = blocks.file_sink(gr.sizeof_gr_complex*1, 'data/qpsk_locked.dat', False) - self.blocks_file_sink_1.set_unbuffered(False) - self.blocks_file_sink_0 = blocks.file_sink(gr.sizeof_gr_complex*1, 'data/qpsk_channel.dat', False) - self.blocks_file_sink_0.set_unbuffered(False) self.blocks_complex_to_mag_0 = blocks.complex_to_mag(1) self.analog_random_source_x_0 = blocks.vector_source_b(list(map(int, numpy.random.randint(0, 255, 400))), True) @@ -104,20 +96,16 @@ class qpsk_sim(gr.top_block): self.connect((self.blocks_throttle_0, 0), (self.channels_channel_model_0, 0)) self.connect((self.blocks_vector_source_x_0, 0), (self.blocks_stream_mux_0, 0)) self.connect((self.channels_channel_model_0, 0), (self.channels_selective_fading_model_0, 0)) - self.connect((self.channels_selective_fading_model_0, 0), (self.blocks_file_sink_0, 0)) self.connect((self.channels_selective_fading_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) self.connect((self.channels_selective_fading_model_0, 0), (self.fadingui_netsink_0, 0)) - self.connect((self.digital_cma_equalizer_cc_0, 0), (self.blocks_file_sink_3, 0)) self.connect((self.digital_cma_equalizer_cc_0, 0), (self.digital_corr_est_cc_0, 0)) self.connect((self.digital_cma_equalizer_cc_0, 0), (self.fadingui_netsink_1, 0)) self.connect((self.digital_constellation_decoder_cb_0, 0), (self.blocks_tagged_stream_align_0, 0)) self.connect((self.digital_constellation_modulator_0, 0), (self.blocks_throttle_0, 0)) self.connect((self.digital_corr_est_cc_0, 1), (self.blocks_complex_to_mag_0, 0)) self.connect((self.digital_corr_est_cc_0, 0), (self.fadingui_phasecorrection_0, 0)) - self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.blocks_file_sink_2, 0)) self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_cma_equalizer_cc_0, 0)) self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.fadingui_netsink_4, 0)) - self.connect((self.fadingui_phasecorrection_0, 0), (self.blocks_file_sink_1, 0)) self.connect((self.fadingui_phasecorrection_0, 0), (self.digital_constellation_decoder_cb_0, 0)) self.connect((self.fadingui_phasecorrection_0, 0), (self.fadingui_netsink_3, 0)) |