From 6b1e513f71dc70b435d2bff920e06d20c569f189 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 24 May 2013 17:20:46 -0400
Subject: modtool: Fixes for intial templates of a block.
1. adds '$' to args in the GRC xml <make> tag.
2. sets <+ITYPE+> and <+OTYPE+> for all I/O data types in io_signature and in work functions to be more clear what needs modification.
---
gr-utils/python/modtool/templates.py | 37 ++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
(limited to 'gr-utils/python/modtool/templates.py')
diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py
index f970ce0ae2..3ce31cd6d8 100644
--- a/gr-utils/python/modtool/templates.py
+++ b/gr-utils/python/modtool/templates.py
@@ -127,7 +127,8 @@ namespace gr {
${blockname}::sptr
${blockname}::make(${strip_default_values($arglist)})
{
- return gnuradio::get_initial_sptr (new ${blockname}_impl(${strip_arg_types($arglist)}));
+ return gnuradio::get_initial_sptr
+ (new ${blockname}_impl(${strip_arg_types($arglist)}));
}
#if $blocktype == 'decimator'
@@ -142,12 +143,12 @@ namespace gr {
#if $blocktype == 'source'
#set $inputsig = '0, 0, 0'
#else
-#set $inputsig = '<+MIN_IN+>, <+MAX_IN+>, sizeof (<+float+>)'
+#set $inputsig = '<+MIN_IN+>, <+MAX_IN+>, sizeof(<+ITYPE+>)'
#end if
#if $blocktype == 'sink'
#set $outputsig = '0, 0, 0'
#else
-#set $outputsig = '<+MIN_OUT+>, <+MAX_OUT+>, sizeof (<+float+>)'
+#set $outputsig = '<+MIN_OUT+>, <+MAX_OUT+>, sizeof(<+OTYPE+>)'
#end if
/*
* The private constructor
@@ -186,8 +187,8 @@ namespace gr {
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- const float *in = (const float *) input_items[0];
- float *out = (float *) output_items[0];
+ const <+ITYPE*> *in = (const <+ITYPE*> *) input_items[0];
+ <+OTYPE*> *out = (<+OTYPE*> *) output_items[0];
// Do <+signal processing+>
// Tell runtime system how many input items we consumed on
@@ -211,8 +212,8 @@ namespace gr {
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- const float *in = (const float *) input_items[0];
- float *out = (float *) output_items[0];
+ const <+ITYPE+> *in = (const <+ITYPE+> *) input_items[0];
+ <+OTYPE+> *out = (<+OTYPE+> *) output_items[0];
// Do <+signal processing+>
@@ -227,8 +228,8 @@ namespace gr {
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- const float *in = (const float *) input_items[0];
- float *out = (float *) output_items[0];
+ const <+ITYPE+> *in = (const <+ITYPE+> *) input_items[0];
+ <+OTYPE+> *out = (<+OTYPE+> *) output_items[0];
// Do <+signal processing+>
@@ -329,12 +330,12 @@ import numpy
#if $blocktype == 'source'
#set $inputsig = '0, 0, 0'
#else
-#set $inputsig = '<+MIN_IN+>, <+MAX_IN+>, gr.sizeof_<+float+>'
+#set $inputsig = '<+MIN_IN+>, <+MAX_IN+>, gr.sizeof_<+ITYPE+>'
#end if
#if $blocktype == 'sink'
#set $outputsig = '0, 0, 0'
#else
-#set $outputsig = '<+MIN_OUT+>, <+MAX_OUT+>, gr.sizeof_<+float+>'
+#set $outputsig = '<+MIN_OUT+>, <+MAX_OUT+>, gr.sizeof_<+OTYPE+>'
#end if
#end if
#if $blocktype == 'interpolator'
@@ -490,7 +491,7 @@ Templates['grc_xml'] = '''<?xml version="1.0"?>
<key>${modname}_$blockname</key>
<category>$modname</category>
<import>import $modname</import>
- <make>${modname}.${blockname}(${strip_arg_types($arglist)})</make>
+ <make>${modname}.${blockname}(${strip_arg_types_grc($arglist)})</make>
<!-- Make one 'param' node for every Parameter you want settable from the GUI.
Sub-nodes:
* name
@@ -582,12 +583,12 @@ ${modname}_make_${blockname} (${strip_default_values($arglist)})
#if $blocktype == 'sink'
#set $inputsig = '0, 0, 0'
#else
-#set $inputsig = '<+MIN_IN+>, <+MAX_IN+>, sizeof (<+float+>)'
+#set $inputsig = '<+MIN_IN+>, <+MAX_IN+>, sizeof(<+ITYPE+>)'
#end if
#if $blocktype == 'source'
#set $outputsig = '0, 0, 0'
#else
-#set $outputsig = '<+MIN_OUT+>, <+MAX_OUT+>, sizeof (<+float+>)'
+#set $outputsig = '<+MIN_OUT+>, <+MAX_OUT+>, sizeof(<+OTYPE+>)'
#end if
/*
@@ -631,8 +632,8 @@ ${modname}_${blockname}::general_work (int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- const float *in = (const float *) input_items[0];
- float *out = (float *) output_items[0];
+ const <+ITYPE+> *in = (const <+ITYPE+> *) input_items[0];
+ <+OTYPE+> *out = (<+OTYPE+> *) output_items[0];
// Do <+signal processing+>
// Tell runtime system how many input items we consumed on
@@ -650,8 +651,8 @@ ${modname}_${blockname}::work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- const float *in = (const float *) input_items[0];
- float *out = (float *) output_items[0];
+ const <+ITYPE+> *in = (const <+ITYPE+> *) input_items[0];
+ <+OTYPE+> *out = (<+OTYPE+> *) output_items[0];
// Do <+signal processing+>
--
cgit v1.2.3