# HG changeset patch
# User Edouard Tisserant
# Date 1339930614 -7200
# Node ID 2e3c3da3593e0ee957abf2d9f107c7542647524a
# Parent  6450214a7c806cb01c9bd57a1a98e87bad51d8dd# Parent  8917feb27b92b8476a6202b41fdf51a93284c6ab
remerge

diff -r 6450214a7c80 -r 2e3c3da3593e LPCManager.py
--- a/LPCManager.py	Sat Jun 16 14:15:52 2012 +0200
+++ b/LPCManager.py	Sun Jun 17 12:56:54 2012 +0200
@@ -513,7 +513,7 @@
     }
     
     class LPCSlaveEditor(SlaveEditor):
-        BASE_PARAMS = False
+        SHOW_BASE_PARAMS = False
     
     class LPCCanOpenSlave(_SlaveCTN):
         XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?>
@@ -559,7 +559,7 @@
             return str(self.BaseParams.getIEC_Channel())
     
     class LPCNetworkEditor(NetworkEditor):
-        BASE_PARAMS = False
+        SHOW_BASE_PARAMS = False
         
     class LPCCanOpenMaster(_NodeListCTN):
         XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?>
@@ -581,8 +581,8 @@
     
     class LPCCanOpen(CanOpenRootClass):
         XSD = None
-        CTNChildrenTypes = [("CanOpenNode",LPCCanOpenMaster, "CanOpen Master"),
-                           ("CanOpenSlave",LPCCanOpenSlave, "CanOpen Slave")]
+        CTNChildrenTypes = [("CanOpenNode", LPCCanOpenMaster, "CanOpen Master"),
+                            ("CanOpenSlave", LPCCanOpenSlave, "CanOpen Slave")]
         
         def GetCanDriver(self):
             return ""