lpcmanager

remerge

2012-06-17, Edouard Tisserant
4a0b29a86ec0
Parents 4922921a0c5c53a1fe844f7d
Children e67aa05712bc
remerge
1 files changed, 4 insertions(+), 4 deletions(-)
  • +4 -4
    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 ""