lpcmanager

Removed BMZ_DBG __builtin__ variable, the one set by presence of LPC_DEBUG file. Now use BEREMIZ_DEBUG file detected by launcher to get debug output window.
revamp
2018-02-05, Edouard Tisserant
a5bf111fe358
Parents 3731d5792801
Children 2faf6a91e2d8
Removed BMZ_DBG __builtin__ variable, the one set by presence of LPC_DEBUG file. Now use BEREMIZ_DEBUG file detected by launcher to get debug output window.
6 files changed, 8 insertions(+), 18 deletions(-)
  • +3 -4
    LPCCommand.py
  • +1 -9
    LPCManager.py
  • +0 -1
    LPCconnector/LPCAppProto.py
  • +0 -1
    LPCconnector/LPCBootProto.py
  • +1 -1
    LPCconnector/LPCProto.py
  • +3 -2
    StdoutPseudoFile.py
    • --- a/LPCCommand.py Mon Feb 05 14:03:30 2018 +0100
    +++ b/LPCCommand.py Mon Feb 05 15:45:38 2018 +0100
    @@ -89,10 +89,9 @@
    func = getattr(self, function)
    res = evaluator(func, *args)
    - if BMZ_DBG:
    - cmdlog.append((function, line, res))
    - if len(cmdlog) > 100: # prevent debug log to grow too much
    - cmdlog.pop(0)
    + # cmdlog.append((function, line, res))
    + # if len(cmdlog) > 100: # prevent debug log to grow too much
    + # cmdlog.pop(0)
    if isinstance(res, (StringType, UnicodeType)):
    self.Log.write(res)
    --- a/LPCManager.py Mon Feb 05 14:03:30 2018 +0100
    +++ b/LPCManager.py Mon Feb 05 15:45:38 2018 +0100
    @@ -80,7 +80,7 @@
    return globals()
    def CreateUI(self):
    - CMDpipe = self.StdoutPseudoFile.StdoutPseudoFile(self.port)
    + CMDpipe = self.StdoutPseudoFile.StdoutPseudoFile(self.port, self.debug)
    if self.projectOpen is not None:
    self.projectOpen = self.BeremizIDE.DecodeFileSystemPath(self.projectOpen, False)
    @@ -107,10 +107,6 @@
    pass
    def CreateApplication(self):
    - # BEREMIZ_DEBUG file detection in beremiz isn't enough (module scope)
    - # here we set BMZ_DBG interpreter-wise, so that submodules can use it.
    - __builtin__.__dict__["BMZ_DBG"] = os.path.exists("LPC_DEBUG")
    -
    # Create app usual way
    BeremizIDELauncher.CreateApplication(self)
    @@ -1013,10 +1009,6 @@
    return eval_res
    -# Command log for debug, for viewing from wxInspector
    -if BMZ_DBG:
    - __builtins__.cmdlog = []
    -
    if __name__ == '__main__':
    --- a/LPCconnector/LPCAppProto.py Mon Feb 05 14:03:30 2018 +0100
    +++ b/LPCconnector/LPCAppProto.py Mon Feb 05 15:45:38 2018 +0100
    @@ -115,7 +115,6 @@
    LPCAppTransaction.__init__(self, 0x0D)
    if __name__ == "__main__":
    - __builtins__.BMZ_DBG = True
    TestConnection = LPCAppProto(6,115200,2)
    # TestConnection.HandleTransaction(GET_PLCIDTransaction())
    TestConnection.HandleTransaction(STARTTransaction())
    --- a/LPCconnector/LPCBootProto.py Mon Feb 05 14:03:30 2018 +0100
    +++ b/LPCconnector/LPCBootProto.py Mon Feb 05 15:45:38 2018 +0100
    @@ -60,7 +60,6 @@
    return True
    if __name__ == "__main__":
    - __builtins__.BMZ_DBG = True
    TestConnection = LPCBootProto(2,115200,1200)
    mystr=file("fw.bin").read()
    def mylog(blah):
    --- a/LPCconnector/LPCProto.py Mon Feb 05 14:03:30 2018 +0100
    +++ b/LPCconnector/LPCProto.py Mon Feb 05 15:45:38 2018 +0100
    @@ -14,7 +14,7 @@
    class LPCProto:
    def __init__(self, port, rate, timeout):
    # serialize access lock
    - if BMZ_DBG:
    + if False:
    # Debugging serial stuff
    self._serialPort = serial.Serial( port, rate, timeout = timeout, writeTimeout = timeout )
    class myser:
    --- a/StdoutPseudoFile.py Mon Feb 05 14:03:30 2018 +0100
    +++ b/StdoutPseudoFile.py Mon Feb 05 15:45:38 2018 +0100
    @@ -3,10 +3,11 @@
    import socket
    class StdoutPseudoFile:
    - def __init__(self, port):
    + def __init__(self, port, debug):
    self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
    self.socket.connect(('localhost', port))
    self.Buffer = ""
    + self.debug = debug
    def __del__(self):
    self.socket.close()
    @@ -22,7 +23,7 @@
    if idx != -1:
    line = self.Buffer[:idx + 1]
    self.Buffer = self.Buffer[idx + 1:]
    - if BMZ_DBG:
    + if self.debug:
    print "command >" + line
    return line
    return ""