op25
/
op25-legacy
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change to use our fsk4 block 

git-svn-id: http://op25.osmocom.org/svn/trunk@311 65a5c917-d112-43f1-993d-58c26a4786be
This commit is contained in:
max 2013-03-04 23:32:26 +00:00
parent dd97ccc977
commit 49e53a33a6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repeater/src/python/disctap_rx.py
View File

@ -21,7 +21,7 @@
import sys import sys
import math import math
from gnuradio import gr, gru, audio, eng_notation, blks2, optfir, fsk4, repeater from gnuradio import gr, gru, audio, eng_notation, blks2, optfir, op25, repeater
from gnuradio.eng_option import eng_option from gnuradio.eng_option import eng_option
from optparse import OptionParser from optparse import OptionParser
@ -71,7 +71,7 @@ class my_top_block(gr.top_block):
SYMBOL_FILTER = gr.fir_filter_fff (symbol_decim, symbol_coeffs) SYMBOL_FILTER = gr.fir_filter_fff (symbol_decim, symbol_coeffs)
AMP = gr.multiply_const_ff(options.gain) AMP = gr.multiply_const_ff(options.gain)
msgq = gr.msg_queue(2) msgq = gr.msg_queue(2)
FSK4 = fsk4.demod_ff(msgq, sample_rate, symbol_rate) FSK4 = op25.fsk4_demod_ff(msgq, sample_rate, symbol_rate)
levels = levels = [-2.0, 0.0, 2.0, 4.0] levels = levels = [-2.0, 0.0, 2.0, 4.0]
SLICER = repeater.fsk4_slicer_fb(levels) SLICER = repeater.fsk4_slicer_fb(levels)
framer_msgq = gr.msg_queue(2) framer_msgq = gr.msg_queue(2)

4
repeater/src/python/scope.py
View File

@ -37,7 +37,7 @@ import time
import re import re
import Numeric import Numeric
from gnuradio import audio, eng_notation, fsk4, gr, gru, repeater from gnuradio import audio, eng_notation, op25, gr, gru, repeater
from gnuradio import blks2 from gnuradio import blks2
from gnuradio.eng_option import eng_option from gnuradio.eng_option import eng_option
from gnuradio.wxgui import stdgui2, fftsink2, scopesink2, form from gnuradio.wxgui import stdgui2, fftsink2, scopesink2, form
@ -173,7 +173,7 @@ class p25_rx_block (stdgui2.std_top_block):
self.symbol_filter = gr.fir_filter_fff(symbol_decim, rrc_coeffs) self.symbol_filter = gr.fir_filter_fff(symbol_decim, rrc_coeffs)
autotuneq = gr.msg_queue(2) autotuneq = gr.msg_queue(2)
self.fsk4_demod = fsk4.demod_ff(autotuneq, self.basic_rate, self.symbol_rate) self.fsk4_demod = op25.fsk4_demod_ff(autotuneq, self.basic_rate, self.symbol_rate)
self.null_sym = gr.null_sink(gr.sizeof_float) self.null_sym = gr.null_sink(gr.sizeof_float)

4
repeater/src/python/usrp_rx.py
View File

@ -23,7 +23,7 @@
# #
from gnuradio import gr, gru, eng_notation, optfir from gnuradio import gr, gru, eng_notation, optfir
from gnuradio import usrp, fsk4 from gnuradio import usrp, op25
from gnuradio import repeater from gnuradio import repeater
from gnuradio import blks2 from gnuradio import blks2
from gnuradio.eng_option import eng_option from gnuradio.eng_option import eng_option
@ -129,7 +129,7 @@ class rx_channel_c4fm(gr.hier_block2):
# C4FM demodulator # C4FM demodulator
autotuneq = gr.msg_queue(2) autotuneq = gr.msg_queue(2)
demod_fsk4 = fsk4.demod_ff(autotuneq, channel_rate, symbol_rate) demod_fsk4 = op25.fsk4_demod_ff(autotuneq, channel_rate, symbol_rate)
self.connect (self, chan, fm_demod, symbol_filter, demod_fsk4, self) self.connect (self, chan, fm_demod, symbol_filter, demod_fsk4, self)