[Commit-gnuradio] r4286 - gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking

[trondeau]

Author: trondeau
Date: 2007-01-17 15:11:22 -0700 (Wed, 17 Jan 2007)
New Revision: 4286

Modified:
   
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/dial_tone_sink.py
   
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/dial_tone_source.py
   
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/vector_sink.py
   
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/vector_source.py
Log:
reworked code to use gr.udp_sxxx

Modified: 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/dial_tone_sink.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/dial_tone_sink.py
   2007-01-17 22:10:52 UTC (rev 4285)
+++ 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/dial_tone_sink.py
   2007-01-17 22:11:22 UTC (rev 4286)
@@ -32,9 +32,9 @@
                                 gr.io_signature(0,0,0)) # Output signature
 
 
-        self.define_component("src",  gr.ethernet_source(gr.sizeof_float,
-                                                         local_ipaddress, port,
-                                                         mtu))
+        self.define_component("src",  gr.udp_source(gr.sizeof_float,
+                                                    local_ipaddress, port,
+                                                    mtu))
         sample_rate = 32000
         self.define_component("dst",  audio.sink(sample_rate))
         self.define_component("dst2", gr.file_sink(gr.sizeof_float, 
"received.dat"))

Modified: 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/dial_tone_source.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/dial_tone_source.py
 2007-01-17 22:10:52 UTC (rev 4285)
+++ 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/dial_tone_source.py
 2007-01-17 22:11:22 UTC (rev 4286)
@@ -38,10 +38,10 @@
         self.define_component("src1", gr.sig_source_f (sample_rate, 
gr.GR_SIN_WAVE,
                                                        440, amplitude))
         self.define_component("add", gr.add_ff())
-        self.define_component("dst",  gr.ethernet_sink(gr.sizeof_float,
-                                                       local_ipaddress, 0,
-                                                       remote_ipaddress, port,
-                                                       mtu))
+        self.define_component("dst",  gr.udp_sink(gr.sizeof_float,
+                                                  local_ipaddress, 0,
+                                                  remote_ipaddress, port,
+                                                  mtu))
         
         self.connect("src0", 0, "add", 0)      
         self.connect("src1", 0, "add", 1)

Modified: 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/vector_sink.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/vector_sink.py
      2007-01-17 22:10:52 UTC (rev 4285)
+++ 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/vector_sink.py
      2007-01-17 22:11:22 UTC (rev 4286)
@@ -31,10 +31,9 @@
                                 gr.io_signature(0,0,0), # Input signature
                                 gr.io_signature(0,0,0)) # Output signature
 
-        eth = gr.ethernet_source(gr.sizeof_char, local_ipaddress,
-                                 port, mtu)
+        udp = gr.udp_source(gr.sizeof_char, local_ipaddress, port, mtu)
         
-        self.define_component("src", eth) 
+        self.define_component("src", udp)
         self.define_component("dst", gr.file_sink(gr.sizeof_char, 
"received.dat"))
 
         self.connect("src", 0, "dst", 0)       

Modified: 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/vector_source.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/vector_source.py
    2007-01-17 22:10:52 UTC (rev 4285)
+++ 
gnuradio/branches/developers/trondeau/ethernet/gnuradio-examples/python/hier/networking/vector_source.py
    2007-01-17 22:11:22 UTC (rev 4286)
@@ -31,12 +31,12 @@
                                 gr.io_signature(0,0,0), # Input signature
                                 gr.io_signature(0,0,0)) # Output signature
 
-        data = [i*0.1 for i in range(255)]
-        self.define_component("data", gr.vector_source_f(data, False))
+        data = [i*0.1 for i in range(1000)]
+        self.define_component("data", gr.vector_source_f(data, True))
 
-        eth = gr.ethernet_sink(gr.sizeof_float, local_ipaddress, 0,
-                         remote_ipaddress, port, mtu)
-        self.define_component("dst",  eth)
+        udp = gr.udp_sink(gr.sizeof_float, local_ipaddress, 0,
+                          remote_ipaddress, port, mtu)
+        self.define_component("dst",  upd)
 
         self.connect("data", 0, "dst", 0)