diff -r da5f1fa46f2b -r fb73a6b6622d canfestival/canfestival.py --- a/canfestival/canfestival.py Thu Oct 19 10:57:35 2017 +0300 +++ b/canfestival/canfestival.py Thu Oct 19 11:03:03 2017 +0300 @@ -519,23 +519,24 @@ else: can_driver_name = "" - format_dict = {"locstr": "_".join(map(str, self.GetCurrentLocation())), - "candriver": can_driver_name, - "nodes_includes": "", - "board_decls": "", - "nodes_init": "", - "nodes_open": "", - "nodes_stop": "", - "nodes_close": "", - "nodes_send_sync": "", - "nodes_proceed_sync": "", - "slavebootups": "", - "slavebootup_register": "", - "post_sync": "", - "post_sync_register": "", - "pre_op": "", - "pre_op_register": "", - } + format_dict = { + "locstr": "_".join(map(str, self.GetCurrentLocation())), + "candriver": can_driver_name, + "nodes_includes": "", + "board_decls": "", + "nodes_init": "", + "nodes_open": "", + "nodes_stop": "", + "nodes_close": "", + "nodes_send_sync": "", + "nodes_proceed_sync": "", + "slavebootups": "", + "slavebootup_register": "", + "post_sync": "", + "post_sync_register": "", + "pre_op": "", + "pre_op_register": "", + } for child in self.IECSortedChildren(): childlocstr = "_".join(map(str, child.GetCurrentLocation())) nodename = "OD_%s" % childlocstr @@ -547,8 +548,8 @@ child_data = getattr(child, "CanFestivalNode") # Apply sync setting format_dict["nodes_init"] += 'NODE_MASTER_INIT(%s, %s)\n ' % ( - nodename, - child_data.getNodeId()) + nodename, + child_data.getNodeId()) if child_data.getSync_TPDOs(): format_dict["nodes_send_sync"] += 'NODE_SEND_SYNC(%s)\n ' % (nodename) format_dict["nodes_proceed_sync"] += 'NODE_PROCEED_SYNC(%s)\n ' % (nodename) @@ -591,16 +592,16 @@ format_dict["post_sync_register"] += ( "%s_Data.post_sync = %s_post_sync;\n" % (nodename, nodename)) format_dict["nodes_init"] += 'NODE_SLAVE_INIT(%s, %s)\n ' % ( - nodename, - child_data.getNodeId()) + nodename, + child_data.getNodeId()) # Include generated OD headers format_dict["nodes_includes"] += '#include "%s.h"\n' % (nodename) # Declare CAN channels according user filled config format_dict["board_decls"] += 'BOARD_DECL(%s, "%s", "%s")\n' % ( - nodename, - child.GetCanDevice(), - child_data.getCAN_Baudrate()) + nodename, + child.GetCanDevice(), + child_data.getCAN_Baudrate()) format_dict["nodes_open"] += 'NODE_OPEN(%s)\n ' % (nodename) format_dict["nodes_close"] += 'NODE_CLOSE(%s)\n ' % (nodename) format_dict["nodes_stop"] += 'NODE_STOP(%s)\n ' % (nodename)