--- a/canfestival/canfestival.py Mon Aug 14 23:38:28 2017 +0300
+++ b/canfestival/canfestival.py Tue Aug 15 12:17:51 2017 +0300
@@ -178,10 +178,12 @@
dialog.Destroy()
ConfNodeMethods = [
- {"bitmap" : "ExportSlave",
- "name" : _("Export slave"),
- "tooltip" : _("Export CanOpen slave to EDS file"),
- "method" : "_ExportSlave"},
+ {
+ "bitmap": "ExportSlave",
+ "name": _("Export slave"),
+ "tooltip": _("Export CanOpen slave to EDS file"),
+ "method": "_ExportSlave"
+ },
]
def CTNTestModified(self):
@@ -228,10 +230,10 @@
# allow access to local OD from Slave PLC
pointers = config_utils.LocalODPointers(locations, current_location, slave)
res = gen_cfile.GenerateFile(Gen_OD_path, slave, pointers)
- if res :
+ if res:
raise Exception, res
res = eds_utils.GenerateEDSFile(os.path.join(buildpath, "Slave_%s.eds" % prefix), slave)
- if res :
+ if res:
raise Exception, res
return [(Gen_OD_path,local_canfestival_config.getCFLAGS(CanFestivalPath))],"",False
@@ -395,10 +397,12 @@
return self._View
ConfNodeMethods = [
- {"bitmap" : "ShowMaster",
- "name" : _("Show Master"),
- "tooltip" : _("Show Master generated by config_utils"),
- "method" : "_ShowGeneratedMaster"}
+ {
+ "bitmap": "ShowMaster",
+ "name": _("Show Master"),
+ "tooltip": _("Show Master generated by config_utils"),
+ "method": "_ShowGeneratedMaster"
+ }
]
def OnCloseEditor(self, view):
@@ -446,7 +450,7 @@
raise Exception, e.message
# Do generate C file.
res = gen_cfile.GenerateFile(Gen_OD_path, master, pointers)
- if res :
+ if res:
raise Exception, res
file = open(os.path.join(buildpath, "MasterGenerated.od"), "w")
@@ -489,7 +493,7 @@
def GetCanDriver(self):
res = self.CanFestivalInstance.getCAN_Driver()
- if not res :
+ if not res:
return ""
return res
@@ -497,7 +501,7 @@
can_driver = self.GetCanDriver()
if can_driver is not None:
can_drivers = local_canfestival_config.DLL_LIST
- if can_driver not in can_drivers :
+ if can_driver not in can_drivers:
can_driver = can_drivers[0]
can_drv_ext = self.GetCTRoot().GetBuilder().extension
can_drv_prefix = self.GetCTRoot().GetBuilder().dlopen_prefix
@@ -506,22 +510,22 @@
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()))