From 1c8a3d0915f5295efb3c651932e6bd15f3d4e83b Mon Sep 17 00:00:00 2001 From: Timo Juhani Lindfors Date: Fri, 8 Feb 2013 08:54:01 +0000 Subject: [PATCH 2/2] use gr_channel_model instead of channel_model channel_model is not available in gnuradio 3.6 --- mpsk_stage2.grc | 244 +++++++++++++++++++++++-------------------------- mpsk_stage2.py | 30 +++---- mpsk_stage3.grc | 204 ++++++++++++++++++++--------------------- mpsk_stage3.py | 31 +++---- mpsk_stage4.grc | 158 ++++++++++++++++---------------- mpsk_stage4.py | 30 +++---- mpsk_stage5.grc | 260 ++++++++++++++++++++++++++--------------------------- mpsk_stage5.py | 30 +++---- multipath_sim.grc | 108 +++++++++++----------- multipath_sim.py | 12 ++- 10 files changed, 532 insertions(+), 575 deletions(-) diff --git a/mpsk_stage2.grc b/mpsk_stage2.grc index 3749a0c..674fd8e 100644 --- a/mpsk_stage2.grc +++ b/mpsk_stage2.grc @@ -1,6 +1,6 @@ - Sat Sep 22 13:27:55 2012 + Fri Feb 8 08:57:43 2013 options @@ -365,37 +365,6 @@ - gr_multiply_const_vxx - - id - gr_multiply_const_vxx_0 - - - _enabled - True - - - type - complex - - - const - complex(.5,.5) - - - vlen - 1 - - - _coordinate - (482, 108) - - - _rotation - 0 - - - random_source_x id @@ -435,45 +404,6 @@ - channel_model - - id - channel_model_0 - - - _enabled - True - - - noise_voltage - noise_volt - - - freq_offset - freq_offset - - - epsilon - time_offset - - - taps - taps - - - seed - 0 - - - _coordinate - (711, 76) - - - _rotation - 0 - - - variable id @@ -520,37 +450,6 @@ - gr_throttle - - id - gr_throttle_0 - - - _enabled - True - - - type - complex - - - samples_per_second - samp_rate - - - vlen - 1 - - - _coordinate - (152, 266) - - - _rotation - 0 - - - qtgui_sink_x id @@ -585,10 +484,6 @@ samp_rate - rate - 10 - - plotfreq False @@ -609,10 +504,6 @@ 0,0,1,1 - freqchangevar - None - - _coordinate (798, 221) @@ -656,10 +547,6 @@ samp_rate - rate - 10 - - plotfreq True @@ -680,10 +567,6 @@ - freqchangevar - None - - _coordinate (798, 453) @@ -727,10 +610,6 @@ samp_rate - rate - 10 - - plotfreq False @@ -751,12 +630,109 @@ 0,1,1,1 - freqchangevar - None + _coordinate + (798, 338) + + + _rotation + 0 + + + + gr_multiply_const_vxx + + id + gr_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + complex(.5,.5) + + + vlen + 1 _coordinate - (798, 338) + (482, 108) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle_0 + + + _enabled + True + + + type + complex + + + samples_per_second + samp_rate + + + vlen + 1 + + + _coordinate + (152, 266) + + + _rotation + 0 + + + + gr_channel_model + + id + gr_channel_model_0 + + + _enabled + True + + + noise_voltage + noise_volt + + + freq_offset + freq_offset + + + epsilon + time_offset + + + taps + taps + + + seed + 0 + + + _coordinate + (711, 76) _rotation @@ -776,32 +752,32 @@ 0 - gr_multiply_const_vxx_0 - channel_model_0 + gr_throttle_0 + qtgui_sink_x_0 0 0 - channel_model_0 - gr_throttle_0 + gr_throttle_0 + qtgui_sink_x_0_0 0 0 gr_throttle_0 - qtgui_sink_x_0 + qtgui_sink_x_0_1 0 0 - gr_throttle_0 - qtgui_sink_x_0_0 + gr_multiply_const_vxx_0 + gr_channel_model_0 0 0 - gr_throttle_0 - qtgui_sink_x_0_1 + gr_channel_model_0 + gr_throttle_0 0 0 diff --git a/mpsk_stage2.py b/mpsk_stage2.py index f97a08f..791e458 100755 --- a/mpsk_stage2.py +++ b/mpsk_stage2.py @@ -2,16 +2,14 @@ ################################################## # Gnuradio Python Flow Graph # Title: Mpsk Stage2 -# Generated: Sun Sep 23 16:18:29 2012 +# Generated: Fri Feb 8 08:57:43 2013 ################################################## from PyQt4 import Qt from gnuradio import digital from gnuradio import eng_notation -from gnuradio import filter from gnuradio import gr from gnuradio.eng_option import eng_option -from gnuradio.filter import firdes from gnuradio.gr import firdes from gnuradio.qtgui import qtgui from optparse import OptionParser @@ -130,6 +128,13 @@ class mpsk_stage2(gr.top_block, Qt.QWidget): self.top_grid_layout.addWidget(self._qtgui_sink_x_0_win, 0,0,1,1) self.gr_throttle_0 = gr.throttle(gr.sizeof_gr_complex*1, samp_rate) self.gr_multiply_const_vxx_0 = gr.multiply_const_vcc((complex(.5,.5), )) + self.gr_channel_model_0 = gr.channel_model( + noise_voltage=noise_volt, + frequency_offset=freq_offset, + epsilon=time_offset, + taps=(taps), + noise_seed=0, + ) self.digital_psk_mod_0 = digital.psk.psk_mod( constellation_points=arity, mod_code="gray", @@ -139,24 +144,17 @@ class mpsk_stage2(gr.top_block, Qt.QWidget): verbose=False, log=False, ) - self.channel_model_0 = filter.channel_model( - noise_voltage=noise_volt, - frequency_offset=freq_offset, - epsilon=time_offset, - taps=(taps), - noise_seed=0, - ) ################################################## # Connections ################################################## self.connect((self.digital_psk_mod_0, 0), (self.gr_multiply_const_vxx_0, 0)) self.connect((self.random_source_x_0, 0), (self.digital_psk_mod_0, 0)) - self.connect((self.gr_multiply_const_vxx_0, 0), (self.channel_model_0, 0)) - self.connect((self.channel_model_0, 0), (self.gr_throttle_0, 0)) self.connect((self.gr_throttle_0, 0), (self.qtgui_sink_x_0, 0)) self.connect((self.gr_throttle_0, 0), (self.qtgui_sink_x_0_0, 0)) self.connect((self.gr_throttle_0, 0), (self.qtgui_sink_x_0_1, 0)) + self.connect((self.gr_multiply_const_vxx_0, 0), (self.gr_channel_model_0, 0)) + self.connect((self.gr_channel_model_0, 0), (self.gr_throttle_0, 0)) def get_time_offset(self): return self.time_offset @@ -164,14 +162,14 @@ class mpsk_stage2(gr.top_block, Qt.QWidget): def set_time_offset(self, time_offset): self.time_offset = time_offset self._time_offset_slider.setValue(self.time_offset) - self.channel_model_0.set_timing_offset(self.time_offset) + self.gr_channel_model_0.set_timing_offset(self.time_offset) def get_taps(self): return self.taps def set_taps(self, taps): self.taps = taps - self.channel_model_0.set_taps((self.taps)) + self.gr_channel_model_0.set_taps((self.taps)) def get_sps(self): return self.sps @@ -194,7 +192,7 @@ class mpsk_stage2(gr.top_block, Qt.QWidget): def set_noise_volt(self, noise_volt): self.noise_volt = noise_volt self._noise_volt_slider.setValue(self.noise_volt) - self.channel_model_0.set_noise_voltage(self.noise_volt) + self.gr_channel_model_0.set_noise_voltage(self.noise_volt) def get_freq_offset(self): return self.freq_offset @@ -202,7 +200,7 @@ class mpsk_stage2(gr.top_block, Qt.QWidget): def set_freq_offset(self, freq_offset): self.freq_offset = freq_offset self._freq_offset_slider.setValue(self.freq_offset) - self.channel_model_0.set_frequency_offset(self.freq_offset) + self.gr_channel_model_0.set_frequency_offset(self.freq_offset) def get_arity(self): return self.arity diff --git a/mpsk_stage3.grc b/mpsk_stage3.grc index 55c5bd5..e9d4dcc 100644 --- a/mpsk_stage3.grc +++ b/mpsk_stage3.grc @@ -1,6 +1,6 @@ - Sat Sep 22 15:04:39 2012 + Fri Feb 8 08:57:33 2013 options @@ -536,37 +536,6 @@ - gr_multiply_const_vxx - - id - gr_multiply_const_vxx_0 - - - _enabled - True - - - type - complex - - - const - complex(0.5,0.5) - - - vlen - 1 - - - _coordinate - (264, 303) - - - _rotation - 0 - - - variable id @@ -613,38 +582,62 @@ - channel_model + qtgui_sink_x id - channel_model_0 + qtgui_sink_x_0_0 _enabled True - noise_voltage - noise_volt + type + complex - freq_offset - freq_offset + name + QT GUI Plot - epsilon - time_offset + fftsize + 1024 - taps - taps + wintype + firdes.WIN_BLACKMAN_hARRIS - seed + fc 0 + bw + samp_rate + + + plotfreq + False + + + plotwaterfall + False + + + plottime + False + + + plotconst + True + + + gui_hint + 0,1,1,1 + + _coordinate - (522, 76) + (1060, 121) _rotation @@ -652,10 +645,10 @@ - qtgui_sink_x + gr_multiply_const_vxx id - qtgui_sink_x_0_0 + gr_multiply_const_vxx_0 _enabled @@ -666,48 +659,71 @@ complex - name - QT GUI Plot + const + complex(0.5,0.5) - fftsize - 1024 + vlen + 1 - wintype - firdes.WIN_BLACKMAN_hARRIS + _coordinate + (264, 303) - fc + _rotation 0 + + + digital_pfb_clock_sync_xxx + + id + digital_pfb_clock_sync_xxx_0 + - bw - samp_rate + _enabled + True - plotfreq - False + type + ccf - plotwaterfall - False + sps + sps - plottime - False + alpha + 0.1 - plotconst - True + beta + 0.25*0.1*0.1 - gui_hint - 0,1,1,1 + taps + rrc_taps + + + filter_size + nfilts + + + init_phase + nfilts/2 + + + max_dev + 1.5 + + + osps + 1 _coordinate - (1060, 121) + (762, 90) _rotation @@ -778,54 +794,38 @@ - digital_pfb_clock_sync_xxx + gr_channel_model id - digital_pfb_clock_sync_xxx_0 + gr_channel_model_0 _enabled True - type - ccf - - - sps - sps + noise_voltage + noise_volt - alpha - 0.1 + freq_offset + freq_offset - beta - 0.25*0.1*0.1 + epsilon + time_offset taps - rrc_taps - - - filter_size - nfilts - - - init_phase - nfilts/2 - - - max_dev - 1.5 + taps - osps - 1 + seed + 0 _coordinate - (762, 90) + (522, 76) _rotation @@ -851,26 +851,26 @@ 0 - gr_multiply_const_vxx_0 - channel_model_0 + digital_pfb_clock_sync_xxx_0 + qtgui_sink_x_0_0 0 0 - channel_model_0 - digital_pfb_clock_sync_xxx_0 + gr_multiply_const_vxx_0 + gr_channel_model_0 0 0 - channel_model_0 - qtgui_sink_x_0_0_0 + gr_channel_model_0 + digital_pfb_clock_sync_xxx_0 0 0 - digital_pfb_clock_sync_xxx_0 - qtgui_sink_x_0_0 + gr_channel_model_0 + qtgui_sink_x_0_0_0 0 0 diff --git a/mpsk_stage3.py b/mpsk_stage3.py index a85c6eb..0abe694 100755 --- a/mpsk_stage3.py +++ b/mpsk_stage3.py @@ -2,16 +2,14 @@ ################################################## # Gnuradio Python Flow Graph # Title: Mpsk Stage3 -# Generated: Sun Sep 23 16:18:32 2012 +# Generated: Fri Feb 8 08:56:37 2013 ################################################## from PyQt4 import Qt from gnuradio import digital from gnuradio import eng_notation -from gnuradio import filter from gnuradio import gr from gnuradio.eng_option import eng_option -from gnuradio.filter import firdes from gnuradio.gr import firdes from gnuradio.qtgui import qtgui from optparse import OptionParser @@ -131,6 +129,13 @@ class mpsk_stage3(gr.top_block, Qt.QWidget): self.top_grid_layout.addWidget(self._qtgui_sink_x_0_0_win, 0,1,1,1) self.gr_throttle_0 = gr.throttle(gr.sizeof_gr_complex*1, samp_rate) self.gr_multiply_const_vxx_0 = gr.multiply_const_vcc((complex(0.5,0.5), )) + self.gr_channel_model_0 = gr.channel_model( + noise_voltage=noise_volt, + frequency_offset=freq_offset, + epsilon=time_offset, + taps=(1.0 + 1.0j, ), + noise_seed=0, + ) self.digital_psk_mod_0 = digital.psk.psk_mod( constellation_points=arity, mod_code="gray", @@ -142,13 +147,6 @@ class mpsk_stage3(gr.top_block, Qt.QWidget): ) self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, 0.1, (rrc_taps), nfilts, nfilts/2, 1.5, 1) self.digital_pfb_clock_sync_xxx_0.set_beta(0.25*0.1*0.1) - self.channel_model_0 = filter.channel_model( - noise_voltage=noise_volt, - frequency_offset=freq_offset, - epsilon=time_offset, - taps=(taps), - noise_seed=0, - ) ################################################## # Connections @@ -156,10 +154,10 @@ class mpsk_stage3(gr.top_block, Qt.QWidget): self.connect((self.digital_psk_mod_0, 0), (self.gr_throttle_0, 0)) self.connect((self.random_source_x_0, 0), (self.digital_psk_mod_0, 0)) self.connect((self.gr_throttle_0, 0), (self.gr_multiply_const_vxx_0, 0)) - self.connect((self.gr_multiply_const_vxx_0, 0), (self.channel_model_0, 0)) - self.connect((self.channel_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) - self.connect((self.channel_model_0, 0), (self.qtgui_sink_x_0_0_0, 0)) self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.qtgui_sink_x_0_0, 0)) + self.connect((self.gr_multiply_const_vxx_0, 0), (self.gr_channel_model_0, 0)) + self.connect((self.gr_channel_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) + self.connect((self.gr_channel_model_0, 0), (self.qtgui_sink_x_0_0_0, 0)) def get_sps(self): return self.sps @@ -181,7 +179,7 @@ class mpsk_stage3(gr.top_block, Qt.QWidget): def set_time_offset(self, time_offset): self.time_offset = time_offset self._time_offset_slider.setValue(self.time_offset) - self.channel_model_0.set_timing_offset(self.time_offset) + self.gr_channel_model_0.set_timing_offset(self.time_offset) def get_time_alpha(self): return self.time_alpha @@ -195,7 +193,6 @@ class mpsk_stage3(gr.top_block, Qt.QWidget): def set_taps(self, taps): self.taps = taps - self.channel_model_0.set_taps((self.taps)) def get_samp_rate(self): return self.samp_rate @@ -218,7 +215,7 @@ class mpsk_stage3(gr.top_block, Qt.QWidget): def set_noise_volt(self, noise_volt): self.noise_volt = noise_volt self._noise_volt_slider.setValue(self.noise_volt) - self.channel_model_0.set_noise_voltage(self.noise_volt) + self.gr_channel_model_0.set_noise_voltage(self.noise_volt) def get_freq_offset(self): return self.freq_offset @@ -226,7 +223,7 @@ class mpsk_stage3(gr.top_block, Qt.QWidget): def set_freq_offset(self, freq_offset): self.freq_offset = freq_offset self._freq_offset_slider.setValue(self.freq_offset) - self.channel_model_0.set_frequency_offset(self.freq_offset) + self.gr_channel_model_0.set_frequency_offset(self.freq_offset) def get_arity(self): return self.arity diff --git a/mpsk_stage4.grc b/mpsk_stage4.grc index 2d6f0f8..6dd14e2 100644 --- a/mpsk_stage4.grc +++ b/mpsk_stage4.grc @@ -1,6 +1,6 @@ - Sat Sep 22 15:05:11 2012 + Fri Feb 8 08:59:00 2013 options @@ -591,37 +591,6 @@ - gr_multiply_const_vxx - - id - gr_multiply_const_vxx_0 - - - _enabled - True - - - type - complex - - - const - complex(.5,0.5) - - - vlen - 1 - - - _coordinate - (488, 159) - - - _rotation - 0 - - - variable id @@ -645,45 +614,6 @@ - channel_model - - id - channel_model_0 - - - _enabled - True - - - noise_voltage - noise_volt - - - freq_offset - freq_offset - - - epsilon - time_offset - - - taps - taps - - - seed - 0 - - - _coordinate - (709, 80) - - - _rotation - 0 - - - variable id @@ -891,6 +821,76 @@ + gr_multiply_const_vxx + + id + gr_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + complex(.5,0.5) + + + vlen + 1 + + + _coordinate + (488, 159) + + + _rotation + 0 + + + + gr_channel_model + + id + gr_channel_model_0 + + + _enabled + True + + + noise_voltage + noise_volt + + + freq_offset + freq_offset + + + epsilon + time_offset + + + taps + taps + + + seed + 0 + + + _coordinate + (709, 80) + + + _rotation + 0 + + + digital_pfb_clock_sync_xxx id @@ -970,26 +970,26 @@ 0 - gr_multiply_const_vxx_0 - channel_model_0 + digital_cma_equalizer_cc_0 + qtgui_sink_x_0_0 0 0 - channel_model_0 - digital_pfb_clock_sync_xxx_0 + digital_pfb_clock_sync_xxx_0 + qtgui_sink_x_0_0_0 0 0 - digital_cma_equalizer_cc_0 - qtgui_sink_x_0_0 + gr_multiply_const_vxx_0 + gr_channel_model_0 0 0 - digital_pfb_clock_sync_xxx_0 - qtgui_sink_x_0_0_0 + gr_channel_model_0 + digital_pfb_clock_sync_xxx_0 0 0 diff --git a/mpsk_stage4.py b/mpsk_stage4.py index 0b86957..ec61871 100755 --- a/mpsk_stage4.py +++ b/mpsk_stage4.py @@ -2,16 +2,14 @@ ################################################## # Gnuradio Python Flow Graph # Title: Mpsk Stage4 -# Generated: Sun Sep 23 16:18:37 2012 +# Generated: Fri Feb 8 09:00:00 2013 ################################################## from PyQt4 import Qt from gnuradio import digital from gnuradio import eng_notation -from gnuradio import filter from gnuradio import gr from gnuradio.eng_option import eng_option -from gnuradio.filter import firdes from gnuradio.gr import firdes from gnuradio.qtgui import qtgui from optparse import OptionParser @@ -143,6 +141,13 @@ class mpsk_stage4(gr.top_block, Qt.QWidget): self.top_grid_layout.addWidget(self._qtgui_sink_x_0_0_win, 0,1,1,1) self.gr_throttle_0 = gr.throttle(gr.sizeof_gr_complex*1, samp_rate) self.gr_multiply_const_vxx_0 = gr.multiply_const_vcc((complex(.5,0.5), )) + self.gr_channel_model_0 = gr.channel_model( + noise_voltage=noise_volt, + frequency_offset=freq_offset, + epsilon=time_offset, + taps=(taps), + noise_seed=0, + ) self.digital_psk_mod_0 = digital.psk.psk_mod( constellation_points=arity, mod_code="gray", @@ -155,13 +160,6 @@ class mpsk_stage4(gr.top_block, Qt.QWidget): self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, 0.1, (rrc_taps), nfilts, nfilts/2, 1.5, 2) self.digital_pfb_clock_sync_xxx_0.set_beta(0.25*0.1*0.1) self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(11, 1, eq_gain, 2) - self.channel_model_0 = filter.channel_model( - noise_voltage=noise_volt, - frequency_offset=freq_offset, - epsilon=time_offset, - taps=(taps), - noise_seed=0, - ) ################################################## # Connections @@ -170,10 +168,10 @@ class mpsk_stage4(gr.top_block, Qt.QWidget): self.connect((self.gr_throttle_0, 0), (self.gr_multiply_const_vxx_0, 0)) self.connect((self.random_source_x_0, 0), (self.digital_psk_mod_0, 0)) self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_cma_equalizer_cc_0, 0)) - self.connect((self.gr_multiply_const_vxx_0, 0), (self.channel_model_0, 0)) - self.connect((self.channel_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) self.connect((self.digital_cma_equalizer_cc_0, 0), (self.qtgui_sink_x_0_0, 0)) self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.qtgui_sink_x_0_0_0, 0)) + self.connect((self.gr_multiply_const_vxx_0, 0), (self.gr_channel_model_0, 0)) + self.connect((self.gr_channel_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) def get_sps(self): return self.sps @@ -195,7 +193,7 @@ class mpsk_stage4(gr.top_block, Qt.QWidget): def set_time_offset(self, time_offset): self.time_offset = time_offset self._time_offset_slider.setValue(self.time_offset) - self.channel_model_0.set_timing_offset(self.time_offset) + self.gr_channel_model_0.set_timing_offset(self.time_offset) def get_time_alpha(self): return self.time_alpha @@ -209,7 +207,7 @@ class mpsk_stage4(gr.top_block, Qt.QWidget): def set_taps(self, taps): self.taps = taps - self.channel_model_0.set_taps((self.taps)) + self.gr_channel_model_0.set_taps((self.taps)) def get_samp_rate(self): return self.samp_rate @@ -232,7 +230,7 @@ class mpsk_stage4(gr.top_block, Qt.QWidget): def set_noise_volt(self, noise_volt): self.noise_volt = noise_volt self._noise_volt_slider.setValue(self.noise_volt) - self.channel_model_0.set_noise_voltage(self.noise_volt) + self.gr_channel_model_0.set_noise_voltage(self.noise_volt) def get_freq_offset(self): return self.freq_offset @@ -240,7 +238,7 @@ class mpsk_stage4(gr.top_block, Qt.QWidget): def set_freq_offset(self, freq_offset): self.freq_offset = freq_offset self._freq_offset_slider.setValue(self.freq_offset) - self.channel_model_0.set_frequency_offset(self.freq_offset) + self.gr_channel_model_0.set_frequency_offset(self.freq_offset) def get_eq_gain(self): return self.eq_gain diff --git a/mpsk_stage5.grc b/mpsk_stage5.grc index 20b1bd8..15b230a 100644 --- a/mpsk_stage5.grc +++ b/mpsk_stage5.grc @@ -1,6 +1,6 @@ - Sat Sep 22 15:58:14 2012 + Fri Feb 8 09:00:52 2013 options @@ -637,76 +637,6 @@ - gr_multiply_const_vxx - - id - gr_multiply_const_vxx_0 - - - _enabled - True - - - type - complex - - - const - 0.5 - - - vlen - 1 - - - _coordinate - (463, 177) - - - _rotation - 0 - - - - channel_model - - id - channel_model_0 - - - _enabled - True - - - noise_voltage - noise_volt - - - freq_offset - freq_offset - - - epsilon - time_offset - - - taps - taps - - - seed - 0 - - - _coordinate - (680, 79) - - - _rotation - 0 - - - digital_costas_loop_cc id @@ -852,10 +782,10 @@ - digital_pfb_clock_sync_xxx + qtgui_sink_x id - digital_pfb_clock_sync_xxx_0 + qtgui_sink_x_0_0_0_0 _enabled @@ -863,43 +793,86 @@ type - ccf + complex - sps - sps + name + QT GUI Plot - alpha - 0.1 + fftsize + 1024 - beta - 0.25*0.1*0.1 + wintype + firdes.WIN_BLACKMAN_hARRIS - taps - rrc_taps + fc + 0 - filter_size - nfilts + bw + samp_rate - init_phase - nfilts/2 + plotfreq + False - max_dev - 1.5 + plotwaterfall + False - osps + plottime + False + + + plotconst + True + + + gui_hint + 0,0,1,1 + + + _coordinate + (1117, 137) + + + _rotation + 0 + + + + digital_cma_equalizer_cc + + id + digital_cma_equalizer_cc_0 + + + _enabled + True + + + num_taps + 15 + + + modulus + 1 + + + mu + eq_gain + + + sps 2 _coordinate - (570, 273) + (842, 254) _rotation @@ -907,10 +880,10 @@ - qtgui_sink_x + gr_multiply_const_vxx id - qtgui_sink_x_0_0_0_0 + gr_multiply_const_vxx_0 _enabled @@ -921,48 +894,55 @@ complex - name - QT GUI Plot + const + 0.5 - fftsize - 1024 + vlen + 1 - wintype - firdes.WIN_BLACKMAN_hARRIS + _coordinate + (463, 177) - fc + _rotation 0 + + + gr_channel_model - bw - samp_rate + id + gr_channel_model_0 - plotfreq - False + _enabled + True - plotwaterfall - False + noise_voltage + noise_volt - plottime - False + freq_offset + freq_offset - plotconst - True + epsilon + time_offset - gui_hint - 0,0,1,1 + taps + taps + + + seed + 0 _coordinate - (1117, 137) + (680, 79) _rotation @@ -970,34 +950,54 @@ - digital_cma_equalizer_cc + digital_pfb_clock_sync_xxx id - digital_cma_equalizer_cc_0 + digital_pfb_clock_sync_xxx_0 _enabled True - num_taps - 15 + type + ccf - modulus - 1 + sps + sps - mu - eq_gain + alpha + 0.1 - sps + beta + 0.25*0.1*0.1 + + + taps + rrc_taps + + + filter_size + nfilts + + + init_phase + nfilts/2 + + + max_dev + 1.5 + + + osps 2 _coordinate - (842, 254) + (570, 273) _rotation @@ -1035,26 +1035,26 @@ 0 - gr_multiply_const_vxx_0 - channel_model_0 + digital_costas_loop_cc_0 + qtgui_sink_x_0_0_0 0 0 - channel_model_0 - digital_pfb_clock_sync_xxx_0 + digital_cma_equalizer_cc_0 + qtgui_sink_x_0_0_0_0 0 0 - digital_costas_loop_cc_0 - qtgui_sink_x_0_0_0 + gr_multiply_const_vxx_0 + gr_channel_model_0 0 0 - digital_cma_equalizer_cc_0 - qtgui_sink_x_0_0_0_0 + gr_channel_model_0 + digital_pfb_clock_sync_xxx_0 0 0 diff --git a/mpsk_stage5.py b/mpsk_stage5.py index acb8631..4934c52 100755 --- a/mpsk_stage5.py +++ b/mpsk_stage5.py @@ -2,16 +2,14 @@ ################################################## # Gnuradio Python Flow Graph # Title: Mpsk Stage5 -# Generated: Sun Sep 23 16:18:42 2012 +# Generated: Fri Feb 8 09:00:52 2013 ################################################## from PyQt4 import Qt from gnuradio import digital from gnuradio import eng_notation -from gnuradio import filter from gnuradio import gr from gnuradio.eng_option import eng_option -from gnuradio.filter import firdes from gnuradio.gr import firdes from gnuradio.qtgui import qtgui from optparse import OptionParser @@ -155,6 +153,13 @@ class mpsk_stage5(gr.top_block, Qt.QWidget): self.top_grid_layout.addWidget(self._qtgui_sink_x_0_0_0_win, 0,1,1,1) self.gr_throttle_0 = gr.throttle(gr.sizeof_gr_complex*1, samp_rate) self.gr_multiply_const_vxx_0 = gr.multiply_const_vcc((0.5, )) + self.gr_channel_model_0 = gr.channel_model( + noise_voltage=noise_volt, + frequency_offset=freq_offset, + epsilon=time_offset, + taps=(taps), + noise_seed=0, + ) self.digital_psk_mod_0 = digital.psk.psk_mod( constellation_points=arity, mod_code="gray", @@ -168,13 +173,6 @@ class mpsk_stage5(gr.top_block, Qt.QWidget): self.digital_pfb_clock_sync_xxx_0.set_beta(0.25*0.1*0.1) self.digital_costas_loop_cc_0 = digital.costas_loop_cc(phase_bw, arity) self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(15, 1, eq_gain, 2) - self.channel_model_0 = filter.channel_model( - noise_voltage=noise_volt, - frequency_offset=freq_offset, - epsilon=time_offset, - taps=(taps), - noise_seed=0, - ) ################################################## # Connections @@ -184,10 +182,10 @@ class mpsk_stage5(gr.top_block, Qt.QWidget): self.connect((self.gr_throttle_0, 0), (self.gr_multiply_const_vxx_0, 0)) self.connect((self.digital_psk_mod_0, 0), (self.gr_throttle_0, 0)) self.connect((self.digital_cma_equalizer_cc_0, 0), (self.digital_costas_loop_cc_0, 0)) - self.connect((self.gr_multiply_const_vxx_0, 0), (self.channel_model_0, 0)) - self.connect((self.channel_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) self.connect((self.digital_costas_loop_cc_0, 0), (self.qtgui_sink_x_0_0_0, 0)) self.connect((self.digital_cma_equalizer_cc_0, 0), (self.qtgui_sink_x_0_0_0_0, 0)) + self.connect((self.gr_multiply_const_vxx_0, 0), (self.gr_channel_model_0, 0)) + self.connect((self.gr_channel_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) def get_sps(self): return self.sps @@ -209,7 +207,7 @@ class mpsk_stage5(gr.top_block, Qt.QWidget): def set_time_offset(self, time_offset): self.time_offset = time_offset self._time_offset_slider.setValue(self.time_offset) - self.channel_model_0.set_timing_offset(self.time_offset) + self.gr_channel_model_0.set_timing_offset(self.time_offset) def get_time_alpha(self): return self.time_alpha @@ -223,7 +221,7 @@ class mpsk_stage5(gr.top_block, Qt.QWidget): def set_taps(self, taps): self.taps = taps - self.channel_model_0.set_taps((self.taps)) + self.gr_channel_model_0.set_taps((self.taps)) def get_samp_rate(self): return self.samp_rate @@ -254,7 +252,7 @@ class mpsk_stage5(gr.top_block, Qt.QWidget): def set_noise_volt(self, noise_volt): self.noise_volt = noise_volt self._noise_volt_slider.setValue(self.noise_volt) - self.channel_model_0.set_noise_voltage(self.noise_volt) + self.gr_channel_model_0.set_noise_voltage(self.noise_volt) def get_freq_offset(self): return self.freq_offset @@ -262,7 +260,7 @@ class mpsk_stage5(gr.top_block, Qt.QWidget): def set_freq_offset(self, freq_offset): self.freq_offset = freq_offset self._freq_offset_slider.setValue(self.freq_offset) - self.channel_model_0.set_frequency_offset(self.freq_offset) + self.gr_channel_model_0.set_frequency_offset(self.freq_offset) def get_eq_gain(self): return self.eq_gain diff --git a/multipath_sim.grc b/multipath_sim.grc index 13cc735..aad15b5 100644 --- a/multipath_sim.grc +++ b/multipath_sim.grc @@ -1,6 +1,6 @@ - Sat Sep 22 13:33:33 2012 + Fri Feb 8 09:03:25 2013 options @@ -399,37 +399,6 @@ - gr_throttle - - id - gr_throttle_0 - - - _enabled - True - - - type - complex - - - samples_per_second - samp_rate - - - vlen - 1 - - - _coordinate - (248, 136) - - - _rotation - 0 - - - variable id @@ -476,38 +445,30 @@ - channel_model + gr_throttle id - channel_model_0 + gr_throttle_0 _enabled True - noise_voltage - 0.01 - - - freq_offset - 0 - - - epsilon - 1.0 + type + complex - taps - taps + samples_per_second + samp_rate - seed - 0 + vlen + 1 _coordinate - (457, 104) + (248, 136) _rotation @@ -549,10 +510,6 @@ samp_rate - rate - 10 - - plotfreq True @@ -573,12 +530,47 @@ 0,0,1,10 - freqchangevar - None + _coordinate + (752, 104) + + + _rotation + 0 + + + + gr_channel_model + + id + gr_channel_model_0 + + + _enabled + True + + + noise_voltage + 0.01 + + + freq_offset + 0 + + + epsilon + 1.0 + + + taps + taps + + + seed + 0 _coordinate - (752, 104) + (457, 104) _rotation @@ -593,12 +585,12 @@ gr_throttle_0 - channel_model_0 + gr_channel_model_0 0 0 - channel_model_0 + gr_channel_model_0 qtgui_sink_x_0 0 0 diff --git a/multipath_sim.py b/multipath_sim.py index 3d20ff6..efb2731 100755 --- a/multipath_sim.py +++ b/multipath_sim.py @@ -2,15 +2,13 @@ ################################################## # Gnuradio Python Flow Graph # Title: Multipath Sim -# Generated: Sun Sep 23 16:18:46 2012 +# Generated: Fri Feb 8 09:04:45 2013 ################################################## from PyQt4 import Qt from gnuradio import eng_notation -from gnuradio import filter from gnuradio import gr from gnuradio.eng_option import eng_option -from gnuradio.filter import firdes from gnuradio.gr import firdes from gnuradio.qtgui import qtgui from optparse import OptionParser @@ -104,7 +102,7 @@ class multipath_sim(gr.top_block, Qt.QWidget): self.top_grid_layout.addWidget(self._qtgui_sink_x_0_win, 0,0,1,10) self.gr_throttle_0 = gr.throttle(gr.sizeof_gr_complex*1, samp_rate) self.gr_noise_source_x_0 = gr.noise_source_c(gr.GR_GAUSSIAN, 1, 0) - self.channel_model_0 = filter.channel_model( + self.gr_channel_model_0 = gr.channel_model( noise_voltage=0.01, frequency_offset=0, epsilon=1.0, @@ -116,8 +114,8 @@ class multipath_sim(gr.top_block, Qt.QWidget): # Connections ################################################## self.connect((self.gr_noise_source_x_0, 0), (self.gr_throttle_0, 0)) - self.connect((self.gr_throttle_0, 0), (self.channel_model_0, 0)) - self.connect((self.channel_model_0, 0), (self.qtgui_sink_x_0, 0)) + self.connect((self.gr_throttle_0, 0), (self.gr_channel_model_0, 0)) + self.connect((self.gr_channel_model_0, 0), (self.qtgui_sink_x_0, 0)) def get_tap3(self): return self.tap3 @@ -162,7 +160,7 @@ class multipath_sim(gr.top_block, Qt.QWidget): def set_taps(self, taps): self.taps = taps - self.channel_model_0.set_taps((self.taps)) + self.gr_channel_model_0.set_taps((self.taps)) def get_samp_rate(self): return self.samp_rate -- 1.7.10.4