[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8039 - in grc/branches/grc_reloaded: . src/grc_gnurad
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8039 - in grc/branches/grc_reloaded: . src/grc_gnuradio/blocks/sinks src/grc_gnuradio/blocks/sources src/grc_gnuradio/data |
|
Date: |
Mon, 17 Mar 2008 23:19:48 -0600 (MDT) |
Author: jblum
Date: 2008-03-17 23:19:47 -0600 (Mon, 17 Mar 2008)
New Revision: 8039
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
Modified:
grc/branches/grc_reloaded/Makefile
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
Log:
makefile conditional clean, udp source sink
Modified: grc/branches/grc_reloaded/Makefile
===================================================================
--- grc/branches/grc_reloaded/Makefile 2008-03-18 05:11:55 UTC (rev 8038)
+++ grc/branches/grc_reloaded/Makefile 2008-03-18 05:19:47 UTC (rev 8039)
@@ -20,18 +20,15 @@
#
all:
- @echo Options: build, rebuild, install, reinstall, or clean
+ @echo Options: build, install, clean
-build:
+build: clean
python setup.py build
-
-rebuild: clean build
install: build
python setup.py install
-
-reinstall: rebuild install
clean:
- rm -rf build
+ if [ -d build ]; then rm -rf build; fi
+
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
2008-03-18 05:19:47 UTC (rev 8039)
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##UDP Sink
+###################################################
+ -->
+<block>
+ <name>UDP Sink</name>
+ <key>gr_udp_sink</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.udp_sink($type.size*$vlen, $ipaddr_local, $port_local,
$ipaddr_remote, $port_remote, $mtu)</make>
+ <callback>set_mtu($mtu)</callback>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Local IP Address</name>
+ <key>ipaddr_local</key>
+ <value>127.0.0.1</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Local Port</name>
+ <key>port_local</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Remote IP Address</name>
+ <key>ipaddr_remote</key>
+ <value>127.0.0.1</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Remote Port</name>
+ <key>port_remote</key>
+ <value>1234</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>MTU</name>
+ <key>mtu</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
2008-03-18 05:19:47 UTC (rev 8039)
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##UDP Source
+###################################################
+ -->
+<block>
+ <name>UDP Source</name>
+ <key>gr_udp_source</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.udp_source($type.size*$vlen, $ipaddr, $port, $mtu)</make>
+ <callback>set_mtu($mtu)</callback>
+ <param>
+ <name>Output Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>IP Address</name>
+ <key>ipaddr</key>
+ <value>127.0.0.1</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Port</name>
+ <key>port</key>
+ <value>1234</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>MTU</name>
+ <key>mtu</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-18 05:11:55 UTC (rev 8038)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-18 05:19:47 UTC (rev 8039)
@@ -14,7 +14,7 @@
<block>random_source</block>
<block>gr_null_source</block>
<block>gr_file_source</block>
- <block>udp_source</block>
+ <block>gr_udp_source</block>
<block>audio_source</block>
<block>gr_wavfile_source</block>
<block>usrp_source</block>
@@ -24,7 +24,7 @@
<name>Sinks</name>
<block>gr_null_sink</block>
<block>gr_file_sink</block>
- <block>udp_sink</block>
+ <block>gr_udp_sink</block>
<block>audio_sink</block>
<block>gr_wavfile_sink</block>
<block>usrp_sink</block>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8039 - in grc/branches/grc_reloaded: . src/grc_gnuradio/blocks/sinks src/grc_gnuradio/blocks/sources src/grc_gnuradio/data,
jblum <=