From d2107cd98e683e10645f64d61a2544b628a955ea Mon Sep 17 00:00:00 2001 From: tvoid Date: Fri, 11 Apr 2008 12:24:41 -0600 Subject: refactor gsm_scan.py --- gsm-tvoid/src/lib/gsm_burst.cc | 25 ++- gsm-tvoid/src/python/gsm_scan.py | 430 ++++++++++++++++++++++----------------- 2 files changed, 255 insertions(+), 200 deletions(-) diff --git a/gsm-tvoid/src/lib/gsm_burst.cc b/gsm-tvoid/src/lib/gsm_burst.cc index 14950c6..c7f0acc 100755 --- a/gsm-tvoid/src/lib/gsm_burst.cc +++ b/gsm-tvoid/src/lib/gsm_burst.cc @@ -197,7 +197,17 @@ void gsm_burst::print_burst(void) int print = 0; //fprintf(stderr,"p=%8.8X ", d_print_options); - + + if ( PRINT_GSM_DECODE & d_print_options ) { + + /* + * Pass information to GSM stack. GSM stack will try to extract + * information (fn, layer 2 messages, ...) + */ + diff_decode_burst(); + GS_process(&d_gs_ctx, d_ts, d_burst_type, d_decoded_burst); + } + if ( PRINT_EVERYTHING == d_print_options ) print = 1; else if ( (!d_ts) && (d_print_options & PRINT_TS0) ) @@ -224,18 +234,7 @@ void gsm_burst::print_burst(void) fprintf(stderr," "); } - - if ( PRINT_GSM_DECODE == d_print_options ) { - - /* - * Pass information to GSM stack. GSM stack will try to extract - * information (fn, layer 2 messages, ...) - */ - diff_decode_burst(); - GS_process(&d_gs_ctx, d_ts, d_burst_type, d_decoded_burst); - } - if (print) { fprintf(stderr,"%d/%d/%+d/%lu/%lu ", @@ -278,7 +277,7 @@ void gsm_burst::print_burst(void) break; } - fprintf(stderr,"\n"); + fprintf(stderr,"\n"); //print the correlation pattern for visual inspection diff --git a/gsm-tvoid/src/python/gsm_scan.py b/gsm-tvoid/src/python/gsm_scan.py index 620bf9f..5e3edfc 100755 --- a/gsm-tvoid/src/python/gsm_scan.py +++ b/gsm-tvoid/src/python/gsm_scan.py @@ -9,7 +9,6 @@ # * Wideband (multi-channel) processing (usrp and/or file input) # * Automatic beacon scan (quick scan RSSI, then check for BCCH) # * AGC -# * Refactor, this is too messy import sys @@ -28,7 +27,7 @@ from math import pi import wx import gsm - +#################### class burst_callback(gr.feval_ll): def __init__(self, fg): gr.feval_ll.__init__(self) @@ -36,6 +35,7 @@ class burst_callback(gr.feval_ll): self.offset_mean_num = 10 #number of FCCH offsets to average self.offset_vals = [] +#################### def eval(self, x): #print "burst_callback: eval(",x,")\n"; try: @@ -84,6 +84,7 @@ class burst_callback(gr.feval_ll): print >> sys.stderr, "burst_callback: Exception: ", e +#################### def pick_subdevice(u): if u.db[0][0].dbid() >= 0: return (0, 0) @@ -91,6 +92,7 @@ def pick_subdevice(u): return (1, 0) return (0, 0) +#################### def get_freq_from_arfcn(chan,region): #P/E/R-GSM 900 @@ -127,16 +129,36 @@ def get_freq_from_arfcn(chan,region): return freq * 1e6 +#################### class app_flow_graph(stdgui.gui_flow_graph): + def __init__(self, frame, panel, vbox, argv): stdgui.gui_flow_graph.__init__(self) - #testing - self.status_msg = "Started." - self.frame = frame self.panel = panel + self.parse_options() + self.setup_flowgraph() + self.setup_print_options() + self._build_gui(vbox) + + #some non-gui wxwindows handlers + self.t1 = wx.Timer(self.frame) + self.t1.Start(5000,0) + self.frame.Bind(wx.EVT_TIMER, self.on_tick) + + #bind the idle routing for message_queue processing + self.frame.Bind(wx.EVT_IDLE, self.on_idle) + #tune + self.set_channel(self.channel) + + #giddyup + self.status_msg = "Started." + + +#################### + def parse_options(self): parser = OptionParser(option_class=eng_option) #view options @@ -146,19 +168,13 @@ class app_flow_graph(stdgui.gui_flow_graph): help="What to print on console. [default=%default]\n" + "(n)othing, (e)verything, (s)tatus, (a)ll Types, (k)nown, (u)nknown, \n" + "TS(0), (F)CCH, (S)CH, (N)ormal, (D)ummy\n" + - "Usefull (b)its, All TS (B)its, (C)orrelation bits, he(x) burst data, \n" + + "Usefull (b)its, All TS (B)its, (C)orrelation bits, he(x) raw burst data, \n" + "(d)ecoded hex for gsmdecode") #decoder options parser.add_option("-D", "--decoder", type="string", default="f", help="Select decoder block to use. (c)omplex,(f)loat [default=%default]") - parser.add_option("-d", "--decim", type="int", default=112, - help="Set fgpa decimation rate to DECIM [default=%default]") - parser.add_option("-o", "--offset", type="eng_float", default=0.0, - help="Tuning offset frequency") - parser.add_option("-C", "--clock-offset", type="eng_float", default=0.0, - help="Sample clock offset frequency") parser.add_option("-E", "--equalizer", type="string", default="none", help="Type of equalizer to use. none, fixed-dfe [default=%default]") parser.add_option("-t", "--timing", type="string", default="cn", @@ -169,6 +185,8 @@ class app_flow_graph(stdgui.gui_flow_graph): parser.add_option("-T", "--tuning", type="string", default="oh", help="Type of tuning to perform. [default=%default] \n" + "(n)one, (o)ffset adjustment, (h)opping ") + parser.add_option("-o", "--offset", type="eng_float", default=0.0, + help="Tuning offset frequency") #file options parser.add_option("-I", "--inputfile", type="string", default=None, @@ -179,6 +197,8 @@ class app_flow_graph(stdgui.gui_flow_graph): help="Continuously loop data from input file") #usrp options + parser.add_option("-d", "--decim", type="int", default=112, + help="Set USRP decimation rate to DECIM [default=%default]") parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None, help="Select USRP Rx side A or B (default=first one with a daughterboard)") parser.add_option("--fusb-block-size", type="int", default=0, @@ -187,6 +207,8 @@ class app_flow_graph(stdgui.gui_flow_graph): help="Set USRP block buffers") parser.add_option("--realtime",action="store_true", dest="realtime", help="Use realtime scheduling.") + parser.add_option("-C", "--clock-offset", type="eng_float", default=0.0, + help="Sample clock offset frequency") #FIXME: gain not working? parser.add_option("-g", "--gain", type="eng_float", default=None, @@ -202,55 +224,85 @@ class app_flow_graph(stdgui.gui_flow_graph): parser.print_help() sys.exit(1) +# if (options.inputfile and ( options.freq or options.rx_subdev_spec or options.gain)): +# print "datafile option cannot be used with USRP options." +# sys.exit(1) + + self.options = options self.scopes = options.scopes self.region = options.region self.channel = options.channel self.offset = options.offset - self.mean_offset = 0.0 #this is relative averaged freq offset - +#################### + def setup_print_options(self): + options = self.options + self.print_status = options.print_console.count('s') - + if options.print_console.count('e'): self.print_status = 1 - -# if (options.inputfile and ( options.freq or options.rx_subdev_spec or options.gain)): -# print "datafile option cannot be used with USRP options." -# sys.exit(1) + #console print options + popts = 0 - #adjust or caclulate sample clock - clock_rate = 64e6 - if options.clock_offset: - clock_rate = 64e6 + options.clock_offset - elif options.channel: - f = get_freq_from_arfcn(options.channel,options.region) - if f: - percent_offset = options.offset / get_freq_from_arfcn(options.channel,options.region) - else: - percent_offset = 0.0 - - clock_rate += clock_rate * percent_offset - print >> sys.stderr, "% offset = ", percent_offset, "clock = ", clock_rate - - #set the default input rate, we will check with the USRP if it is being used - input_rate = clock_rate / options.decim - gsm_symb_rate = 1625000.0 / 6.0 - sps = input_rate/gsm_symb_rate + if options.print_console.count('d'): + popts |= gsm.PRINT_GSM_DECODE - # Attempt to enable realtime scheduling - if options.realtime: - r = gr.enable_realtime_scheduling() - if r == gr.RT_OK: - realtime = True - print >> sys.stderr, "Realtime scheduling ENABLED" - else: - realtime = False - print >> sys.stderr, "Realtime scheduling FAILED" + if options.print_console.count('s'): + popts |= gsm.PRINT_STATE + + if options.print_console.count('e'): + popts |= gsm.PRINT_EVERYTHING + + if options.print_console.count('a'): + popts |= gsm.PRINT_ALL_TYPES + + if options.print_console.count('k'): + popts |= gsm.PRINT_KNOWN + + if options.print_console.count('u'): + popts |= gsm.PRINT_UNKNOWN + + if options.print_console.count('0'): + popts |= gsm.PRINT_TS0 + + if options.print_console.count('F'): + popts |= gsm.PRINT_FCCH + + if options.print_console.count('S'): + popts |= gsm.PRINT_SCH + + if options.print_console.count('N'): + popts |= gsm.PRINT_NORMAL + + if options.print_console.count('D'): + popts |= gsm.PRINT_DUMMY + + if options.print_console.count('C'): + popts |= gsm.PRINT_BITS | gsm.PRINT_CORR_BITS + + if options.print_console.count('x'): + popts |= gsm.PRINT_BITS | gsm.PRINT_HEX + + if options.print_console.count('B'): + popts |= gsm.PRINT_BITS | gsm.PRINT_ALL_BITS + + elif options.print_console.count('b'): + popts |= gsm.PRINT_BITS + + print "Print flags: 0x%8.8x\n" %(popts) + + self.burst.d_print_options = popts + + +#################### + def setup_usrp(self): + options = self.options #set resonable defaults if no user prefs set - if options.realtime: # be more aggressive + if options.realtime: if options.fusb_block_size == 0: options.fusb_block_size = gr.prefs().get_long('fusb', 'rt_block_size', 1024) if options.fusb_nblocks == 0: @@ -264,33 +316,55 @@ class app_flow_graph(stdgui.gui_flow_graph): print >> sys.stderr, "fusb_block_size =", options.fusb_block_size print >> sys.stderr, "fusb_nblocks =", options.fusb_nblocks - # Build the flowgraph - # Setup our input source - if options.inputfile: - self.using_usrp = False - print >> sys.stderr, "Reading data from: " + options.inputfile - self.source = gr.file_source(gr.sizeof_gr_complex, options.inputfile, options.fileloop) - else: - self.using_usrp = True - self.u = usrp.source_c(decim_rate=options.decim,fusb_block_size=options.fusb_block_size,fusb_nblocks=options.fusb_nblocks) - - if options.rx_subdev_spec is None: - options.rx_subdev_spec = pick_subdevice(self.u) - self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec)) + + self.ursp = usrp.source_c(decim_rate=options.decim,fusb_block_size=options.fusb_block_size,fusb_nblocks=options.fusb_nblocks) + + if options.rx_subdev_spec is None: + options.rx_subdev_spec = pick_subdevice(self.ursp) + + self.ursp.set_mux(usrp.determine_rx_mux_value(self.ursp, options.rx_subdev_spec)) + + # determine the daughterboard subdevice + self.subdev = usrp.selected_subdev(self.ursp, options.rx_subdev_spec) + input_rate = self.ursp.adc_freq() / self.ursp.decim_rate() + + # set initial values + if options.gain is None: + # if no gain was specified, use the mid-point in dB + g = self.subdev.gain_range() + options.gain = float(g[0]+g[1])/2 - # determine the daughterboard subdevice - self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec) - input_rate = self.u.adc_freq() / self.u.decim_rate() + self.set_gain(options.gain) + + self.source = self.ursp - # set initial values - if options.gain is None: - # if no gain was specified, use the mid-point in dB - g = self.subdev.gain_range() - options.gain = float(g[0]+g[1])/2 +#################### + def setup_timing(self): + options = self.options + clock_rate = 64e6 - self.set_gain(options.gain) + if options.clock_offset: + clock_rate = 64e6 + options.clock_offset + elif options.channel: + #calculate actual clock rate based on frequency offset (assumes shared clock for sampling and tuning) + f = get_freq_from_arfcn(options.channel,options.region) + if f: + percent_offset = options.offset / get_freq_from_arfcn(options.channel,options.region) + else: + percent_offset = 0.0 + + clock_rate += clock_rate * percent_offset + print >> sys.stderr, "% offset = ", percent_offset, "clock = ", clock_rate + + self.clock_rate = clock_rate + self.input_rate = clock_rate / options.decim + self.gsm_symb_rate = 1625000.0 / 6.0 + self.sps = self.input_rate / self.gsm_symb_rate + +#################### + def setup_filter(self): + options = self.options - # configure the processing blocks # configure channel filter filter_cutoff = 145e3 #135,417Hz is GSM bandwidth filter_t_width = 10e3 @@ -302,63 +376,70 @@ class app_flow_graph(stdgui.gui_flow_graph): else: offset = 0.0 - #TODO: try a differnet filter for latency (and CPU) - filter_taps = gr.firdes.low_pass(1.0, input_rate, filter_cutoff, filter_t_width, gr.firdes.WIN_HAMMING) - self.filter = gr.freq_xlating_fir_filter_ccf(1, filter_taps, offset, input_rate) + filter_taps = gr.firdes.low_pass(1.0, self.input_rate, filter_cutoff, filter_t_width, gr.firdes.WIN_HAMMING) + self.filter = gr.freq_xlating_fir_filter_ccf(1, filter_taps, offset, self.input_rate) - # Connect the blocks - if self.scopes.count("I"): - self.input_fft_scope = fftsink.fft_sink_c (self, panel, fft_size=1024, sample_rate=input_rate) - - if options.inputfile: - self.connect(self.source, self.filter) - if self.scopes.count("I"): - self.connect(self.source, self.input_fft_scope) - else: - self.connect(self.u, self.filter) - if self.scopes.count("I"): - self.connect(self.u, self.input_fft_scope) + self.connect(self.source, self.filter) - #create a tuner callback - self.burst_cb = burst_callback(self) +#################### + def setup_f_flowgraph(self): + # configure demodulator + # adjust the phase gain for sampling rate + self.demod = gr.quadrature_demod_cf(self.sps); - # Setup flow based on decoder selection - if options.decoder.count("c"): + #configure clock recovery + gain_mu = 0.01 + gain_omega = .25 * gain_mu * gain_mu # critically damped + self.clocker = gr.clock_recovery_mm_ff( self.sps, + gain_omega, + 0.5, #mu + gain_mu, + 0.3) #omega_relative_limit, + + self.burst = gsm.burst_ff(self.burst_cb) + self.connect(self.filter, self.demod, self.clocker, self.burst) + +#################### + def setup_c_flowgraph(self): #use the sink version if burst scope not selected if self.scopes.count("b"): self.burst = gsm.burst_cf(self.burst_cb,input_rate) else: self.burst = gsm.burst_sink_c(self.burst_cb,input_rate) - self.connect(self.filter, self.burst) + self.connect(self.filter, self.burst) - elif options.decoder.count("f"): - # configure demodulator - # adjust the phase gain for sampling rate - self.demod = gr.quadrature_demod_cf(sps); - - #configure clock recovery - gain_mu = 0.01 - gain_omega = .25 * gain_mu * gain_mu # critically damped - self.clocker = gr.clock_recovery_mm_ff( sps, - gain_omega, - 0.5, #mu - gain_mu, - 0.3) #omega_relative_limit, - - self.burst = gsm.burst_ff(self.burst_cb) - self.connect(self.filter, self.demod, self.clocker, self.burst) +#################### + def setup_scopes(self): + #Input FFT + if self.scopes.count("I"): + self.input_fft_scope = fftsink.fft_sink_c (self, self.panel, fft_size=1024, sample_rate=self.input_rate) + self.connect(self.source, self.input_fft_scope) + + #Filter FFT + if self.scopes.count("F"): + self.filter_fft_scope = fftsink.fft_sink_c (self, self.panel, fft_size=1024, sample_rate=input_rate) + self.connect(self.filter, self.filter_fft_scope) + #Burst Scope + if self.scopes.count("b"): + self.burst_scope = scopesink.scope_sink_f(self, self.panel, sample_rate=self.gsm_symb_rate,v_scale=1) + self.connect(self.v2s, self.burst_scope) + + #burst_f options + if self.options.decoder.count("f"): if self.scopes.count("d"): - self.demod_scope = scopesink.scope_sink_f(self, panel, sample_rate=input_rate) + self.demod_scope = scopesink.scope_sink_f(self, self.panel, sample_rate=self.input_rate) self.connect(self.demod, self.demod_scope) if self.scopes.count("c"): - self.clocked_scope = scopesink.scope_sink_f(self, panel, sample_rate=gsm_symb_rate,v_scale=1) + self.clocked_scope = scopesink.scope_sink_f(self, self.panel, sample_rate=self.gsm_symb_rate,v_scale=1) self.connect(self.clocker, self.clocked_scope) - - # setup decoder parameters +#################### + def configure_burst_decoder(self): + options = self.options + # equalizer eq_types = {'none': gsm.EQ_NONE, 'fixed-dfe': gsm.EQ_FIXED_DFE} self.burst.d_equalizer_type = eq_types[options.equalizer] @@ -377,67 +458,48 @@ class app_flow_graph(stdgui.gui_flow_graph): self.burst.d_clock_options = topts - #console print options - popts = 0 - - if options.print_console.count('s'): - popts |= gsm.PRINT_STATE - if options.print_console.count('e'): - popts |= gsm.PRINT_EVERYTHING - - if options.print_console.count('a'): - popts |= gsm.PRINT_ALL_TYPES - - if options.print_console.count('k'): - popts |= gsm.PRINT_KNOWN - - if options.print_console.count('u'): - popts |= gsm.PRINT_UNKNOWN - - if options.print_console.count('0'): - popts |= gsm.PRINT_TS0 +#################### + def setup_flowgraph(self): - if options.print_console.count('F'): - popts |= gsm.PRINT_FCCH - - if options.print_console.count('S'): - popts |= gsm.PRINT_SCH - - if options.print_console.count('N'): - popts |= gsm.PRINT_NORMAL - - if options.print_console.count('D'): - popts |= gsm.PRINT_DUMMY - - if options.print_console.count('d'): - popts |= gsm.PRINT_GSM_DECODE + options = self.options - if options.print_console.count('C'): - popts |= gsm.PRINT_BITS | gsm.PRINT_CORR_BITS + # Attempt to enable realtime scheduling + if options.realtime: + r = gr.enable_realtime_scheduling() + if r == gr.RT_OK: + options.realtime = True + print >> sys.stderr, "Realtime scheduling ENABLED" + else: + options.realtime = False + print >> sys.stderr, "Realtime scheduling FAILED" - if options.print_console.count('x'): - popts |= gsm.PRINT_BITS | gsm.PRINT_HEX - - if options.print_console.count('B'): - popts |= gsm.PRINT_BITS | gsm.PRINT_ALL_BITS + self.setup_timing() - elif options.print_console.count('b'): - popts |= gsm.PRINT_BITS + # Setup our input source + if options.inputfile: + self.using_usrp = False + print >> sys.stderr, "Reading data from: " + options.inputfile + self.source = gr.file_source(gr.sizeof_gr_complex, options.inputfile, options.fileloop) + else: + self.using_usrp = True + self.setup_usrp() - if options.print_console.count('d'): - popts |= gsm.PRINT_GSM_DECODE - - #TODO: should warn if PRINT_GSM_DECODE is combined with other flags (will corrupt output for gsmdecode) - self.burst.d_print_options = popts - + self.setup_filter() - # create and connect the scopes that apply to all decoders - if self.scopes.count("F"): - self.filter_fft_scope = fftsink.fft_sink_c (self, panel, fft_size=1024, sample_rate=input_rate) - self.connect(self.filter, self.filter_fft_scope) + #create a tuner callback + self.mean_offset = 0.0 #this is set by tuner callback + self.burst_cb = burst_callback(self) + + # Setup flow based on decoder selection + if options.decoder.count("c"): + self.setup_c_flowgraph() + elif options.decoder.count("f"): + self.setup_f_flowgraph() - # connect the burst output + self.configure_burst_decoder() + + #Hookup a vector-stream converter if we want burst output if self.scopes.count("b") or options.outputfile: self.v2s = gr.vector_to_stream(gr.sizeof_float,142) #burst output is 142 (USEFUL_BITS) self.connect(self.burst, self.v2s) @@ -445,32 +507,19 @@ class app_flow_graph(stdgui.gui_flow_graph): # self.burst_sink = gr.null_sink(gr.sizeof_float) # self.connect(self.v2s, self.burst_sink) - #Connect output sinks - if self.scopes.count("b"): - self.burst_scope = scopesink.scope_sink_f(self, panel, sample_rate=gsm_symb_rate,v_scale=1) - self.connect(self.v2s, self.burst_scope) - - # setup & connect output file + + #Output file if options.outputfile: self.filesink = gr.file_sink(gr.sizeof_float, options.outputfile) self.connect(self.v2s, self.filesink) - - self._build_gui(vbox) - - self.set_channel(self.channel) + self.setup_scopes() - self.t1 = wx.Timer(self.frame) - self.t1.Start(5000,0) - self.frame.Bind(wx.EVT_TIMER, self.on_tick) - - #bind the idle routing for message_queue processing - self.frame.Bind(wx.EVT_IDLE, self.on_idle) - - - def _set_status_msg(self, msg): +#################### + def set_status_msg(self, msg): self.frame.GetStatusBar().SetStatusText(msg, 0) +#################### def _build_gui(self, vbox): if self.scopes.count("I"): @@ -514,6 +563,7 @@ class app_flow_graph(stdgui.gui_flow_graph): vbox.Add(hbox, 0, wx.EXPAND) +#################### def set_freq(self, freq): #TODO: for wideband processing, determine if the desired freq is within our current sample range. # If so, use the frequency translator to tune. Tune the USRP otherwise. @@ -529,7 +579,7 @@ class app_flow_graph(stdgui.gui_flow_graph): freq = freq - self.offset - r = self.u.tune(0, self.subdev, freq) + r = self.ursp.tune(0, self.subdev, freq) if r: self.status_msg = '%f' % (freq/1e6) @@ -538,6 +588,7 @@ class app_flow_graph(stdgui.gui_flow_graph): self.status_msg = "Failed to set frequency (%f)" % (freq/1e6) return False +#################### def set_gain(self, gain): if not self.using_usrp: @@ -545,6 +596,7 @@ class app_flow_graph(stdgui.gui_flow_graph): self.subdev.set_gain(gain) +#################### def set_channel(self, chan): self.chan = chan @@ -556,6 +608,7 @@ class app_flow_graph(stdgui.gui_flow_graph): else: self.status_msg = "Invalid Channel" +#################### def print_stats(self): out = sys.stderr @@ -579,21 +632,24 @@ class app_flow_graph(stdgui.gui_flow_graph): print >> out, '%known: ', 100.0 * n_known / n_total print >> out, "" +#################### def on_tick(self, evt): if self.print_status: self.print_stats() +#################### def on_idle(self, event): #We can't update this while in the tune functions since they can be invoked by callbaks and the GUI croaks... #FIXME: This is icky. - self._set_status_msg(self.status_msg) + self.set_status_msg(self.status_msg) #print "Idle.\n"; -def main (): +#################### +def main(): app = stdgui.stdapp(app_flow_graph, "GSM Scanner", nstatus=1) app.MainLoop() - +#################### if __name__ == '__main__': - main () + main() -- cgit v1.2.3