From ff876f7cc310bbdf1c5d05f85daba0afdb33561a Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 6 Mar 2010 17:15:33 -0500 Subject: Fixing how new pick_bitrate is used. --- gnuradio-examples/python/digital/benchmark_qt_rx2.py | 1 + 1 file changed, 1 insertion(+) (limited to 'gnuradio-examples') diff --git a/gnuradio-examples/python/digital/benchmark_qt_rx2.py b/gnuradio-examples/python/digital/benchmark_qt_rx2.py index d6338f853..4de15e480 100755 --- a/gnuradio-examples/python/digital/benchmark_qt_rx2.py +++ b/gnuradio-examples/python/digital/benchmark_qt_rx2.py @@ -268,6 +268,7 @@ class my_top_block(gr.top_block): (self._bitrate, self._samples_per_symbol, self._decim) = \ pick_rx_bitrate(options.bitrate, self._demod_class.bits_per_symbol(), \ + options.samples_per_symbol, options.decim, \ adc_rate, self.u.get_decim_rates()) self.u.set_decim(self._decim) -- cgit From ebd5449ebf8c08f78cada720eb47769bdfaa4bde Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 6 Mar 2010 17:16:19 -0500 Subject: Small fixes for loopback with new code. --- gnuradio-examples/python/digital/benchmark_loopback.py | 5 +++++ gnuradio-examples/python/digital/benchmark_qt_loopback2.py | 7 +++++++ 2 files changed, 12 insertions(+) (limited to 'gnuradio-examples') diff --git a/gnuradio-examples/python/digital/benchmark_loopback.py b/gnuradio-examples/python/digital/benchmark_loopback.py index 4cc4a7bee..47e4f2028 100755 --- a/gnuradio-examples/python/digital/benchmark_loopback.py +++ b/gnuradio-examples/python/digital/benchmark_loopback.py @@ -44,6 +44,11 @@ class my_top_block(gr.top_block): noise_power = power_in_signal/SNR noise_voltage = math.sqrt(noise_power) + # With new interface, sps does not get set by default, but + # in the loopback, we don't recalculate it; so just force it here + if(options.samples_per_symbol == None): + options.samples_per_symbol = 2 + self.txpath = transmit_path(mod_class, options) self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate) self.rxpath = receive_path(demod_class, rx_callback, options) diff --git a/gnuradio-examples/python/digital/benchmark_qt_loopback2.py b/gnuradio-examples/python/digital/benchmark_qt_loopback2.py index 1cb95198e..1f236fd7f 100755 --- a/gnuradio-examples/python/digital/benchmark_qt_loopback2.py +++ b/gnuradio-examples/python/digital/benchmark_qt_loopback2.py @@ -223,6 +223,11 @@ class my_top_block(gr.top_block): self._noise_voltage = self.get_noise_voltage(self._snr_dB) + # With new interface, sps does not get set by default, but + # in the loopback, we don't recalculate it; so just force it here + if(options.samples_per_symbol == None): + options.samples_per_symbol = 2 + self.txpath = transmit_path(mod_class, options) self.throttle = gr.throttle(gr.sizeof_gr_complex, self.sample_rate()) self.rxpath = receive_path(demod_class, rx_callback, options) @@ -269,6 +274,7 @@ class my_top_block(gr.top_block): self.phase_recov = self.rxpath.packet_receiver._demodulator.phase_recov self.time_recov = self.rxpath.packet_receiver._demodulator.time_recov self.freq_recov.set_alpha(self._gain_freq) + self.freq_recov.set_beta(self._gain_freq/10.0) self.phase_recov.set_alpha(self._gain_phase) self.phase_recov.set_beta(0.25*self._gain_phase*self._gain_phase) self.time_recov.set_alpha(self._gain_clock) @@ -367,6 +373,7 @@ class my_top_block(gr.top_block): self._gain_freq = gain_freq #self._gain_freq_beta = .25 * self._gain_freq * self._gain_freq self.rxpath.packet_receiver._demodulator.freq_recov.set_alpha(self._gain_freq) + self.rxpath.packet_receiver._demodulator.freq_recov.set_beta(self._gain_freq/10.0) #self.rxpath.packet_receiver._demodulator.freq_recov.set_beta(self._gain_fre_beta) -- cgit From 1ba78b5f4c6bc2468b6fb798f41837a8ab2be89b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 6 Mar 2010 17:17:29 -0500 Subject: Changing FLL parameter range for use with new code. --- gnuradio-examples/grc/demod/digital_freq_lock.grc | 210 ++++++++++---------- gnuradio-examples/grc/demod/pam_sync.grc | 222 +++++++++++----------- 2 files changed, 216 insertions(+), 216 deletions(-) (limited to 'gnuradio-examples') diff --git a/gnuradio-examples/grc/demod/digital_freq_lock.grc b/gnuradio-examples/grc/demod/digital_freq_lock.grc index 37ee8123e..36037febb 100644 --- a/gnuradio-examples/grc/demod/digital_freq_lock.grc +++ b/gnuradio-examples/grc/demod/digital_freq_lock.grc @@ -1,6 +1,6 @@ - Fri Jan 29 18:10:00 2010 + Sat Mar 6 17:17:12 2010 options @@ -980,54 +980,50 @@ - variable_slider + root_raised_cosine_filter id - alpha + root_raised_cosine_filter_0 _enabled True - label - Freq Alpha - - - value - 0 + type + interp_fir_filter_ccf - min - 0 + decim + 1 - max - 0.001 + interp + spb_gen - num_steps - 1000 + gain + 2*spb_gen - style - wx.SL_HORIZONTAL + samp_rate + 1.0 - converver - float_converter + sym_rate + 1./spb_gen - grid_pos - + alpha + rolloff - notebook - + ntaps + 44 _coordinate - (552, 4) + (978, 157) _rotation @@ -1035,105 +1031,81 @@ - variable_slider + gr_fll_band_edge_cc id - beta + gr_fll_band_edge_cc_0 _enabled True - label - Freq Beta - - - value - 0 - - - min - 0.0 - - - max - 0.0001 + type + cc - num_steps - 1000 + samps_per_sym + spb_gen - style - wx.SL_HORIZONTAL + rolloff + rolloff - converver - float_converter + filter_size + 44 - grid_pos - + alpha + alpha - notebook - + beta + beta _coordinate - (668, 5) + (874, 664) _rotation - 180 + 0 - root_raised_cosine_filter + gr_channel_model id - root_raised_cosine_filter_0 + gr_channel_model_0 _enabled True - type - interp_fir_filter_ccf - - - decim - 1 - - - interp - spb_gen + noise_voltage + noise_amp - gain - 2*spb_gen + freq_offset + freq_offset - samp_rate + epsilon 1.0 - sym_rate - 1./spb_gen - - - alpha - rolloff + taps + 1.0 - ntaps - 44 + seed + 42 _coordinate - (978, 157) + (618, 376) _rotation @@ -1141,81 +1113,109 @@ - gr_fll_band_edge_cc + variable_slider id - gr_fll_band_edge_cc_0 + beta _enabled True - type - cc + label + Freq Beta - samps_per_sym - spb_gen + value + 0 - rolloff - rolloff + min + 0.0 - filter_size - 44 + max + 0.01 - alpha - alpha + num_steps + 1000 - beta - beta + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + _coordinate - (874, 664) + (668, 5) _rotation - 0 + 180 - gr_channel_model + variable_slider id - gr_channel_model_0 + alpha _enabled True - noise_voltage - noise_amp + label + Freq Alpha - freq_offset - freq_offset + value + 0 - epsilon - 1.0 + min + 0 - taps - 1.0 + max + 0.1 - seed - 42 + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + _coordinate - (618, 376) + (552, 4) _rotation diff --git a/gnuradio-examples/grc/demod/pam_sync.grc b/gnuradio-examples/grc/demod/pam_sync.grc index 80a7aef0c..8571995a5 100644 --- a/gnuradio-examples/grc/demod/pam_sync.grc +++ b/gnuradio-examples/grc/demod/pam_sync.grc @@ -1,6 +1,6 @@ - Mon Feb 1 18:58:32 2010 + Sat Mar 6 17:17:22 2010 options @@ -709,116 +709,6 @@ 0 - - variable_slider - - id - freq_beta - - - _enabled - True - - - label - Freq Beta - - - value - 0 - - - min - 0.0 - - - max - 0.0001 - - - num_steps - 1000 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (836, 9) - - - _rotation - 180 - - - - variable_slider - - id - freq_alpha - - - _enabled - True - - - label - Freq Alpha - - - value - 0 - - - min - 0 - - - max - 0.001 - - - num_steps - 1000 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (734, 10) - - - _rotation - 0 - - variable_slider @@ -1621,6 +1511,116 @@ 0 + + variable_slider + + id + freq_alpha + + + _enabled + True + + + label + Freq Alpha + + + value + 0 + + + min + 0 + + + max + 0.1 + + + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (734, 10) + + + _rotation + 0 + + + + variable_slider + + id + freq_beta + + + _enabled + True + + + label + Freq Beta + + + value + 0 + + + min + 0.0 + + + max + 0.01 + + + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (836, 9) + + + _rotation + 180 + + random_source_x_0 gr_uchar_to_float_0 -- cgit