diff options
Diffstat (limited to 'grc/core/generator')
| -rw-r--r-- | grc/core/generator/Generator.py | 9 | ||||
| -rw-r--r-- | grc/core/generator/flow_graph.tmpl | 13 |
2 files changed, 3 insertions, 19 deletions
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py index a3b0c8af43..a9ce933aeb 100644 --- a/grc/core/generator/Generator.py +++ b/grc/core/generator/Generator.py @@ -165,10 +165,9 @@ class TopBlockGenerator(object): src = block.get_param('source_code').get_value() output.append((file_path, src)) - # Filter out virtual sink connections - def cf(c): - return not (c.is_bus() or c.is_msg() or c.sink_block.is_virtual_sink()) - connections = [con for con in fg.get_enabled_connections() if cf(con)] + # Filter out bus and virtual sink connections + connections = [con for con in fg.get_enabled_connections() + if not (con.is_bus() or con.sink_block.is_virtual_sink())] # Get the virtual blocks and resolve their connections connection_factory = fg.parent_platform.Connection @@ -216,7 +215,6 @@ class TopBlockGenerator(object): )) connection_templates = fg.parent.connection_templates - msgs = [c for c in fg.get_enabled_connections() if c.is_msg()] # List of variable names var_ids = [var.get_id() for var in parameters + variables] @@ -245,7 +243,6 @@ class TopBlockGenerator(object): 'blocks': blocks, 'connections': connections, 'connection_templates': connection_templates, - 'msgs': msgs, 'generate_options': self._generate_options, 'callbacks': callbacks, } diff --git a/grc/core/generator/flow_graph.tmpl b/grc/core/generator/flow_graph.tmpl index 4ce2a513c3..fd5546e459 100644 --- a/grc/core/generator/flow_graph.tmpl +++ b/grc/core/generator/flow_graph.tmpl @@ -11,7 +11,6 @@ ##@param parameters the parameter blocks ##@param blocks the signal blocks ##@param connections the connections -##@param msgs the msg type connections ##@param generate_options the type of flow graph ##@param callbacks variable id map to callback strings ######################################################## @@ -200,18 +199,6 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))]) $indent($var.get_var_make()) #end for ######################################################## -##Create Message Queues -######################################################## -#if $msgs - - $DIVIDER - # Message Queues - $DIVIDER -#end if -#for $msg in $msgs - $(msg.source_block.get_id())_msgq_out = $(msg.sink_block.get_id())_msgq_in = gr.msg_queue(2) -#end for -######################################################## ##Create Blocks ######################################################## #if $blocks |