From 611f7e45e7a793f2489d76670a61493327838e3e Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Sat, 10 Nov 2012 15:43:21 -0500
Subject: analog: fixing up GRC and other examples to use gr-analog for sig and
noise sources.
---
gnuradio-core/src/examples/network/dial_tone_source.py | 10 ++++++++--
gnuradio-core/src/tests/test_buffers.py | 15 ++++++++++-----
2 files changed, 18 insertions(+), 7 deletions(-)
(limited to 'gnuradio-core/src')
diff --git a/gnuradio-core/src/examples/network/dial_tone_source.py b/gnuradio-core/src/examples/network/dial_tone_source.py
index 232a06de80..8c826e2ad4 100755
--- a/gnuradio-core/src/examples/network/dial_tone_source.py
+++ b/gnuradio-core/src/examples/network/dial_tone_source.py
@@ -23,14 +23,20 @@
from gnuradio import gr
from gnuradio.eng_option import eng_option
from optparse import OptionParser
+import sys
+
+try:
+ from gnuradio import analog
+except ImportError:
+ sys.stderr.write("This example required gr-analog.\n")
class dial_tone_source(gr.top_block):
def __init__(self, host, port, pkt_size, sample_rate, eof):
gr.top_block.__init__(self, "dial_tone_source")
amplitude = 0.3
- src0 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 350, amplitude)
- src1 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 440, amplitude)
+ src0 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 350, amplitude)
+ src1 = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 440, amplitude)
add = gr.add_ff()
# Throttle needed here to account for the other side's audio card sampling rate
diff --git a/gnuradio-core/src/tests/test_buffers.py b/gnuradio-core/src/tests/test_buffers.py
index b867c727c6..2664c136c6 100755
--- a/gnuradio-core/src/tests/test_buffers.py
+++ b/gnuradio-core/src/tests/test_buffers.py
@@ -25,9 +25,14 @@ from gnuradio import audio
from gnuradio.eng_option import eng_option
from optparse import OptionParser
-import time
+import time, math
import sys
+def sig_source_f(samp_rate, freq, amp, N):
+ t = map(lambda x: float(x)/samp_rate, xrange(N))
+ y = map(lambda x: math.sin(2.*math.pi*freq*x), t)
+ return y
+
# Test script to test setting up the buffers using gr_test
# For very large buffers it will fail when you hit the circbuf memory limit.
# On linux this limit is shmmax, it will fail when it tries to create a buffer > shmmax.
@@ -60,10 +65,11 @@ class my_graph(gr.top_block):
sample_rate = int(options.sample_rate)
ampl = 0.1
+ nsamples=int(sample_rate * seconds) #1 seconds
- src0 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 350, ampl)
+ data = sig_source_f(sample_rate, 350, ampl, nsamples)
+ src0 = gr.vector_source_f(data)
- nsamples=int(sample_rate * seconds) #1 seconds
# gr.test (const std::string &name=std::string("gr_test"),
# int min_inputs=1, int max_inputs=1, unsigned int sizeof_input_item=1,
# int min_outputs=1, int max_outputs=1, unsigned int sizeof_output_item=1,
@@ -93,9 +99,8 @@ class my_graph(gr.top_block):
#unsigned int history=1,unsigned int output_multiple=1,double relative_rate=1.0,
#bool fixed_rate=false
dst = audio.sink (sample_rate, options.audio_output)
- head= gr.head(gr.sizeof_float, nsamples)
- self.connect (src0,test,head,(dst, 0))
+ self.connect (src0,test,(dst, 0))
if __name__ == '__main__':
--
cgit v1.2.3