Bug on Master DCF generation fixed
authorlbessard
Mon, 10 Dec 2007 17:32:47 +0100
changeset 80 d7eb6e22b02e
parent 79 ae06c2da83f7
child 81 3a34b580f141
Bug on Master DCF generation fixed
plugins/canfestival/config_utils.py
--- a/plugins/canfestival/config_utils.py	Mon Dec 10 17:05:36 2007 +0100
+++ b/plugins/canfestival/config_utils.py	Mon Dec 10 17:32:47 2007 +0100
@@ -395,21 +395,21 @@
                 # Get COB ID of the PDO
                 cobid = self.NodeList.GetSlaveNodeEntry(locationinfos["nodeid"], index - 0x200, 1)
                 
-                # Verify that PDO transmit type is conform to sync_TPDOs
-                transmittype = self.NodeList.GetSlaveNodeEntry(locationinfos["nodeid"], index - 0x200, 2)
-                if sync_TPDOs and transmittype != 0x01 or transmittype != 0xFF:
-                    if sync_TPDOs:
-                        # Change TransmitType to SYNCHRONE
-                        data, nbparams = GeneratePDOMappingDCF(index - 0x200, cobid, 0x01, [])
-                    else:
-                        # Change TransmitType to ASYCHRONE
-                        data, nbparams = GeneratePDOMappingDCF(index - 0x200, cobid, 0xFF, [])
-                    
-                    # Add entry to slave dcf to change transmit type of 
-                    self.AddParamsToDCF(locationinfos["nodeid"], data, nbparams)
-                
                 # Add PDO to MasterMapping
                 if cobid not in self.MasterMapping.keys():
+                    # Verify that PDO transmit type is conform to sync_TPDOs
+                    transmittype = self.NodeList.GetSlaveNodeEntry(locationinfos["nodeid"], index - 0x200, 2)
+                    if sync_TPDOs and transmittype != 0x01 or transmittype != 0xFF:
+                        if sync_TPDOs:
+                            # Change TransmitType to SYNCHRONE
+                            data, nbparams = GeneratePDOMappingDCF(index - 0x200, cobid, 0x01, [])
+                        else:
+                            # Change TransmitType to ASYCHRONE
+                            data, nbparams = GeneratePDOMappingDCF(index - 0x200, cobid, 0xFF, [])
+                        
+                        # Add entry to slave dcf to change transmit type of 
+                        self.AddParamsToDCF(locationinfos["nodeid"], data, nbparams)
+                                    
                     mapping = [None]
                     values = node.GetEntry(index)
                     # Store the size of each entry mapped in PDO