From f1c41f807cb29472d0924149e39d6ec8ad90e6a2 Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Wed, 27 Sep 2006 05:14:03 +0000
Subject: Merged changes from eb/digital-wip into trunk.
This includes:
* renaming gnuradio-examples/python/gmsk2 to gnuradio-examples/python/digital
* refactoring the digital data tx and rx test code into benchmark_tx
and benchmark_rx. These accept a -m <modulation> argument.
<modulation> can currently be selected from gmsk, dbpsk, dqpsk
* Two new AGC blocks: gr_agc2: separate attack and delay rates;
gr_feedforward_agc: FIR-ish compressor. Normalizes to peak envelope.
* Working DBPSK mod/demod (works fine)
* Working DQPSK mod/demod (works, but still needs more work)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3662 221aa14e-8319-0410-a670-987f0aec2ac5
---
.../python/gmsk2/benchmark_gmsk_tx.py | 146 ---------------------
1 file changed, 146 deletions(-)
delete mode 100755 gnuradio-examples/python/gmsk2/benchmark_gmsk_tx.py
(limited to 'gnuradio-examples/python/gmsk2/benchmark_gmsk_tx.py')
diff --git a/gnuradio-examples/python/gmsk2/benchmark_gmsk_tx.py b/gnuradio-examples/python/gmsk2/benchmark_gmsk_tx.py
deleted file mode 100755
index 36bced29b1..0000000000
--- a/gnuradio-examples/python/gmsk2/benchmark_gmsk_tx.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-from gnuradio import gr, gru, blks
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import random
-import time
-import struct
-import sys
-
-# from current dir
-from transmit_path import transmit_path
-import fusb_options
-
-#import os
-#print os.getpid()
-#raw_input('Attach and press enter')
-
-
-class my_graph(gr.flow_graph):
-
- def __init__(self, mod_class, tx_subdev_spec,
- bitrate, interp_rate, spb, gain,
- options, mod_kwargs):
- gr.flow_graph.__init__(self)
- self.txpath = transmit_path(self, mod_class, tx_subdev_spec,
- bitrate, interp_rate, spb, gain,
- options, mod_kwargs)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-# main
-# /////////////////////////////////////////////////////////////////////////////
-
-def main():
-
- def send_pkt(payload='', eof=False):
- return fg.txpath.send_pkt(payload, eof)
-
- def rx_callback(ok, payload):
- print "ok = %r, payload = '%s'" % (ok, payload)
-
- parser = OptionParser (option_class=eng_option)
- parser.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
- help="select USRP Tx side A or B")
- parser.add_option("-f", "--freq", type="eng_float", default=423.1e6,
- help="set Tx and Rx frequency to FREQ [default=%default]",
- metavar="FREQ")
- parser.add_option("-r", "--bitrate", type="eng_float", default=None,
- help="specify bitrate. spb and interp will be derived.")
- parser.add_option("-S", "--spb", type="int", default=None,
- help="set samples/baud [default=%default]")
- parser.add_option("-i", "--interp", type="intx", default=None,
- help="set fpga interpolation rate to INTERP [default=%default]")
- parser.add_option("-s", "--size", type="eng_float", default=1500,
- help="set packet size [default=%default]")
- parser.add_option("", "--bt", type="float", default=0.3,
- help="set bandwidth-time product [default=%default]")
- parser.add_option("-g", "--gain", type="eng_float", default=100.0,
- help="transmitter gain [default=%default]")
- parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
- help="set megabytes to transmit [default=%default]")
- parser.add_option("","--discontinuous", action="store_true", default=False,
- help="enable discontinous transmission (bursts of 5 packets)")
- fusb_options.add_options(parser)
- (options, args) = parser.parse_args ()
-
- if len(args) != 0:
- parser.print_help()
- sys.exit(1)
-
- if options.freq < 1e6:
- options.freq *= 1e6
-
- pkt_size = int(options.size)
-
- mod_kwargs = {
- 'bt' : options.bt,
- }
-
- # build the graph
- fg = my_graph(blks.gmsk2_mod, options.tx_subdev_spec,
- options.bitrate, options.interp, options.spb, options.gain,
- options, mod_kwargs)
-
- print "bitrate: %sb/sec" % (eng_notation.num_to_str(fg.txpath.bitrate()),)
- print "spb: %3d" % (fg.txpath.spb(),)
- print "interp: %3d" % (fg.txpath.interp(),)
-
- ok = fg.txpath.set_freq(options.freq)
- if not ok:
- print "Failed to set Tx frequency to %s" % (eng_notation.num_to_str(options.freq),)
- raise SystemExit
-
- r = gr.enable_realtime_scheduling()
- if r != gr.RT_OK:
- print "Warning: failed to enable realtime scheduling"
-
- fg.start() # start flow graph
-
- # generate and send packets
- nbytes = int(1e6 * options.megabytes)
- n = 0
- pktno = 0
-
- while n < nbytes:
- send_pkt(struct.pack('!H', pktno) + (pkt_size - 2) * chr(pktno & 0xff))
- n += pkt_size
- sys.stderr.write('.')
- if options.discontinuous and pktno % 5 == 4:
- time.sleep(1)
- pktno += 1
-
- send_pkt(eof=True)
- fg.wait() # wait for it to finish
- fg.txpath.set_auto_tr(False)
-
-
-if __name__ == '__main__':
- try:
- main()
- except KeyboardInterrupt:
- pass
--
cgit v1.2.3