Merge branch 'digital' of git://github.com/trondeau/gnuradio into digital

5 files changed, 1 insertions, 410 deletions

diff --git a/gnuradio-examples/python/digital/Makefile.am b/gnuradio-examples/python/digital/Makefile.am
index e32180cd4..f9d129400 100644
--- a/gnuradio-examples/python/digital/Makefile.am
+++ b/gnuradio-examples/python/digital/Makefile.am
@@ -41,8 +41,4 @@ dist_ourdata_SCRIPTS =		\
 	benchmark_tx.py		\
 	benchmark_qt_rx.py	\
 	benchmark_qt_loopback.py\
-	gen_whitener.py		\
-	rx_voice.py		\
-	run_length.py		\
-	tunnel.py		\
-	tx_voice.py
+	tunnel.py
\ No newline at end of file
diff --git a/gnuradio-examples/python/digital/gen_whitener.py b/gnuradio-examples/python/digital/gen_whitener.py
deleted file mode 100755
index 9a81e4eaa..000000000
--- a/gnuradio-examples/python/digital/gen_whitener.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-
-from gnuradio import gr, gru
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-
-class my_graph(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser(option_class=eng_option)
-        (options, args) = parser.parse_args ()
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit, 1
-
-        src = gr.lfsr_32k_source_s()
-        head = gr.head(gr.sizeof_short, 2048)
-        self.dst = gr.vector_sink_s()
-        self.connect(src, head, self.dst)
-
-if __name__ == '__main__':
-    try:
-        tb = my_graph()
-        tb.run()
-        f = sys.stdout
-        i = 0
-        for s in tb.dst.data():
-            f.write("%3d, " % (s & 0xff,))
-            f.write("%3d, " % ((s >> 8) & 0xff,))
-            i = i+2
-            if i % 16 == 0:
-                f.write('\n')
-                    
-    except KeyboardInterrupt:
-        pass
-    
-    
diff --git a/gnuradio-examples/python/digital/run_length.py b/gnuradio-examples/python/digital/run_length.py
deleted file mode 100755
index 5020655db..000000000
--- a/gnuradio-examples/python/digital/run_length.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 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 3, 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 optparse import OptionParser
-import sys
-
-def main():
-    parser = OptionParser()
-    parser.add_option("-f", "--file", default=None,
-                      help="Choose file to read data from.")
-    (options, args) = parser.parse_args()
-
-    if options.file == None:
-        print "Must specify file to read from using '-f'."
-        sys.exit(1)
-    print "Using", options.file, "for data."
-
-    f = open(options.file, 'r')
-    runs = []
-    count = 0
-    current = 0
-    bytes = 0
-    bits = 0
-    
-    for ch in f.read():
-        x = ord(ch)
-        bytes = bytes + 1
-        for i in range(7,-1,-1):
-            bits = bits + 1
-            t = (x >> i) & 0x1
-            if t == current:
-                count = count + 1
-            else:
-                if count > 0:
-                    if len(runs) < count:
-                        for j in range(count - len(runs)):
-                            runs.append(0);
-                    runs[count-1] = runs[count-1] + 1
-
-                current = 1-current;
-                count = 1
-
-    # Deal with last run at EOF
-    if len(runs) < count and count > 0:
-        for j in range(count - len(runs)):
-            runs.append(0);
-    runs[count-1] = runs[count-1] + 1
-
-    chk = 0
-    print "Bytes read: ", bytes
-    print "Bits read:  ", bits
-    print
-    for i in range(len(runs)):
-        chk = chk + runs[i]*(i+1)
-        print "Runs of length", i+1, ":", runs[i]
-    print
-    print "Sum of runs:", chk, "bits"
-    print
-    print "Maximum run length is", len(runs), "bits"
-
-if __name__ == "__main__":
-    main()
-
-    
diff --git a/gnuradio-examples/python/digital/rx_voice.py b/gnuradio-examples/python/digital/rx_voice.py
deleted file mode 100755
index 1aad1ff8e..000000000
--- a/gnuradio-examples/python/digital/rx_voice.py
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006,2009 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 3, 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, modulation_utils
-from gnuradio import usrp
-from gnuradio import audio
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-from gnuradio.vocoder import gsm_full_rate
-
-import random
-import struct
-import sys
-
-# from current dir
-import usrp_receive_path
-
-#import os
-#print os.getpid()
-#raw_input('Attach and press enter')
-
-
-class audio_tx(gr.hier_block2):
-    def __init__(self, audio_output_dev):
-	gr.hier_block2.__init__(self, "audio_tx",
-				gr.io_signature(0, 0, 0), # Input signature
-				gr.io_signature(0, 0, 0)) # Output signature
-				
-        self.packet_src = gr.message_source(33)
-        voice_decoder = gsm_full_rate.decode_ps()
-        s2f = gr.short_to_float ()
-        sink_scale = gr.multiply_const_ff(1.0/32767.)
-        audio_sink = audio.sink(8000, audio_output_dev)
-        self.connect(self.packet_src, voice_decoder, s2f, sink_scale, audio_sink)
-        
-    def msgq(self):
-        return self.packet_src.msgq()
-
-
-class my_top_block(gr.top_block):
-    def __init__(self, demod_class, rx_callback, options):
-        gr.top_block.__init__(self)
-        self.rxpath = usrp_receive_path.usrp_receive_path(demod_class, rx_callback, options)
-        self.audio_tx = audio_tx(options.audio_output)
-	self.connect(self.rxpath)
-	self.connect(self.audio_tx)        
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-global n_rcvd, n_right
-
-def main():
-    global n_rcvd, n_right
-
-    n_rcvd = 0
-    n_right = 0
-    
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right
-        n_rcvd += 1
-        if ok:
-            n_right += 1
-
-        tb.audio_tx.msgq().insert_tail(gr.message_from_string(payload))
-        
-        print "ok = %r  n_rcvd = %4d  n_right = %4d" % (
-            ok, n_rcvd, n_right)
-
-    demods = modulation_utils.type_1_demods()
-
-    # Create Options Parser:
-    parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=demods.keys(), 
-                      default='gmsk',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(demods.keys()),))
-    parser.add_option("-O", "--audio-output", type="string", default="",
-                      help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
-    usrp_receive_path.add_options(parser, expert_grp)
-
-    for mod in demods.values():
-        mod.add_options(expert_grp)
-
-    parser.set_defaults(bitrate=50e3)  # override default bitrate default
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-    if options.rx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-
-    # build the graph
-    tb = my_top_block(demods[options.modulation], rx_callback, options)
-
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: Failed to enable realtime scheduling."
-
-    tb.run()
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/digital/tx_voice.py b/gnuradio-examples/python/digital/tx_voice.py
deleted file mode 100755
index d8692beb4..000000000
--- a/gnuradio-examples/python/digital/tx_voice.py
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006,2007,2009 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 3, 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, modulation_utils
-from gnuradio import usrp
-from gnuradio import audio
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-from gnuradio.vocoder import gsm_full_rate
-
-import random
-import time
-import struct
-import sys
-
-# from current dir
-import usrp_transmit_path
-
-#import os
-#print os.getpid()
-#raw_input('Attach and press enter')
-
-
-class audio_rx(gr.hier_block2):
-    def __init__(self, audio_input_dev):
-	gr.hier_block2.__init__(self, "audio_rx",
-				gr.io_signature(0, 0, 0), # Input signature
-				gr.io_signature(0, 0, 0)) # Output signature
-        sample_rate = 8000
-        src = audio.source(sample_rate, audio_input_dev)
-        src_scale = gr.multiply_const_ff(32767)
-        f2s = gr.float_to_short()
-        voice_coder = gsm_full_rate.encode_sp()
-        self.packets_from_encoder = gr.msg_queue()
-        packet_sink = gr.message_sink(33, self.packets_from_encoder, False)
-        self.connect(src, src_scale, f2s, voice_coder, packet_sink)
-
-    def get_encoded_voice_packet(self):
-        return self.packets_from_encoder.delete_head()
-        
-
-class my_top_block(gr.top_block):
-
-    def __init__(self, modulator_class, options):
-        gr.top_block.__init__(self)
-        self.txpath = usrp_transmit_path.usrp_transmit_path(modulator_class, options)
-        self.audio_rx = audio_rx(options.audio_input)
-	self.connect(self.txpath)
-	self.connect(self.audio_rx)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-def main():
-
-    def send_pkt(payload='', eof=False):
-        return tb.txpath.send_pkt(payload, eof)
-
-    def rx_callback(ok, payload):
-        print "ok = %r, payload = '%s'" % (ok, payload)
-
-    mods = modulation_utils.type_1_mods()
-
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
-                      default='gmsk',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(mods.keys()),))
-    parser.add_option("-M", "--megabytes", type="eng_float", default=0,
-                      help="set megabytes to transmit [default=inf]")
-    parser.add_option("-I", "--audio-input", type="string", default="",
-                      help="pcm input device name.  E.g., hw:0,0 or /dev/dsp")
-    usrp_transmit_path.add_options(parser, expert_grp)
-
-    for mod in mods.values():
-        mod.add_options(expert_grp)
-
-    parser.set_defaults(bitrate=50e3)  # override default bitrate default
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-
-    if options.tx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-
-    # build the graph
-    tb = my_top_block(mods[options.modulation], options)
-
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: failed to enable realtime scheduling"
-
-
-    tb.start()                       # start flow graph
-
-    # generate and send packets
-    nbytes = int(1e6 * options.megabytes)
-    n = 0
-    pktno = 0
-
-    while nbytes == 0 or n < nbytes:
-        packet = tb.audio_rx.get_encoded_voice_packet()
-        s = packet.to_string()
-        send_pkt(s)
-        n += len(s)
-        sys.stderr.write('.')
-        pktno += 1
-        
-    send_pkt(eof=True)
-    tb.wait()                       # wait for it to finish
-
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-	pass