diff --git a/op25/gr-op25_repeater/apps/rx.py b/op25/gr-op25_repeater/apps/rx.py index 6717d32..0206b50 100755 --- a/op25/gr-op25_repeater/apps/rx.py +++ b/op25/gr-op25_repeater/apps/rx.py @@ -184,7 +184,7 @@ class p25_rx_block (gr.top_block): # setup (read-only) attributes self.symbol_rate = 4800 self.symbol_deviation = 600.0 - self.basic_rate = 48000 + self.basic_rate = 24000 _default_speed = 4800 # keep track of flow graph connections @@ -529,15 +529,6 @@ class p25_rx_block (gr.top_block): pickle.dump(self.info, f) f.close() - # Adjust the channel offset - # - def adjust_channel_offset(self, delta_hz): - max_delta_hz = 12000.0 - delta_hz *= self.symbol_deviation - delta_hz = max(delta_hz, -max_delta_hz) - delta_hz = min(delta_hz, max_delta_hz) - self.channel_filter.set_center_freq(self.channel_offset - delta_hz+ self.options.offset) - def open_ifile(self, capture_rate, gain, input_filename, file_seek): speed = 96000 # TODO: fixme ifile = blocks.file_source(gr.sizeof_gr_complex, input_filename, 1) @@ -588,19 +579,6 @@ class p25_rx_block (gr.top_block): # except Exception, x: # wx.MessageBox("Cannot open USRP: " + x.message, "USRP Error", wx.CANCEL | wx.ICON_EXCLAMATION) - # Set the channel offset - # - def set_channel_offset(self, offset_hz, scale, units): - self.channel_offset = -offset_hz - self.channel_filter.set_center_freq(self.channel_offset+ self.options.offset) - self.frame.SetStatusText("Channel offset: " + str(offset_hz * scale) + units, 1) - - # Set the RF squelch threshold level - # - def set_squelch_threshold(self, squelch_db): - self.squelch.set_threshold(squelch_db) - self.frame.SetStatusText("Squelch: " + str(squelch_db) + "dB", 2) - def process_qmsg(self, msg): # return true = end top block RX_COMMANDS = 'skip lockout hold'