[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8157 - in grc/branches/grc_reloaded: notes src/grc sr
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8157 - in grc/branches/grc_reloaded: notes src/grc src/grc/gui/elements src/grc_gnuradio/blks2 src/grc_gnuradio/blocks src/grc_gnuradio/blocks/modulators src/grc_gnuradio/data |
|
Date: |
Sun, 6 Apr 2008 15:02:36 -0600 (MDT) |
Author: jblum
Date: 2008-04-06 15:02:35 -0600 (Sun, 06 Apr 2008)
New Revision: 8157
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_analysis_filterbank.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_packet_demod.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_packet_mod.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_synthesis_filterbank.xml
Modified:
grc/branches/grc_reloaded/notes/todo.txt
grc/branches/grc_reloaded/src/grc/Preferences.py
grc/branches/grc_reloaded/src/grc/gui/elements/Block.py
grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py
grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
grc/branches/grc_reloaded/src/grc_gnuradio/blks2/packet.py
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_demod.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_mod.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_gmsk_demod.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_gmsk_mod.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_qamx_demod.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_qamx_mod.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/preferences.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
Log:
packet and filterbank blocks
Modified: grc/branches/grc_reloaded/notes/todo.txt
===================================================================
--- grc/branches/grc_reloaded/notes/todo.txt 2008-04-03 01:56:37 UTC (rev
8156)
+++ grc/branches/grc_reloaded/notes/todo.txt 2008-04-06 21:02:35 UTC (rev
8157)
@@ -4,7 +4,6 @@
############ Blocks to Add: ####################
-see checklist
--custom packet mod/demod
-pad source/sink
-hier block
-optparse block
@@ -17,6 +16,7 @@
-save working directory after close
-create sub-flow graphs to be used in larger flow graphs
-copy and paste blocks
+-pref: hide block labels
############ Suggestions: ####################
-scope sink constructor needs average option and triggering option
Modified: grc/branches/grc_reloaded/src/grc/Preferences.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/Preferences.py 2008-04-03 01:56:37 UTC
(rev 8156)
+++ grc/branches/grc_reloaded/src/grc/Preferences.py 2008-04-06 21:02:35 UTC
(rev 8157)
@@ -43,6 +43,7 @@
window_size_param = block.get_param('window_size')
files_open_param = block.get_param('files_open')
+show_params_param = block.get_param('show_params')
##Preferences: title, notes, params
PREFERENCES = [
@@ -55,13 +56,20 @@
[snap_to_grid_param, grid_size_param, show_grid_param],
),
(
- 'Misc',
+ 'Appearance',
'''
Show or hide the reports window at the bottom of the main window. \
-Restore open files will open all files that were last open in GRC.
+Show or hide the paramater labels in the signal blocks.
''',
- [show_reports_param, restore_files_param],
+ [show_reports_param, show_params_param],
),
+ (
+ 'Misc',
+ '''
+Restore previously opened files on start-up.
+''',
+ [restore_files_param],
+ ),
]
def load(window=None):
@@ -108,9 +116,12 @@
def get_grid_size():
return int(grid_size_param.get_value())
-
+
def snap_to_grid():
return snap_to_grid_param.get_value() == 'on'
def show_grid():
return show_grid_param.get_value() == 'show'
+
+def show_params():
+ return show_params_param.get_value() == 'show'
Modified: grc/branches/grc_reloaded/src/grc/gui/elements/Block.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/elements/Block.py 2008-04-03
01:56:37 UTC (rev 8156)
+++ grc/branches/grc_reloaded/src/grc/gui/elements/Block.py 2008-04-06
21:02:35 UTC (rev 8157)
@@ -126,12 +126,14 @@
if not self.is_valid(): layout.set_markup('<span
foreground="red"><b>'+self.get_name()+'</b></span>')
self.label_width,self.label_height = layout.get_pixel_size()
#display the params (except for the special params id and
position)
- for param in filter(lambda p: p.get_key() not in
('gui_coordinate', 'gui_rotation'), self.get_params()):
- layout = param.get_layout()
- layouts.append(layout)
- w,h = layout.get_pixel_size()
- self.label_width = max(w, self.label_width)
- self.label_height = self.label_height + h +
LABEL_SEPARATION
+ from grc import Preferences
+ if Preferences.show_params():
+ for param in filter(lambda p: p.get_key() not in
('gui_coordinate', 'gui_rotation'), self.get_params()):
+ layout = param.get_layout()
+ layouts.append(layout)
+ w,h = layout.get_pixel_size()
+ self.label_width = max(w, self.label_width)
+ self.label_height = self.label_height + h +
LABEL_SEPARATION
width = self.label_width
height = self.label_height
#setup the pixmap
Modified: grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py 2008-04-03
01:56:37 UTC (rev 8156)
+++ grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py 2008-04-06
21:02:35 UTC (rev 8157)
@@ -54,16 +54,18 @@
self.is_selected = lambda: bool(self.selected_element)
self.count = 0
- def get_gc(self): return self.drawing_area.gc
+ def get_drawing_area(self): return self.drawing_area
- def get_pixmap(self): return self.drawing_area.pixmap
+ def get_gc(self): return self.get_drawing_area().gc
- def get_size(self): return self.drawing_area.get_size_request()
+ def get_pixmap(self): return self.get_drawing_area().pixmap
- def set_size(self, *args): self.drawing_area.set_size_request(*args)
+ def get_size(self): return self.get_drawing_area().get_size_request()
- def get_window(self): return self.drawing_area.window
+ def set_size(self, *args):
self.get_drawing_area().set_size_request(*args)
+ def get_window(self): return self.get_drawing_area().window
+
def get_scroll_pane(self): return self.drawing_area.get_parent()
###########################################################################
@@ -230,26 +232,27 @@
"""Draw the background and then all of the Elements in this
FlowGraph on the pixmap,
then draw the pixmap to the drawable window of this
FlowGraph."""
if self.get_gc():
+ W,H = self.get_size()
#draw the background
- W,H = self.get_size()
self.get_gc().foreground = BACKGROUND_COLOR
self.get_pixmap().draw_rectangle(self.get_gc(), True,
0, 0, W, H)
+ #draw grid (depends on prefs)
from grc import Preferences
if Preferences.show_grid():
grid_size = Preferences.get_grid_size()
points = list()
for i in range(W/grid_size):
for j in range(H/grid_size):
-
points.append((i*grid_size,j*grid_size))
+ points.append((i*grid_size,
j*grid_size))
self.get_gc().foreground = TXT_COLOR
- self.get_pixmap().draw_points(self.get_gc(),
points)
+ self.get_pixmap().draw_points(self.get_gc(),
points)
#draw signal blocks first, then connections on the top
for element in self.get_blocks() +
self.get_connections():
element.draw(self.get_pixmap())
#draw any selected element as the topmost
if self.mouse_pressed and self.selected_element:
self.selected_element.draw(self.get_pixmap())
- self.drawing_area.draw()
+ self.get_drawing_area().draw()
def update(self):
"""Call update on all elements."""
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
2008-04-03 01:56:37 UTC (rev 8156)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
2008-04-06 21:02:35 UTC (rev 8157)
@@ -2,4 +2,5 @@
from selector import selector, valve
from packet import packet_mod, packet_demod
+from packet import mod_pkts, demod_pkts
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blks2/packet.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blks2/packet.py 2008-04-03
01:56:37 UTC (rev 8156)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blks2/packet.py 2008-04-06
21:02:35 UTC (rev 8157)
@@ -74,7 +74,7 @@
Hierarchical block for wrapping packet-based modulators.
"""
- def __init__(self, item_size_in, item_size_out, modulator,
payload_length=None):
+ def __init__(self, item_size_in, item_size_out, modulator,
payload_length=-1):
"""!
packet_mod constructor.
@param item_size_in the size of the input data stream in bytes
@@ -85,7 +85,7 @@
#setup
self._item_size_in = item_size_in
self._item_size_out = item_size_out
- if payload_length is None: #get packet length
+ if payload_length < 0: #get packet length
payload_length = DEFAULT_PAYLOAD_LEN
if payload_length%self._item_size_in != 0: #verify that
packet length is a multiple of the stream size
raise ValueError, 'The packet length: "%d" is not a
mutiple of the stream size: "%d".'%(payload_length, self._item_size_in)
@@ -93,7 +93,7 @@
self._modulator = modulator
#create blocks
self._msgq_in = gr.msg_queue(DEFAULT_MSGQ_LIMIT)
- msg_sink = gr.message_sink(self._item_size_in,
self._msgq_in, False) #False -> blocking
+ msg_sink = gr.message_sink(self._item_size_in, self._msgq_in,
False) #False -> blocking
#initialize hier2
gr.hier_block2.__init__(
self,
@@ -112,7 +112,7 @@
Hierarchical block for sending packet based data.
"""
- def __init__(self, samples_per_symbol, bits_per_symbol,
access_code=None, pad_for_usrp=True):
+ def __init__(self, samples_per_symbol, bits_per_symbol, access_code='',
pad_for_usrp=True):
"""!
mod_pkts constructor.
@param samples_per_symbol number of samples per symbol
@@ -124,7 +124,7 @@
self._samples_per_symbol = samples_per_symbol
self._bits_per_symbol = bits_per_symbol
self._pad_for_usrp = pad_for_usrp
- if access_code is None: #get access code
+ if not access_code: #get access code
access_code = packet_utils.default_access_code
if not packet_utils.is_1_0_string(access_code):
raise ValueError, "Invalid access_code %r. Must be
string of 1's and 0's" % (access_code,)
@@ -212,7 +212,7 @@
Hierarchical block for demodulating and deframing packets.
"""
- def __init__(self, access_code=None, callback=None, threshold=-1):
+ def __init__(self, access_code='', callback=None, threshold=-1):
"""!
demod_pkts contructor.
@param access_code AKA sync vector
@@ -220,13 +220,13 @@
@param threshold detect access_code with up to threshold bits
wrong (-1 -> use default)
"""
#access code
- if access_code is None: #get access code
+ if not access_code: #get access code
access_code = packet_utils.default_access_code
if not packet_utils.is_1_0_string(access_code):
raise ValueError, "Invalid access_code %r. Must be
string of 1's and 0's" % (access_code,)
self._access_code = access_code
- #threshold
- if threshold == -1: threshold = DEFAULT_THRESHOLD
+ #threshold
+ if threshold < 0: threshold = DEFAULT_THRESHOLD
self._threshold = threshold
self._callback = callback
#initialize hier2
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_analysis_filterbank.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_analysis_filterbank.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_analysis_filterbank.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Analysis Filterbank
+###################################################
+ -->
+<block>
+ <name>Analysis Filterbank</name>
+ <key>blks2_analysis_filterbank</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.analysis_filterbank(mpoints=$mpoints, taps=$taps)</make>
+ <param>
+ <name>MPoints</name>
+ <key>mpoints</key>
+ <value>3</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Taps</name>
+ <key>taps</key>
+ <type>complex_vector</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ <nports>$mpoints</nports>
+ </source>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_demod.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_demod.xml
2008-04-03 01:56:37 UTC (rev 8156)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_demod.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -36,7 +36,7 @@
</option>
</param>
<param>
- <name>Samples per Symbol</name>
+ <name>Samples/Symbol</name>
<key>samples_per_symbol</key>
<value>2</value>
<type>real</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_mod.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_mod.xml
2008-04-03 01:56:37 UTC (rev 8156)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_mod.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -32,7 +32,7 @@
</option>
</param>
<param>
- <name>Samples per Symbol</name>
+ <name>Samples/Symbol</name>
<key>samples_per_symbol</key>
<value>2</value>
<type>real</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_gmsk_demod.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_gmsk_demod.xml
2008-04-03 01:56:37 UTC (rev 8156)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_gmsk_demod.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -17,7 +17,7 @@
freq_error=$freq_error,
)</make>
<param>
- <name>Samples per Symbol</name>
+ <name>Samples/Symbol</name>
<key>samples_per_symbol</key>
<value>2</value>
<type>real</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_gmsk_mod.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_gmsk_mod.xml
2008-04-03 01:56:37 UTC (rev 8156)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_gmsk_mod.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -14,7 +14,7 @@
bt=$bt,
)</make>
<param>
- <name>Samples per Symbol</name>
+ <name>Samples/Symbol</name>
<key>samples_per_symbol</key>
<value>2</value>
<type>real</type>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_packet_demod.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_packet_demod.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_packet_demod.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Packet Demod
+###################################################
+ -->
+<block>
+ <name>Packet Demod</name>
+ <key>blks2_packet_demod</key>
+ <import>from grc_gnuradio import blks2 as grc_blks2</import>
+ <import>from gnuradio import gr</import>
+ <make>grc_blks2.packet_demod(
+ item_size_in=gr.sizeof_char,
+ item_size_out=$type.size*$vlen,
+ demodulator=grc_blks2.demod_pkts(
+ access_code=$access_code,
+ threshold=$threshold,
+ ),
+)</make>
+ <param>
+ <name>Output Type</name>
+ <key>type</key>
+ <value>float</value>
+ <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>Access Code</name>
+ <key>access_code</key>
+ <value></value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Threshold</name>
+ <key>threshold</key>
+ <value>-1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>byte</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+ <doc>
+Packet demodulator block, for use with the gnuradio demodulator blocks: gmsk,
psk, qam.
+
+Access Code: string of 1's and 0's, leave blank for default.
+ </doc>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_packet_mod.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_packet_mod.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_packet_mod.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Packet Mod
+###################################################
+ -->
+<block>
+ <name>Packet Mod</name>
+ <key>blks2_packet_mod</key>
+ <import>from grc_gnuradio import blks2 as grc_blks2</import>
+ <import>from gnuradio import gr</import>
+ <make>grc_blks2.packet_mod(
+ item_size_in=$type.size*$vlen,
+ item_size_out=gr.sizeof_char,
+ modulator=grc_blks2.mod_pkts(
+ samples_per_symbol=$samples_per_symbol,
+ bits_per_symbol=$bits_per_symbol,
+ access_code=$access_code,
+ pad_for_usrp=$pad_for_usrp,
+ ),
+ payload_length=$payload_length,
+)</make>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <value>float</value>
+ <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>Samples/Symbol</name>
+ <key>samples_per_symbol</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Bits/Symbol</name>
+ <key>bits_per_symbol</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Access Code</name>
+ <key>access_code</key>
+ <value></value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Pad for USRP</name>
+ <key>pad_for_usrp</key>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+ <param>
+ <name>Payload Length</name>
+ <key>payload_length</key>
+ <value>-1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+ <doc>
+Packet modulator block, for use with the gnuradio modulator blocks: gmsk, psk,
qam.
+
+Access Code: string of 1's and 0's, leave blank for default.
+
+Bits/Symbol should be set accordingly:
+ gmsk -> 1
+ dbpsk -> 1
+ dqpsk -> 2
+ d8psk -> 3
+ qam8 -> 3
+ qam16 -> 4
+ qam64 -> 6
+ qam256 -> 8
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_qamx_demod.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_qamx_demod.xml
2008-04-03 01:56:37 UTC (rev 8156)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_qamx_demod.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -40,7 +40,7 @@
</option>
</param>
<param>
- <name>Samples per Symbol</name>
+ <name>Samples/Symbol</name>
<key>samples_per_symbol</key>
<value>2</value>
<type>real</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_qamx_mod.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_qamx_mod.xml
2008-04-03 01:56:37 UTC (rev 8156)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_qamx_mod.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -36,7 +36,7 @@
</option>
</param>
<param>
- <name>Samples per Symbol</name>
+ <name>Samples/Symbol</name>
<key>samples_per_symbol</key>
<value>2</value>
<type>real</type>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_synthesis_filterbank.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_synthesis_filterbank.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_synthesis_filterbank.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Synthesis Filterbank
+###################################################
+ -->
+<block>
+ <name>Synthesis Filterbank</name>
+ <key>blks2_synthesis_filterbank</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.synthesis_filterbank(mpoints=$mpoints, taps=$taps)</make>
+ <param>
+ <name>MPoints</name>
+ <key>mpoints</key>
+ <value>3</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Taps</name>
+ <key>taps</key>
+ <type>complex_vector</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ <nports>$mpoints</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/preferences.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/preferences.xml
2008-04-03 01:56:37 UTC (rev 8156)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/preferences.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -103,4 +103,18 @@
<key>hide</key>
</option>
</param>
+ <param>
+ <name>Show Params Labels</name>
+ <key>show_params</key>
+ <value>show</value>
+ <type>enum</type>
+ <option>
+ <name>Show</name>
+ <key>show</key>
+ </option>
+ <option>
+ <name>Hide</name>
+ <key>hide</key>
+ </option>
+ </param>
</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-04-03 01:56:37 UTC (rev 8156)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-04-06 21:02:35 UTC (rev 8157)
@@ -190,8 +190,11 @@
<block>blks2_qamx_mod</block>
<block>blks2_qamx_demod</block>
- <block>packet_modulator</block>
- <block>packet_demodulator</block>
+ <block>blks2_packet_mod</block>
+ <block>blks2_packet_demod</block>
+
+ <block>blks2_synthesis_filterbank</block>
+ <block>blks2_analysis_filterbank</block>
</cat>
<cat>
<name>Trellis</name>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8157 - in grc/branches/grc_reloaded: notes src/grc src/grc/gui/elements src/grc_gnuradio/blks2 src/grc_gnuradio/blocks src/grc_gnuradio/blocks/modulators src/grc_gnuradio/data,
jblum <=