bugfix + touchup
This commit is contained in:
parent
c26b51e0c1
commit
57a682d5f0
|
@ -155,7 +155,7 @@ class channel(object):
|
||||||
for plot in config['plot'].split(','):
|
for plot in config['plot'].split(','):
|
||||||
if plot == 'datascope':
|
if plot == 'datascope':
|
||||||
assert config['demod_type'] == 'fsk4' ## datascope plot requires fsk4 demod type
|
assert config['demod_type'] == 'fsk4' ## datascope plot requires fsk4 demod type
|
||||||
sink = eye_sink_f(sps=config['if_rate'] / self.symbol_rate)
|
sink = eye_sink_f(sps=config['if_rate'] // self.symbol_rate)
|
||||||
self.demod.connect_bb('symbol_filter', sink)
|
self.demod.connect_bb('symbol_filter', sink)
|
||||||
self.kill_sink.append(sink)
|
self.kill_sink.append(sink)
|
||||||
elif plot == 'symbol':
|
elif plot == 'symbol':
|
||||||
|
@ -247,6 +247,7 @@ class rx_main(object):
|
||||||
else:
|
else:
|
||||||
config = json.loads(open(options.config_file).read())
|
config = json.loads(open(options.config_file).read())
|
||||||
self.tb = rx_block(options.verbosity, config = byteify(config))
|
self.tb = rx_block(options.verbosity, config = byteify(config))
|
||||||
|
sys.stderr.write('python version detected: %s\n' % sys.version)
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -103,7 +103,7 @@ class p25_demod_base(gr.hier_block2):
|
||||||
gain_adj = 1.8 # for nxdn48 6.25 KHz
|
gain_adj = 1.8 # for nxdn48 6.25 KHz
|
||||||
if self.symbol_rate == 4800:
|
if self.symbol_rate == 4800:
|
||||||
gain_adj = 0.77 # nxdn96 12.5 KHz
|
gain_adj = 0.77 # nxdn96 12.5 KHz
|
||||||
coeffs = [x * gain_adj for x in coeffs]
|
coeffs = coeffs * gain_adj
|
||||||
if filter_type == 'gmsk':
|
if filter_type == 'gmsk':
|
||||||
# lifted from gmsk.py
|
# lifted from gmsk.py
|
||||||
_omega = sps
|
_omega = sps
|
||||||
|
|
|
@ -701,6 +701,7 @@ class rx_main(object):
|
||||||
self.cli_options()
|
self.cli_options()
|
||||||
self.tb = p25_rx_block(self.options)
|
self.tb = p25_rx_block(self.options)
|
||||||
self.q_watcher = du_queue_watcher(self.tb.output_q, self.process_qmsg)
|
self.q_watcher = du_queue_watcher(self.tb.output_q, self.process_qmsg)
|
||||||
|
sys.stderr.write('python version detected: %s\n' % sys.version)
|
||||||
|
|
||||||
def process_qmsg(self, msg):
|
def process_qmsg(self, msg):
|
||||||
if self.tb.process_qmsg(msg):
|
if self.tb.process_qmsg(msg):
|
||||||
|
|
Loading…
Reference in New Issue