[Commit-gnuradio] r4190 - in gnuradio/trunk: config gnuradio-examples/py

commit-gnuradio
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4190 - in gnuradio/trunk: config gnuradio-examples/py

From:	jcorgan
Subject:	[Commit-gnuradio] r4190 - in gnuradio/trunk: config gnuradio-examples/python gnuradio-examples/python/audio gnuradio-examples/python/hier gnuradio-examples/python/hier/audio gnuradio-examples/python/hier/ofdm
Date:	Sun, 24 Dec 2006 12:13:48 -0700 (MST)
Author: jcorgan
Date: 2006-12-24 12:13:47 -0700 (Sun, 24 Dec 2006)
New Revision: 4190

Added:
   gnuradio/trunk/gnuradio-examples/python/hier/Makefile.am
   gnuradio/trunk/gnuradio-examples/python/hier/audio/
   gnuradio/trunk/gnuradio-examples/python/hier/audio/Makefile.am
   gnuradio/trunk/gnuradio-examples/python/hier/audio/dial_tone2.py
   gnuradio/trunk/gnuradio-examples/python/hier/ofdm/Makefile.am
Removed:
   gnuradio/trunk/gnuradio-examples/python/audio/dial_tone2.py
Modified:
   gnuradio/trunk/config/grc_gnuradio_examples.m4
   gnuradio/trunk/gnuradio-examples/python/Makefile.am
   gnuradio/trunk/gnuradio-examples/python/audio/Makefile.am
   gnuradio/trunk/gnuradio-examples/python/hier/
   gnuradio/trunk/gnuradio-examples/python/hier/ofdm/
Log:
Organized python example directory for new hierarchical blocks, cleaned up 
dial_tone2.py

Modified: gnuradio/trunk/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/trunk/config/grc_gnuradio_examples.m4      2006-12-23 22:05:39 UTC 
(rev 4189)
+++ gnuradio/trunk/config/grc_gnuradio_examples.m4      2006-12-24 19:13:47 UTC 
(rev 4190)
@@ -31,10 +31,13 @@
         gnuradio-examples/python/channel-coding/fsm_files/Makefile \
         gnuradio-examples/python/digital/Makefile \
         gnuradio-examples/python/digital_voice/Makefile \
+       gnuradio-examples/python/hier/Makefile \
+       gnuradio-examples/python/hier/audio/Makefile \
+       gnuradio-examples/python/hier/ofdm/Makefile \
         gnuradio-examples/python/multi-antenna/Makefile \
         gnuradio-examples/python/multi_usrp/Makefile \
         gnuradio-examples/python/networking/Makefile \
-        gnuradio-examples/python/usrp/Makefile
+        gnuradio-examples/python/usrp/Makefile \
     ])
 
     passed=yes

Modified: gnuradio/trunk/gnuradio-examples/python/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/Makefile.am 2006-12-23 22:05:39 UTC 
(rev 4189)
+++ gnuradio/trunk/gnuradio-examples/python/Makefile.am 2006-12-24 19:13:47 UTC 
(rev 4190)
@@ -20,4 +20,4 @@
 # 
 
 SUBDIRS = apps audio channel-coding digital_voice digital multi-antenna \
-         multi_usrp networking usrp 
+         multi_usrp networking usrp hier

Modified: gnuradio/trunk/gnuradio-examples/python/audio/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/audio/Makefile.am   2006-12-23 
22:05:39 UTC (rev 4189)
+++ gnuradio/trunk/gnuradio-examples/python/audio/Makefile.am   2006-12-24 
19:13:47 UTC (rev 4190)
@@ -26,7 +26,6 @@
        audio_to_file.py        \
        dial_squelch.py         \
        dial_tone.py            \
-       dial_tone2.py           \
        dialtone_v.py           \
        mono_tone.py            \
        multi_tone.py           \

Deleted: gnuradio/trunk/gnuradio-examples/python/audio/dial_tone2.py


Property changes on: gnuradio/trunk/gnuradio-examples/python/hier
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: gnuradio/trunk/gnuradio-examples/python/hier/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/hier/Makefile.am                    
        (rev 0)
+++ gnuradio/trunk/gnuradio-examples/python/hier/Makefile.am    2006-12-24 
19:13:47 UTC (rev 4190)
@@ -0,0 +1,24 @@
+#
+# Copyright 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.
+# 
+
+SUBDIRS = \
+    audio \
+    ofdm


Property changes on: gnuradio/trunk/gnuradio-examples/python/hier/audio
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: gnuradio/trunk/gnuradio-examples/python/hier/audio/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/hier/audio/Makefile.am              
                (rev 0)
+++ gnuradio/trunk/gnuradio-examples/python/hier/audio/Makefile.am      
2006-12-24 19:13:47 UTC (rev 4190)
@@ -0,0 +1,23 @@
+#
+# Copyright 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.
+# 
+
+EXTRA_DIST = \
+    dial_tone2.py

Copied: gnuradio/trunk/gnuradio-examples/python/hier/audio/dial_tone2.py (from 
rev 4189, gnuradio/trunk/gnuradio-examples/python/audio/dial_tone2.py)
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/hier/audio/dial_tone2.py            
                (rev 0)
+++ gnuradio/trunk/gnuradio-examples/python/hier/audio/dial_tone2.py    
2006-12-24 19:13:47 UTC (rev 4190)
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,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
+from gnuradio import audio
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+# Top-level block creating a dial tone
+# Derives from new class gr.hier_block2
+class dial_tone(gr.hier_block2):
+       def __init__(self, 
+                    sample_rate,  # Audio output sample rate (int)
+                    audio_output, # Audio output device
+                    amplitude):   # Output volume (0.0-1.0)
+
+               # Call hierarchical block constructor
+               # Top-level blocks have no inputs or outputs
+               gr.hier_block2.__init__(self, 
+                                       "dial_tone",            # Block type 
+                                       gr.io_signature(0,0,0), # Input 
signature
+                                       gr.io_signature(0,0,0)) # Output 
signature
+
+               # Hierarchical blocks have a set of 'components' (which may
+               # be themselves hierarchical blocks), mapped to names.
+               # 'define_component' takes a string and either a hierarchical 
+               # block or an instance of a 'leaf node' (gr_block) block
+
+               # Give names to two sine wave sources and an audio sink
+               self.define_component("src0", gr.sig_source_f (sample_rate, 
gr.GR_SIN_WAVE, 350, amplitude))
+               self.define_component("src1", gr.sig_source_f (sample_rate, 
gr.GR_SIN_WAVE, 440, amplitude))
+               self.define_component("dst",  audio.sink(sample_rate, 
audio_output))
+
+               # Wire up outputs to inputs. (TODO: convenience functions)
+               self.connect("src0", 0, "dst", 0)       
+               self.connect("src1", 0, "dst", 1)
+       
+if __name__ == '__main__':
+       parser = OptionParser(option_class=eng_option)
+       parser.add_option("-O", "--audio-output", type="string", default="",
+                         help="pcm output device name.  E.g., hw:0,0 or 
/dev/dsp")
+       parser.add_option("-r", "--sample-rate", type="eng_float", 
default=48000,
+                         help="set sample rate to RATE (48000)")
+       parser.add_option("-a", "--amplitude", type="eng_float", default=0.1,
+                         help="set output volume to AMPLITUDE (0.1)")
+        (options, args) = parser.parse_args()
+        if len(args) != 0:
+            parser.print_help()
+            raise SystemExit, 1
+
+       # Create an instance of a hierarchical block
+       top_block = dial_tone(int(options.sample_rate), 
+                             options.audio_output, 
+                             options.amplitude)
+                             
+       # Create an instance of a runtime, passing it the top block
+       # to process
+       runtime = gr.runtime(top_block)
+
+       try:    
+               # Run forever
+               runtime.run()
+       except KeyboardInterrupt:
+               # Ctrl-C exits
+               pass


Property changes on: gnuradio/trunk/gnuradio-examples/python/hier/ofdm
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: gnuradio/trunk/gnuradio-examples/python/hier/ofdm/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/hier/ofdm/Makefile.am               
                (rev 0)
+++ gnuradio/trunk/gnuradio-examples/python/hier/ofdm/Makefile.am       
2006-12-24 19:13:47 UTC (rev 4190)
@@ -0,0 +1,22 @@
+#
+# Copyright 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.
+# 
+
+EXTRA_DIST =
\ No newline at end of file
[Prev in Thread]
Current Thread
[Next in Thread]
[Commit-gnuradio] r4190 - in gnuradio/trunk: config gnuradio-examples/python gnuradio-examples/python/audio gnuradio-examples/python/hier gnuradio-examples/python/hier/audio gnuradio-examples/python/hier/ofdm, jcorgan <=
Prev by Date: [Commit-gnuradio] r4189 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general
Next by Date: [Commit-gnuradio] r4191 - gnuradio/branches/developers/brickle/jack/gr-audio-jack/src
Previous by thread: [Commit-gnuradio] r4189 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general
Next by thread: [Commit-gnuradio] r4191 - gnuradio/branches/developers/brickle/jack/gr-audio-jack/src
Index(es):
- Date
- Thread