# HG changeset patch
# User Laurent Bessard
# Date 1339929472 -7200
# Node ID 8917feb27b92b8476a6202b41fdf51a93284c6ab
# Parent  6aca5bc9c9a1616130a192c6507885ded3230357# Parent  73dcd03f53bb280879c24bb4a8106ba50d00676c
merge

diff -r 73dcd03f53bb -r 8917feb27b92 LPCManager.py
--- a/LPCManager.py	Fri Jun 15 18:28:57 2012 +0200
+++ b/LPCManager.py	Sun Jun 17 12:37:52 2012 +0200
@@ -513,7 +513,7 @@
     }
     
     class LPCSlaveEditor(SlaveEditor):
-        SHOW_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):
-        SHOW_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 ""