Make usrp_p25_rx_gl.py use the slicer and new signature for decoder.
git-svn-id: http://op25.osmocom.org/svn/trunk@264 65a5c917-d112-43f1-993d-58c26a4786be
This commit is contained in:
parent
8ee7040a76
commit
1d362ffe53
|
@ -268,8 +268,8 @@ class p25_rx_block (stdgui2.std_top_block):
|
|||
self.traffic = TrafficPane(self.notebook)
|
||||
self.notebook.AddPage(self.traffic, "Traffic")
|
||||
# Setup the decoder and report the TUN/TAP device name
|
||||
self.decode_watcher = decode_watcher(msgq, self.traffic)
|
||||
self.p25_decoder = op25.decoder_bf()
|
||||
self.decode_watcher = decode_watcher(msgq, self.traffic)
|
||||
self.p25_decoder.set_msgq(gr.msg_queue(2))
|
||||
self.frame.SetStatusText("Destination: " + self.p25_decoder.destination())
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# -*- mode: Python -*-
|
||||
|
||||
# Copyright 2008 Steve Glass
|
||||
# Copyright 2008-2011 Steve Glass
|
||||
#
|
||||
# This file is part of OP25.
|
||||
#
|
||||
|
@ -170,6 +170,9 @@ class p25_rx_block (stdgui2.std_top_block):
|
|||
autotuneq = gr.msg_queue(2)
|
||||
self.demod_watcher = demod_watcher(autotuneq, self.adjust_channel_offset)
|
||||
demod_fsk4 = fsk4.demod_ff(autotuneq, channel_rate, self.symbol_rate)
|
||||
# symbol slicer
|
||||
levels = [ -2.0, 0.0, 2.0, 4.0 ]
|
||||
slicer = op25.fsk4_slicer_fb(levels)
|
||||
# ALSA output device (if not locked)
|
||||
try:
|
||||
sink = audio.sink(8000, "plughw:0,0", True) # ToDo: get actual device from prefs
|
||||
|
@ -177,7 +180,7 @@ class p25_rx_block (stdgui2.std_top_block):
|
|||
sink = gr.null_sink(gr.sizeof_float)
|
||||
|
||||
# connect it all up
|
||||
self.__connect([[source, self.channel_filter, self.squelch, fm_demod, symbol_filter, demod_fsk4, self.p25_decoder, sink],
|
||||
self.__connect([[source, self.channel_filter, self.squelch, fm_demod, symbol_filter, demod_fsk4, slicer, self.p25_decoder, sink],
|
||||
[source, self.spectrum],
|
||||
[symbol_filter, self.signal_scope],
|
||||
[demod_fsk4, self.symbol_scope]])
|
||||
|
@ -299,7 +302,7 @@ class p25_rx_block (stdgui2.std_top_block):
|
|||
# Setup the decoder and report the TUN/TAP device name
|
||||
msgq = gr.msg_queue(2)
|
||||
self.decode_watcher = decode_watcher(msgq, self.traffic)
|
||||
self.p25_decoder = op25.decoder_ff()
|
||||
self.p25_decoder = op25.decoder_bf()
|
||||
self.p25_decoder.set_msgq(msgq)
|
||||
self.frame.SetStatusText("Destination: " + self.p25_decoder.destination())
|
||||
|
||||
|
|
Reference in New Issue