diff -r fa7503684c28 -r 7bc11b005c8b plugins/canfestival/config_utils.py --- a/plugins/canfestival/config_utils.py Mon Sep 10 18:19:53 2007 +0200 +++ b/plugins/canfestival/config_utils.py Tue Sep 11 08:00:28 2007 +0200 @@ -139,7 +139,7 @@ return ListCobIDAvailable.pop(0) -def GenerateConciseDCF(locations, current_location, nodelist): +def GenerateConciseDCF(locations, current_location, nodelist, sync_TPDOs): """ Fills a CanFestival network editor model, with DCF with requested PDO mappings. @param locations: List of complete variables locations \ @@ -402,9 +402,9 @@ if mapvariableidx < 0x6000: if DictLocations[variable[1]]["bit"] != None: - subindexname = "_" + str(DictLocations[variable[1]]["index"]) + "_" + str(DictLocations[variable[1]]["subindex"]) + "_" + str(DictLocations[variable[1]]["bit"]) + subindexname = str(DictLocations[variable[1]]["index"]) + "_" + str(DictLocations[variable[1]]["subindex"]) + "_" + str(DictLocations[variable[1]]["bit"]) else: - subindexname = "_" + str(DictLocations[variable[1]]["index"]) + "_" + str(DictLocations[variable[1]]["subindex"]) + subindexname = str(DictLocations[variable[1]]["index"]) + "_" + str(DictLocations[variable[1]]["subindex"]) if not new_index: manager.AddSubentriesToCurrent(mapvariableidx, 1, masternode) nbsubentries += 1