etherlab/EthercatCFileGenerator.py
changeset 2137 b65abacdbdf9
parent 2121 11102245e1d4
child 2139 1565239349a8
--- a/etherlab/EthercatCFileGenerator.py	Thu Apr 25 23:01:06 2013 +0200
+++ b/etherlab/EthercatCFileGenerator.py	Fri Apr 26 13:57:10 2013 +0200
@@ -201,7 +201,7 @@
             slave_pos = (slave_alias, alias[slave_alias])
             
             # Extract slave device informations
-            device, alignment = self.Controler.GetModuleInfos(type_infos)
+            device, module_extra_params = self.Controler.GetModuleInfos(type_infos)
             if device is not None:
                 
                 # Extract slaves variables to be mapped
@@ -495,9 +495,9 @@
                                     dynamic_pdos[pdo_type]["pdos"].append(pdo)
                                 
                                 pdo["entries"].append("    {0x%(index).4x, 0x%(subindex).2x, %(bitlen)d}, /* %(name)s */" % entry_infos)
-                                if entry_infos["bitlen"] < alignment:
-                                    print (alignment, entry_infos["bitlen"])
-                                    pdo["entries"].append("    {0x0000, 0x00, %d}, /* None */" % (alignment - entry_infos["bitlen"]))
+                                if entry_infos["bitlen"] < module_extra_params["pdo_alignment"]:
+                                    pdo["entries"].append("    {0x0000, 0x00, %d}, /* None */" % (
+                                            module_extra_params["pdo_alignment"] - entry_infos["bitlen"]))
                                 pdo["entries_number"] += 1
                                 
                                 if pdo["entries_number"] == 255: