beremiz: comparison plugger.py

equal deleted inserted replaced

-:aff053bad924
+:a66e150f2888
 iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+exe_ext)
 ieclib_path = os.path.join(base_folder, "matiec", "lib")
 # import for project creation timestamping
-from threading import Timer, Lock
+from threading import Timer, Lock, Thread
 from time import localtime
 from datetime import datetime
 # import necessary stuff from PLCOpenEditor
 from PLCControler import PLCControler
 from PLCOpenEditor import PLCOpenEditor, ProjectDialog
 import re
 import targets
 import connectors
 from discovery import DiscoveryDialog
+from weakref import WeakKeyDictionary
 class PluginsRoot(PlugTemplate, PLCControler):
 """
 This class define Root object of the plugin tree.
 It is responsible of :
 # Setup debug information
 self.IECdebug_datas = {}
 self.IECdebug_lock = Lock()
-# Timer to prevent rapid-fire when registering many variables
+self.DebugTimer=None
-self.DebugTimer=Timer(0.5,self.RegisterDebugVarToConnector)
 self.ResetIECProgramsAndVariables()
 #This method are not called here... but in NewProject and OpenProject
 #self._AddParamsMembers()
 #self.PluggedChilds = {}
 CSV file generated by IEC2C compiler.
 """
 self._ProgramList = None
 self._VariablesList = None
 self._IECPathToIdx = None
-self._IdxToIECPath = None
+self.TracedIECPath = []
 def GetIECProgramsAndVariables(self):
 """
 Parse CSV-like file  VARIABLES.csv resulting from IEC2C compiler.
 Each section is marked with a line staring with '//'
 list of all variables used in various POUs
 ProgramsListAttributeName = ["num", "C_path", "type"]
 VariablesListAttributeName = ["num", "vartype", "IEC_path", "C_path", "type"]
 self._ProgramList = []
 self._VariablesList = []
 self._IECPathToIdx = {}
-self._IdxToIECPath = {}
 # Separate sections
 ListGroup = []
 for line in open(csvfile,'r').xreadlines():
 strippedline = line.strip()
 self._VariablesList.append(attrs)
 # Fill in IEC<->C translation dicts
 IEC_path=attrs["IEC_path"]
 Idx=int(attrs["num"])
 self._IECPathToIdx[IEC_path]=Idx
-self._IdxToIECPath[Idx]=IEC_path
 except Exception,e:
 self.logger.write_error("Cannot open/parse VARIABLES.csv!\n")
 self.logger.write_error(traceback.format_exc())
 self.ResetIECProgramsAndVariables()
 return False
 for v in self._VariablesList if v["type"] in DebugTypes ])}
 return debug_code
 def RegisterDebugVarToConnector(self):
+self.DebugTimer=None
 Idxs = []
+self.TracedIECPath = []
 if self._connector is not None:
 self.IECdebug_lock.acquire()
-for IECPath,data_tuple in self.IECdebug_datas:
+for IECPath,data_tuple in self.IECdebug_datas.iteritems():
 WeakCallableDict, data_log, status = data_tuple
 if len(WeakCallableDict) == 0:
 # Callable Dict is empty.
 # This variable is not needed anymore!
 # self.IECdebug_callables.pop(IECPath)
 # TODO
-pass
+print "Unused : " + IECPath
 else:
 # Convert
 Idx = self._IECPathToIdx.get(IECPath,None)
 if Idx is not None:
 Idxs.append(Idx)
+self.TracedIECPath.append(IECPath)
 else:
 self.logger.write_warning("Debug : Unknown variable %s\n"%IECPath)
+self._connector.SetTraceVariablesList(Idxs)
 self.IECdebug_lock.release()
-self._connector.TraceVariables(Idxs)
+def SubscribeDebugIECVariable(self, IECPath, callableobj, *args, **kwargs):
-def SubscribeDebugIECVariable(self, IECPath, callable, *args, **kwargs):
 """
 Dispatching use a dictionnary linking IEC variable paths
 to a WeakKeyDictionary linking
 weakly referenced callables to optionnal args
 """
 WeakKeyDictionary(), # Callables
 [],                  # Data storage [(tick, data),...]
 "Registered"]        # Variable status
 self.IECdebug_datas[IECPath] = IECdebug_data
-IECdebug_data[0][callable]=(args, kwargs)
+IECdebug_data[0][callableobj]=(args, kwargs)
 self.IECdebug_lock.release()
+if self.DebugTimer is not None:
+self.DebugTimer.cancel()
+# Timer to prevent rapid-fire when registering many variables
+# use wx.CallAfter use keep using same thread. TODO : use wx.Timer instead
+self.DebugTimer=Timer(0.5,wx.CallAfter,args = [self.RegisterDebugVarToConnector])
 # Rearm anti-rapid-fire timer
-self.DebugTimer.cancel()
 self.DebugTimer.start()
+return IECdebug_data[1]
 def Generate_plc_common_main(self):
 """
 Use plugins layout given in LocationCFilesAndCFLAGS to
 generate glue code that dispatch calls to all plugins
 self.logger.write("Starting PLC\n")
 else:
 self.logger.write_error("Couldn't start PLC !\n")
 self.UpdateMethodsFromPLCStatus()
-def _Debug(self):
+def DebugThreadProc(self):
+while self._connector is not None:
+debug_tick, debug_vars = self._connector.GetTraceVariables()
+print debug_tick, debug_vars
+if debug_vars is not None and \
+len(debug_vars) == len(self.TracedIECPath):
+for IECPath,value in zip(self.TracedIECPath, debug_vars):
+data_tuple = self.IECdebug_datas.get(IECPath, None)
+if data_tuple is not None:
+WeakCallableDict, data_log, status = data_tuple
+data_log.append((debug_tick, value))
+for weakcallable,(args,kwargs) in WeakCallableDict.iteritems():
+wx.CallAfter(weakcallable, value, *args, **kwargs)
+elif debug_vars is not None:
+wx.CallAfter(self.logger.write_warning,
+"debug data not coherent %d != %d"%(len(debug_vars), len(self.TracedIECPath)))
+elif debug_tick == -1:
+#wx.CallAfter(self.logger.write, "Debugger unavailable\n")
+pass
+else:
+wx.CallAfter(self.logger.write, "Debugger disabled\n")
+break
+def _Debug(self):
 """
 Start PLC (Debug Mode)
 """
-if self.GetIECProgramsAndVariables() and self._connector.StartPLC():
+if self.GetIECProgramsAndVariables() and \
+self._connector.StartPLC(debug=True):
 self.logger.write("Starting PLC (debug mode)\n")
 # TODO : laucnch PLCOpenEditor in Debug Mode
-self.logger.write_warning("Debug mode for PLCopenEditor not implemented\n")
+self.DebugThread = Thread(target=self.DebugThreadProc)
-self.logger.write_warning("Starting alternative test GUI\n")
+self.DebugThread.start()
-# TODO : laucnch PLCOpenEditor in Debug Mode
 else:
 self.logger.write_error("Couldn't start PLC debug !\n")
 self.UpdateMethodsFromPLCStatus()
+#    def _Do_Test_Debug(self):
+#        # debug code
+#        self.temporary_non_weak_callable_refs = []
+#        for IEC_Path, idx in self._IECPathToIdx.iteritems():
+#            class tmpcls:
+#                def __init__(self):
+#                    self.buf = None
+#                def setbuf(self,buf):
+#                    self.buf = buf
+#                def __call__(self, value, idx, name):
+#                    print "debug call:", value, idx, name, self.buf
+#            a = tmpcls()
+#            res = self.SubscribeDebugIECVariable(IEC_Path, a, idx, IEC_Path)
+#            a.setbuf(res)
+#            self.temporary_non_weak_callable_refs.append(a)
 def _Stop(self):
 """
 Stop PLC
 """
 {"bitmap" : opjimg("Debug"),
 "name" : "Debug",
 "shown" : False,
 "tooltip" : "Start PLC (debug mode)",
 "method" : "_Debug"},
+#        {"bitmap" : opjimg("Debug"),
+#         "name" : "Do_Test_Debug",
+#         "tooltip" : "Test debug mode)",
+#         "method" : "_Do_Test_Debug"},
 {"bitmap" : opjimg("Stop"),
 "name" : "Stop",
 "shown" : False,
 "tooltip" : "Stop Running PLC",
 "method" : "_Stop"},

changeset 235	a66e150f2888
parent 228	848da15cf513
child 236	a32817e81f5e