diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 18:02:42 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 18:02:42 -0400 |
| commit | 1c9d67fc220737873728310bd679d9e9cfab470a (patch) | |
| tree | 5fbf8c157da3e938d9b90ebe720f3efbcef39215 /gr-utils/python/modtool/templates.py | |
| parent | 1d8d1f111c41862d877686a89344a4a74f146cee (diff) | |
| parent | 1bacc04f7a8f2f9c868a9934624683c7cefb2300 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-audio/lib/CMakeLists.txt
gr-blocks/include/blocks/CMakeLists.txt
gr-blocks/include/blocks/socket_pdu.h
gr-blocks/lib/CMakeLists.txt
gr-blocks/swig/blocks_swig.i
gr-comedi/src/CMakeLists.txt
gr-howto-write-a-block/lib/CMakeLists.txt
gr-noaa/lib/CMakeLists.txt
gr-qtgui/lib/CMakeLists.txt
gr-uhd/lib/CMakeLists.txt
gr-vocoder/lib/CMakeLists.txt
gr-wavelet/lib/CMakeLists.txt
Diffstat (limited to 'gr-utils/python/modtool/templates.py')
| -rw-r--r-- | gr-utils/python/modtool/templates.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py index 706017cc21..87eb9f470c 100644 --- a/gr-utils/python/modtool/templates.py +++ b/gr-utils/python/modtool/templates.py @@ -275,7 +275,7 @@ ${str_to_python_comment($license)} #if $blocktype in ('sync', 'sink', 'source') #set $parenttype = 'gr.sync_block' #else -#set $parenttype = {'hier': 'gr.hier_block2', 'interpolator': 'gr.interp_block', 'decimator': 'gr.decim_block', 'general': 'gr.block'}[$blocktype] +#set $parenttype = {'hier': 'gr.hier_block2', 'interpolator': 'gr.interp_block', 'decimator': 'gr.decim_block', 'general': 'gr.basic_block'}[$blocktype] #end if #if $blocktype != 'hier' import numpy @@ -338,7 +338,7 @@ class ${blockname}(${parenttype}): def general_work(self, input_items, output_items): output_items[0][:] = input_items[0] - consume(0, len(input_items[0]) + consume(0, len(input_items[0])) \#self.consume_each(len(input_items[0])) return len(output_items[0]) #stop |