pull numpy out of the int-and-dump generator

This commit is contained in:
Nick Foster 2011-05-30 20:54:24 -07:00
parent 52ebfcf4d4
commit a1249b8c4d

View File

@ -34,7 +34,6 @@ from modes_sql import modes_output_sql
from modes_sbs1 import modes_output_sbs1 from modes_sbs1 import modes_output_sbs1
from modes_kml import modes_kml from modes_kml import modes_kml
import gnuradio.gr.gr_threading as _threading import gnuradio.gr.gr_threading as _threading
import numpy
class top_block_runner(_threading.Thread): class top_block_runner(_threading.Thread):
def __init__(self, tb): def __init__(self, tb):
@ -97,9 +96,10 @@ class adsb_rx_block (gr.top_block):
#this is an integrate-and-dump filter to act as a matched filter #this is an integrate-and-dump filter to act as a matched filter
#for the essentially rectangular Mode S pulses. #for the essentially rectangular Mode S pulses.
#you could get fancy here and shape it accordingly but i'm pretty self.filtcoeffs = list()
#sure you wouldn't get anything out of it for i in range(int(rate/2e6)):
self.filtcoeffs = list(numpy.ones(int(rate/2e6))) self.filtcoeffs.append(1.0 / (rate/2e6))
#i think downstream blocks can therefore process at 2Msps -- try this #i think downstream blocks can therefore process at 2Msps -- try this
#self.filter = gr.fir_filter_fff(int(rate/2e6), self.filtcoeffs) #self.filter = gr.fir_filter_fff(int(rate/2e6), self.filtcoeffs)
self.filter = gr.fir_filter_fff(1, self.filtcoeffs) self.filter = gr.fir_filter_fff(1, self.filtcoeffs)