[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4435 - gnuradio/branches/developers/trondeau/udp/gnur
From: |
trondeau |
Subject: |
[Commit-gnuradio] r4435 - gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking |
Date: |
Thu, 8 Feb 2007 11:55:25 -0700 (MST) |
Author: trondeau
Date: 2007-02-08 11:55:25 -0700 (Thu, 08 Feb 2007)
New Revision: 4435
Modified:
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/dial_tone_sink.py
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/dial_tone_source.py
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/vector_sink.py
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/vector_source.py
Log:
modified example scripts to work with modified state of UDP source/sink blocks
Modified:
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/dial_tone_sink.py
===================================================================
---
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/dial_tone_sink.py
2007-02-08 17:24:53 UTC (rev 4434)
+++
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/dial_tone_sink.py
2007-02-08 18:55:25 UTC (rev 4435)
@@ -25,28 +25,26 @@
from optparse import OptionParser
class dial_tone_sink(gr.hier_block2):
- def __init__(self, local_ipaddress, port, mtu, sample_rate):
+ def __init__(self, src, port, pkt_size, sample_rate):
gr.hier_block2.__init__(self,
"dial_tone_sink", # Block type
gr.io_signature(0,0,0), # Input signature
gr.io_signature(0,0,0)) # Output signature
- self.define_component("src", gr.udp_source(gr.sizeof_float,
- local_ipaddress, port,
- mtu))
+ self.define_component("src", gr.udp_source(gr.sizeof_float, src,
port, pkt_size))
self.define_component("dst", audio.sink(sample_rate))
- self.connect("src", 0, "dst", 0)
+ self.connect("src", 0, "dst", 0)
if __name__ == '__main__':
parser = OptionParser(option_class=eng_option)
- parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
- help="local IP address")
- parser.add_option("", "--local-port", type="int", default=65500,
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--src-port", type="int", default=65500,
help="port value to listen to for connection")
- parser.add_option("", "--mtu", type="int", default=540,
- help="packet size.")
+ parser.add_option("", "--packet-size", type="int", default=1472,
+ help="packet size.")
parser.add_option("-r", "--sample-rate", type="int", default=8000,
help="audio signal sample rate [default=%default]")
(options, args) = parser.parse_args()
@@ -55,8 +53,8 @@
raise SystemExit, 1
# Create an instance of a hierarchical block
- top_block = dial_tone_sink(options.local_ipaddr, options.local_port,
- options.mtu, options.sample_rate)
+ top_block = dial_tone_sink(options.src_name, options.src_port,
+ options.packet_size, options.sample_rate)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
Modified:
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/dial_tone_source.py
===================================================================
---
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/dial_tone_source.py
2007-02-08 17:24:53 UTC (rev 4434)
+++
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/dial_tone_source.py
2007-02-08 18:55:25 UTC (rev 4435)
@@ -25,7 +25,7 @@
from optparse import OptionParser
class dial_tone_source(gr.hier_block2):
- def __init__(self, local_ipaddress, remote_ipaddress, port, mtu,
sample_rate):
+ def __init__(self, src, dst, port, pkt_size, sample_rate):
gr.hier_block2.__init__(self,
"dial_tone_source", # Block type
gr.io_signature(0,0,0), # Input signature
@@ -38,37 +38,37 @@
440, amplitude))
self.define_component("add", gr.add_ff())
+ # Throttle needed here to account for the other side's audio card
sampling rate
self.define_component("thr", gr.throttle(gr.sizeof_float, sample_rate))
- self.define_component("dst", gr.udp_sink(gr.sizeof_float,
- local_ipaddress, 0,
- remote_ipaddress, port,
- mtu))
-
+ self.define_component("dst", gr.udp_sink(gr.sizeof_float, src, 0, dst,
port, pkt_size))
+
self.connect("src0", 0, "add", 0)
self.connect("src1", 0, "add", 1)
self.connect("add", 0, "thr", 0)
self.connect("thr", 0, "dst", 0)
+
+
if __name__ == '__main__':
parser = OptionParser(option_class=eng_option)
- parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
- help="local IP address")
- parser.add_option("", "--remote-ipaddr", type="string",
default="127.0.0.1",
- help="Remote IP address")
- parser.add_option("", "--remote-port", type="int", default=65500,
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--dst-name", type="string", default="localhost",
+ help="Remote host name (domain name or IP address")
+ parser.add_option("", "--dst-port", type="int", default=65500,
help="port value to connect to")
- parser.add_option("", "--mtu", type="int", default=540,
- help="packet size.")
+ parser.add_option("", "--packet-size", type="int", default=1472,
+ help="packet size.")
parser.add_option("-r", "--sample-rate", type="int", default=8000,
- help="audio signal sample rate [default=%default]")
+ help="audio signal sample rate [default=%default]")
(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_source(options.local_ipaddr, options.remote_ipaddr,
- options.remote_port, options.mtu,
options.sample_rate)
+ top_block = dial_tone_source(options.src_name, options.dst_name,
options.dst_port,
+ options.packet_size, options.sample_rate)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
Modified:
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/vector_sink.py
===================================================================
---
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/vector_sink.py
2007-02-08 17:24:53 UTC (rev 4434)
+++
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/vector_sink.py
2007-02-08 18:55:25 UTC (rev 4435)
@@ -25,35 +25,34 @@
from optparse import OptionParser
class vector_sink(gr.hier_block2):
- def __init__(self, local_ipaddress, port, mtu):
+ def __init__(self, src, port, pkt_size):
gr.hier_block2.__init__(self,
"vector_sink", # Block type
gr.io_signature(0,0,0), # Input signature
gr.io_signature(0,0,0)) # Output signature
- udp = gr.udp_source(gr.sizeof_char, local_ipaddress, port, mtu)
+ udp = gr.udp_source(gr.sizeof_float, src, port, pkt_size)
self.define_component("src", udp)
- self.define_component("dst", gr.file_sink(gr.sizeof_char,
"received.dat"))
+ self.define_component("dst", gr.file_sink(gr.sizeof_float,
"received.dat"))
self.connect("src", 0, "dst", 0)
if __name__ == "__main__":
parser = OptionParser(option_class=eng_option)
- parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
- help="local IP address")
- parser.add_option("", "--local-port", type="int", default=65500,
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--src-port", type="int", default=65500,
help="port value to listen to for connection")
- parser.add_option("", "--mtu", type="int", default=540,
- help="packet size.")
+ parser.add_option("", "--packet-size", type="int", default=1471,
+ help="packet size.")
(options, args) = parser.parse_args()
if len(args) != 0:
parser.print_help()
raise SystemExit, 1
# Create an instance of a hierarchical block
- top_block = vector_sink(options.local_ipaddr, options.local_port,
- options.mtu)
+ top_block = vector_sink(options.src_name, options.src_port,
options.packet_size)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
Modified:
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/vector_source.py
===================================================================
---
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/vector_source.py
2007-02-08 17:24:53 UTC (rev 4434)
+++
gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking/vector_source.py
2007-02-08 18:55:25 UTC (rev 4435)
@@ -25,41 +25,38 @@
from optparse import OptionParser
class vector_source(gr.hier_block2):
- def __init__(self, local_ipaddress, remote_ipaddress, port, mtu):
+ def __init__(self, src, dst, port, pkt_size):
gr.hier_block2.__init__(self,
"vector_source", # Block type
gr.io_signature(0,0,0), # Input signature
gr.io_signature(0,0,0)) # Output signature
- data = [i*0.1 for i in range(1000)]
+ data = [i*0.01 for i in range(1000)]
self.define_component("data", gr.vector_source_f(data, True))
- self.define_component("thr", gr.throttle(gr.sizeof_float, 8000))
- udp = gr.udp_sink(gr.sizeof_float, local_ipaddress, 0,
- remote_ipaddress, port, mtu)
+ udp = gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size)
self.define_component("dst", udp)
- self.connect("data", 0, "thr", 0)
- self.connect("thr", 0, "dst", 0)
+ self.connect("data", 0, "dst", 0)
if __name__ == '__main__':
parser = OptionParser(option_class=eng_option)
- parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
- help="local IP address")
- parser.add_option("", "--remote-ipaddr", type="string",
default="127.0.0.1",
- help="Remote IP address")
- parser.add_option("", "--remote-port", type="int", default=65500,
+ parser.add_option("", "--src-name", type="string", default="localhost",
+ help="local host name (domain name or IP address)")
+ parser.add_option("", "--dst-name", type="string", default="localhost",
+ help="Remote host name (domain name or IP address")
+ parser.add_option("", "--dst-port", type="int", default=65500,
help="port value to connect to")
- parser.add_option("", "--mtu", type="int", default=540,
- help="packet size.")
+ parser.add_option("", "--packet-size", type="int", default=1471,
+ help="packet size.")
(options, args) = parser.parse_args()
if len(args) != 0:
parser.print_help()
raise SystemExit, 1
# Create an instance of a hierarchical block
- top_block = vector_source(options.local_ipaddr, options.remote_ipaddr,
- options.remote_port, options.mtu)
+ top_block = vector_source(options.src_name, options.dst_name,
+ options.dst_port, options.packet_size)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4435 - gnuradio/branches/developers/trondeau/udp/gnuradio-examples/python/hier/networking,
trondeau <=