ProjectController.py
author Edouard Tisserant
Sat, 19 May 2012 15:54:16 +0200
changeset 732 c4b0f117e106
parent 731 4fc681ed0c61
child 733 915be999f3f0
permissions -rw-r--r--
Added reference to CTR in libraries
14
eb9fdd316a40 More precise design for plugins.... to be continued...
etisserant
parents: 13
diff changeset
     1
"""
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
     2
Beremiz Project Controller 
14
eb9fdd316a40 More precise design for plugins.... to be continued...
etisserant
parents: 13
diff changeset
     3
"""
eb9fdd316a40 More precise design for plugins.... to be continued...
etisserant
parents: 13
diff changeset
     4
178
2390b409eb93 Added PLC tick alignement on external synchronization source feature.
etisserant
parents: 176
diff changeset
     5
import os,sys,traceback
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
     6
import time
721
ecf4d203c4d4 refactoring
Edouard Tisserant
parents: 720
diff changeset
     7
import features
14
eb9fdd316a40 More precise design for plugins.... to be continued...
etisserant
parents: 13
diff changeset
     8
import shutil
22
9a0c535c3272 Pleliminary build process -- C code generation
etisserant
parents: 20
diff changeset
     9
import wx
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    10
import re, tempfile
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    11
from threading import Timer, Lock, Thread
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    12
from time import localtime
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    13
from datetime import datetime
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    14
from weakref import WeakKeyDictionary
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    15
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    16
import targets
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    17
import connectors
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    18
from util import MiniTextControler, opjimg, CheckPathPerm, GetClassImporter
726
ae63ccc29444 refactoring
Edouard Tisserant
parents: 725
diff changeset
    19
from util.ProcessLogger import ProcessLogger
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    20
from PLCControler import PLCControler 
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    21
from PLCOpenEditor import ProjectDialog
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    22
from TextViewer import TextViewer
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    23
from plcopen.structures import IEC_KEYWORDS
592
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
    24
from targets.typemapping import DebugTypesSize
726
ae63ccc29444 refactoring
Edouard Tisserant
parents: 725
diff changeset
    25
from util.discovery import DiscoveryDialog
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    26
from ConfigTreeNode import ConfigTreeNode
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    27
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    28
base_folder = os.path.split(sys.path[0])[0]
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    29
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
    30
MATIEC_ERROR_MODEL = re.compile(".*\.st:(\d+)-(\d+)\.\.(\d+)-(\d+): error : (.*)$")
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
    31
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
    32
DEBUG_RETRIES_WARN = 3
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
    33
DEBUG_RETRIES_REREGISTER = 4
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
    34
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    35
class ProjectController(ConfigTreeNode, PLCControler):
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    36
    """
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
    37
    This class define Root object of the confnode tree. 
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    38
    It is responsible of :
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    39
    - Managing project directory
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    40
    - Building project
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    41
    - Handling PLCOpenEditor controler and view
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
    42
    - Loading user confnodes and instanciante them as children
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    43
    - ...
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    44
    
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    45
    """
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    46
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
    47
    # For root object, available Children Types are modules of the confnode packages.
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    48
    CTNChildrenTypes =  [(n, GetClassImporter(c), d) for n,d,h,c in features.catalog]
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    49
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    50
    XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?>
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    51
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    52
      <xsd:element name="BeremizRoot">
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    53
        <xsd:complexType>
86
f0a9d74e3b26 Adding support for the new version of xmlclass
lbessard
parents: 82
diff changeset
    54
          <xsd:sequence>
f0a9d74e3b26 Adding support for the new version of xmlclass
lbessard
parents: 82
diff changeset
    55
            <xsd:element name="TargetType">
f0a9d74e3b26 Adding support for the new version of xmlclass
lbessard
parents: 82
diff changeset
    56
              <xsd:complexType>
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
    57
                <xsd:choice minOccurs="0">
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
    58
                """+targets.targetchoices+"""
106
9810689febb0 Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents: 105
diff changeset
    59
                </xsd:choice>
9810689febb0 Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents: 105
diff changeset
    60
              </xsd:complexType>
9810689febb0 Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents: 105
diff changeset
    61
            </xsd:element>
730
4480b7da6bea refactoring
laurent
parents: 728
diff changeset
    62
            <xsd:element name="Libraries" minOccurs="0">
4480b7da6bea refactoring
laurent
parents: 728
diff changeset
    63
              <xsd:complexType>
4480b7da6bea refactoring
laurent
parents: 728
diff changeset
    64
              """+"\n".join(['<xsd:attribute name="Enable_'+
731
4fc681ed0c61 refecored library extension machanism
Edouard Tisserant
parents: 730
diff changeset
    65
                             libname+
4fc681ed0c61 refecored library extension machanism
Edouard Tisserant
parents: 730
diff changeset
    66
                             '_Library" type="xsd:boolean" use="optional" default="true"/>' 
4fc681ed0c61 refecored library extension machanism
Edouard Tisserant
parents: 730
diff changeset
    67
                             for libname,lib in features.libraries])+"""
730
4480b7da6bea refactoring
laurent
parents: 728
diff changeset
    68
              </xsd:complexType>
4480b7da6bea refactoring
laurent
parents: 728
diff changeset
    69
            </xsd:element>
86
f0a9d74e3b26 Adding support for the new version of xmlclass
lbessard
parents: 82
diff changeset
    70
          </xsd:sequence>
204
f572ab819769 remove URI_location from XSD targets and add to pluginroot XSD
greg
parents: 203
diff changeset
    71
          <xsd:attribute name="URI_location" type="xsd:string" use="optional" default=""/>
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
    72
          <xsd:attribute name="Disable_Extensions" type="xsd:boolean" use="optional" default="false"/>
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    73
        </xsd:complexType>
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    74
      </xsd:element>
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    75
    </xsd:schema>
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    76
    """
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
    77
290
3bd617ae7a05 Local Runtime (LOCAL://) now launched "on demand"
etisserant
parents: 288
diff changeset
    78
    def __init__(self, frame, logger):
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
    79
        PLCControler.__init__(self)
227
48c13b84505c - Some improovements in debug data feedback data
etisserant
parents: 222
diff changeset
    80
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
    81
        self.MandatoryParams = None
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
    82
        self.SetAppFrame(frame, logger)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
    83
        self._builder = None
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
    84
        self._connector = None
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
    85
        
725
31dade089db5 refactoring
Edouard Tisserant
parents: 722
diff changeset
    86
        self.iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+(".exe" if wx.Platform == '__WXMSW__' else ""))
418
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
    87
        self.ieclib_path = os.path.join(base_folder, "matiec", "lib")
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
    88
        
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
    89
        # Setup debug information
227
48c13b84505c - Some improovements in debug data feedback data
etisserant
parents: 222
diff changeset
    90
        self.IECdebug_datas = {}
48c13b84505c - Some improovements in debug data feedback data
etisserant
parents: 222
diff changeset
    91
        self.IECdebug_lock = Lock()
222
d0f7d36bf241 Added lock to avoid variable subsciption concurrent to transmission to PLC
etisserant
parents: 217
diff changeset
    92
235
a66e150f2888 Improved debug data feedback.
etisserant
parents: 228
diff changeset
    93
        self.DebugTimer=None
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
    94
        self.ResetIECProgramsAndVariables()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
    95
118
185d0d371ea4 Refuse close if PLC running.
etisserant
parents: 115
diff changeset
    96
        # In both new or load scenario, no need to save
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
    97
        self.ChangesToSave = False
23
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
    98
        # root have no parent
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
    99
        self.CTNParent = None
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   100
        # Keep track of the confnode type name
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   101
        self.CTNType = "Beremiz"
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   102
        self.Children = {}
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   103
        # After __init__ root confnode is not valid
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   104
        self.ProjectPath = None
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   105
        self._setBuildPath(None)
286
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
   106
        self.DebugThread = None
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
   107
        self.debug_break = False
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
   108
        self.previous_plcstate = None
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   109
        # copy ConfNodeMethods so that it can be later customized
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   110
        self.ConfNodeMethods = [dic.copy() for dic in self.ConfNodeMethods]
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   111
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   112
    def LoadLibraries(self):
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   113
        self.Libraries = []
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   114
        TypeStack=[]
731
4fc681ed0c61 refecored library extension machanism
Edouard Tisserant
parents: 730
diff changeset
   115
        for libname,clsname in features.libraries:
4fc681ed0c61 refecored library extension machanism
Edouard Tisserant
parents: 730
diff changeset
   116
            if self.BeremizRoot.Libraries is None or getattr(self.BeremizRoot.Libraries, "Enable_"+libname+"_Library"):
732
c4b0f117e106 Added reference to CTR in libraries
Edouard Tisserant
parents: 731
diff changeset
   117
                Lib = GetClassImporter(clsname)()(self, libname, TypeStack)
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   118
                TypeStack.append(Lib.GetTypes())
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   119
                self.Libraries.append(Lib)
325
f2604900bf25 Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents: 321
diff changeset
   120
395
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
   121
    def __del__(self):
466
11263fd24566 Fixed remaining thread on close frame
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 465
diff changeset
   122
        if self.DebugTimer:
11263fd24566 Fixed remaining thread on close frame
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 465
diff changeset
   123
            self.DebugTimer.cancel()
11263fd24566 Fixed remaining thread on close frame
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 465
diff changeset
   124
        self.KillDebugThread()
395
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
   125
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   126
    def SetAppFrame(self, frame, logger):
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   127
        self.AppFrame = frame
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   128
        self.logger = logger
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   129
        self.StatusTimer = None
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   130
        
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   131
        if frame is not None:
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   132
            # Timer to pull PLC status
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   133
            ID_STATUSTIMER = wx.NewId()
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   134
            self.StatusTimer = wx.Timer(self.AppFrame, ID_STATUSTIMER)
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   135
            self.AppFrame.Bind(wx.EVT_TIMER, self.PullPLCStatusProc, self.StatusTimer)
652
eb2d9f2b3567 Adding support for loading specific POUs library in LPCBeremiz
laurent
parents: 639
diff changeset
   136
        
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   137
            self.RefreshConfNodesBlockLists()
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   138
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   139
    def ResetAppFrame(self, logger):
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   140
        if self.AppFrame is not None:
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   141
            self.AppFrame.Unbind(wx.EVT_TIMER, self.StatusTimer)
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   142
            self.StatusTimer = None
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   143
            self.AppFrame = None
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   144
        
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   145
        self.logger = logger
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   146
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   147
    def CTNTestModified(self):
118
185d0d371ea4 Refuse close if PLC running.
etisserant
parents: 115
diff changeset
   148
         return self.ChangesToSave or not self.ProjectIsSaved()
185d0d371ea4 Refuse close if PLC running.
etisserant
parents: 115
diff changeset
   149
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   150
    def CTNFullName(self):
656
c1792dfc8c7e Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents: 655
diff changeset
   151
        return ""
c1792dfc8c7e Fixing bug integrated plugin editors not closed when removing corresponding plugin
laurent
parents: 655
diff changeset
   152
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   153
    def GetCTRoot(self):
23
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   154
        return self
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   155
418
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   156
    def GetIECLibPath(self):
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   157
        return self.ieclib_path
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   158
    
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   159
    def GetIEC2cPath(self):
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   160
        return self.iec2c_path
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   161
    
23
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   162
    def GetCurrentLocation(self):
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   163
        return ()
47
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   164
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   165
    def GetCurrentName(self):
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   166
        return ""
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   167
    
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   168
    def _GetCurrentName(self):
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   169
        return ""
fd45c291fed0 PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents: 41
diff changeset
   170
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   171
    def GetProjectPath(self):
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   172
        return self.ProjectPath
51
c31c55601556 Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents: 49
diff changeset
   173
c31c55601556 Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents: 49
diff changeset
   174
    def GetProjectName(self):
c31c55601556 Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents: 49
diff changeset
   175
        return os.path.split(self.ProjectPath)[1]
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   176
    
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   177
    def GetDefaultTargetName(self):
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   178
        if wx.Platform == '__WXMSW__':
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   179
            return "Win32"
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   180
        else:
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   181
            return "Linux"
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   182
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   183
    def GetTarget(self):
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   184
        target = self.BeremizRoot.getTargetType()
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   185
        if target.getcontent() is None:
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   186
            target = self.Classes["BeremizRoot_TargetType"]()
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   187
            target_name = self.GetDefaultTargetName()
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   188
            target.setcontent({"name": target_name, "value": self.Classes["TargetType_%s"%target_name]()})
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   189
        return target
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   190
    
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   191
    def GetParamsAttributes(self, path = None):
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   192
        params = ConfigTreeNode.GetParamsAttributes(self, path)
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   193
        if params[0]["name"] == "BeremizRoot":
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   194
            for child in params[0]["children"]:
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   195
                if child["name"] == "TargetType" and child["value"] == '':
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   196
                    child.update(self.GetTarget().getElementInfos("TargetType")) 
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   197
        return params
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   198
        
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   199
    def SetParamsAttribute(self, path, value):
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   200
        if path.startswith("BeremizRoot.TargetType.") and self.BeremizRoot.getTargetType().getcontent() is None:
607
c68b662e0c2a Bug when changing parameters in TargetType section in Beremiz project configuration fixed
laurent
parents: 604
diff changeset
   201
            self.BeremizRoot.setTargetType(self.GetTarget())
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   202
        return ConfigTreeNode.SetParamsAttribute(self, path, value)
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   203
        
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   204
    # helper func to check project path write permission
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   205
    def CheckProjectPathPerm(self, dosave=True):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   206
        if CheckPathPerm(self.ProjectPath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   207
            return True
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   208
        dialog = wx.MessageDialog(self.AppFrame, 
428
ea09f33ce717 Update internationalization for new functionalities.
laurent
parents: 427
diff changeset
   209
                    _('You must have permission to work on the project\nWork on a project copy ?'),
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   210
                    _('Error'), 
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   211
                    wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   212
        answer = dialog.ShowModal()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   213
        dialog.Destroy()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   214
        if answer == wx.ID_YES:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   215
            if self.SaveProjectAs():
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   216
                self.AppFrame.RefreshAll()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   217
                self.AppFrame.RefreshTitle()
534
80f05b17de1e Bug on FileMenu not refreshed when modifications fixed
laurent
parents: 529
diff changeset
   218
                self.AppFrame.RefreshFileMenu()
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   219
                return True
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   220
        return False
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   221
    
256
1da137b99948 add buildpath parameter for beremiz
greg
parents: 253
diff changeset
   222
    def NewProject(self, ProjectPath, BuildPath=None):
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   223
        """
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   224
        Create a new project in an empty folder
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   225
        @param ProjectPath: path of the folder where project have to be created
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   226
        @param PLCParams: properties of the PLCOpen program created
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   227
        """
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   228
        # Verify that chosen folder is empty
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   229
        if not os.path.isdir(ProjectPath) or len(os.listdir(ProjectPath)) > 0:
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   230
            return _("Chosen folder isn't empty. You can't use it for a new project!")
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   231
        
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   232
        dialog = ProjectDialog(self.AppFrame)
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   233
        if dialog.ShowModal() == wx.ID_OK:
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   234
            values = dialog.GetValues()
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   235
            values["creationDateTime"] = datetime(*localtime()[:6])
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   236
            dialog.Destroy()
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   237
        else:
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   238
            dialog.Destroy()
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   239
            return _("Project not created")
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   240
        
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
   241
        # Create PLCOpen program
113
78a92a18f8d6 Fixed new project creation bug
etisserant
parents: 110
diff changeset
   242
        self.CreateNewProject(values)
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   243
        # Change XSD into class members
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   244
        self._AddParamsMembers()
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   245
        self.Children = {}
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   246
        # Keep track of the root confnode (i.e. project path)
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   247
        self.ProjectPath = ProjectPath
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   248
        self._setBuildPath(BuildPath)
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   249
        # get confnodes bloclist (is that usefull at project creation?)
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   250
        self.RefreshConfNodesBlockLists()
114
2e3d8d4480e7 Now .xml files are automatically created when creating a new project no need to save explicitely.
etisserant
parents: 113
diff changeset
   251
        # this will create files base XML files
2e3d8d4480e7 Now .xml files are automatically created when creating a new project no need to save explicitely.
etisserant
parents: 113
diff changeset
   252
        self.SaveProject()
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   253
        return None
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   254
        
256
1da137b99948 add buildpath parameter for beremiz
greg
parents: 253
diff changeset
   255
    def LoadProject(self, ProjectPath, BuildPath=None):
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   256
        """
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   257
        Load a project contained in a folder
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   258
        @param ProjectPath: path of the project folder
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   259
        """
190
be969d4694c7 Bug with folder path ending by '/' or '\' fixed
lbessard
parents: 178
diff changeset
   260
        if os.path.basename(ProjectPath) == "":
be969d4694c7 Bug with folder path ending by '/' or '\' fixed
lbessard
parents: 178
diff changeset
   261
            ProjectPath = os.path.dirname(ProjectPath)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   262
		# Verify that project contains a PLCOpen program
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   263
        plc_file = os.path.join(ProjectPath, "plc.xml")
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   264
        if not os.path.isfile(plc_file):
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   265
            return _("Chosen folder doesn't contain a program. It's not a valid project!")
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   266
        # Load PLCOpen file
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
   267
        result = self.OpenXMLFile(plc_file)
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   268
        if result:
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   269
            return result
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   270
        # Change XSD into class members
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   271
        self._AddParamsMembers()
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   272
        self.Children = {}
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   273
        # Keep track of the root confnode (i.e. project path)
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   274
        self.ProjectPath = ProjectPath
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   275
        self._setBuildPath(BuildPath)
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   276
        # If dir have already be made, and file exist
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   277
        if os.path.isdir(self.CTNPath()) and os.path.isfile(self.ConfNodeXmlFilePath()):
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   278
            #Load the confnode.xml file into parameters members
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   279
            result = self.LoadXMLParams()
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   280
            if result:
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   281
                return result
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   282
            #Load and init all the children
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   283
            self.LoadChildren()
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   284
        self.RefreshConfNodesBlockLists()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   285
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   286
        if os.path.exists(self._getBuildPath()):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   287
            self.EnableMethod("_Clean", True)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   288
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   289
        if os.path.isfile(self._getIECrawcodepath()):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   290
            self.ShowMethod("_showIECcode", True)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   291
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   292
        return None
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   293
    
403
ae4a85291441 Removing memory leak while closing PluginsRoot
laurent
parents: 402
diff changeset
   294
    def CloseProject(self):
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   295
        self.ClearChildren()
417
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   296
        self.ResetAppFrame(None)
a895ae50b737 Adding support for declaring PluginRoot outside of Beremiz
laurent
parents: 415
diff changeset
   297
        
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   298
    def SaveProject(self):
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   299
        if self.CheckProjectPathPerm(False):
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
   300
            self.SaveXMLFile(os.path.join(self.ProjectPath, 'plc.xml'))
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   301
            result = self.CTNRequestSave()
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   302
            if result:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   303
                self.logger.write_error(result)
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   304
    
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   305
    def SaveProjectAs(self, dosave=True):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   306
        # Ask user to choose a path with write permissions
529
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   307
        if wx.Platform == '__WXMSW__':
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   308
            path = os.getenv("USERPROFILE")
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   309
        else:
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   310
            path = os.getenv("HOME")
ffe0fba7e427 Bug when try to SaveAs on Windows fixed
laurent
parents: 516
diff changeset
   311
        dirdialog = wx.DirDialog(self.AppFrame , _("Choose a directory to save project"), path, wx.DD_NEW_DIR_BUTTON)
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   312
        answer = dirdialog.ShowModal()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   313
        dirdialog.Destroy()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   314
        if answer == wx.ID_OK:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   315
            newprojectpath = dirdialog.GetPath()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   316
            if os.path.isdir(newprojectpath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   317
                self.ProjectPath = newprojectpath
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   318
                if dosave:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   319
                    self.SaveProject()
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   320
                self._setBuildPath(self.BuildPath)
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   321
                return True
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   322
        return False
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   323
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   324
    def GetLibrariesTypes(self):
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   325
        self.LoadLibraries()
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   326
        return [ lib.GetTypes() for lib in self.Libraries ]
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   327
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   328
    def GetLibrariesSTCode(self):
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   329
        return "\n".join([ lib.GetSTCode() for lib in self.Libraries ])
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   330
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   331
    def GetLibrariesCCode(self, buildpath):
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   332
        self.GetIECProgramsAndVariables()
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   333
        LibIECCflags = '"-I%s"'%os.path.abspath(self.GetIECLibPath())
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   334
        LocatedCCodeAndFlags=[]
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   335
        Extras=[]
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   336
        for lib in self.Libraries:
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   337
            res=lib.Generate_C(buildpath,self._VariablesList,LibIECCflags)  
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   338
            LocatedCCodeAndFlags.append(res[:2])
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   339
            if len(res)>2:
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   340
                Extras.append(res[2:])
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   341
        return map(list,zip(*LocatedCCodeAndFlags))+[tuple(Extras)]
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   342
    
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   343
    # Update PLCOpenEditor ConfNode Block types from loaded confnodes
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   344
    def RefreshConfNodesBlockLists(self):
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   345
        if getattr(self, "Children", None) is not None:
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   346
            self.ClearConfNodeTypes()
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   347
            self.AddConfNodeTypesList(self.GetLibrariesTypes())
395
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
   348
        if self.AppFrame is not None:
716
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   349
            self.AppFrame.RefreshLibraryPanel()
395
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
   350
            self.AppFrame.RefreshEditor()
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
   351
    
443
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   352
    # Update a PLCOpenEditor Pou variable location
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   353
    def UpdateProjectVariableLocation(self, old_leading, new_leading):
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   354
        self.Project.updateElementAddress(old_leading, new_leading)
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   355
        self.BufferProject()
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   356
        if self.AppFrame is not None:
468
d750151bd6ae Bug when updating Variable locations fixed
laurent
parents: 466
diff changeset
   357
            self.AppFrame.RefreshTitle()
730
4480b7da6bea refactoring
laurent
parents: 728
diff changeset
   358
            self.AppFrame.RefreshPouInstanceVariablesPanel()
468
d750151bd6ae Bug when updating Variable locations fixed
laurent
parents: 466
diff changeset
   359
            self.AppFrame.RefreshFileMenu()
d750151bd6ae Bug when updating Variable locations fixed
laurent
parents: 466
diff changeset
   360
            self.AppFrame.RefreshEditMenu()
443
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   361
            self.AppFrame.RefreshEditor()
34c9788bd933 Adding support for updating located variables when changing plugin IEC_Channel
laurent
parents: 440
diff changeset
   362
    
401
8106a853a7c7 Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents: 396
diff changeset
   363
    def GetVariableLocationTree(self):
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   364
        '''
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   365
        This function is meant to be overridden by confnodes.
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   366
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   367
        It should returns an list of dictionaries
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   368
        
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   369
        - IEC_type is an IEC type like BOOL/BYTE/SINT/...
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   370
        - location is a string of this variable's location, like "%IX0.0.0"
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   371
        '''
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   372
        children = []
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   373
        for child in self.IECSortedChildren():
411
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   374
            children.append(child.GetVariableLocationTree())
8261c8f1e365 Bug on Debug trying to start (and stop) before PLC started fixed.
laurent
parents: 403
diff changeset
   375
        return children
401
8106a853a7c7 Adding support for displaying plugins available variable into Beremiz plugin tree
laurent
parents: 396
diff changeset
   376
    
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   377
    def ConfNodePath(self):
721
ecf4d203c4d4 refactoring
Edouard Tisserant
parents: 720
diff changeset
   378
        return os.path.split(__file__)[0]
363
e0c4d3549369 Adding support for recursively generate STLibrary and BlockLibrary according to plugin tree
laurent
parents: 361
diff changeset
   379
    
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   380
    def CTNPath(self, CTNName=None):
13
f1f0edbeb313 More precise design for plugins.... to be continued...
etisserant
parents:
diff changeset
   381
        return self.ProjectPath
17
ee8cb104dbe0 First commit of Beremiz new version with plugin support
lbessard
parents: 16
diff changeset
   382
    
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   383
    def ConfNodeXmlFilePath(self, CTNName=None):
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   384
        return os.path.join(self.CTNPath(CTNName), "beremiz.xml")
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   385
669
472469f4d5ad Adding support for loading datatypes defined in plugins to allow to use them in PLC program
laurent
parents: 661
diff changeset
   386
    def ParentsTypesFactory(self):
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   387
        return self.ConfNodeTypesFactory()
363
e0c4d3549369 Adding support for recursively generate STLibrary and BlockLibrary according to plugin tree
laurent
parents: 361
diff changeset
   388
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   389
    def _setBuildPath(self, buildpath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   390
        if CheckPathPerm(buildpath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   391
            self.BuildPath = buildpath
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   392
        else:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   393
            self.BuildPath = None
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   394
        self.BuildPath = buildpath
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   395
        self.DefaultBuildPath = None
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   396
        if self._builder is not None:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   397
            self._builder.SetBuildPath(self._getBuildPath())
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   398
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   399
    def _getBuildPath(self):
427
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   400
        # BuildPath is defined by user
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   401
        if self.BuildPath is not None:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   402
            return self.BuildPath
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   403
        # BuildPath isn't defined by user but already created by default
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   404
        if self.DefaultBuildPath is not None:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   405
            return self.DefaultBuildPath
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   406
        # Create a build path in project folder if user has permissions
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   407
        if CheckPathPerm(self.ProjectPath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   408
            self.DefaultBuildPath = os.path.join(self.ProjectPath, "build")
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   409
        # Create a build path in temp folder
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   410
        else:
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   411
            self.DefaultBuildPath = os.path.join(tempfile.mkdtemp(), os.path.basename(self.ProjectPath), "build")
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   412
            
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   413
        if not os.path.exists(self.DefaultBuildPath):
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   414
            os.makedirs(self.DefaultBuildPath)
7ac746c07ff2 Check ProjectPath write permission
greg
parents: 423
diff changeset
   415
        return self.DefaultBuildPath
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   416
    
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   417
    def _getExtraFilesPath(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   418
        return os.path.join(self._getBuildPath(), "extra_files")
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   419
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   420
    def _getIECcodepath(self):
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   421
        # define name for IEC code file
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   422
        return os.path.join(self._getBuildPath(), "plc.st")
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   423
    
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   424
    def _getIECgeneratedcodepath(self):
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   425
        # define name for IEC generated code file
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   426
        return os.path.join(self._getBuildPath(), "generated_plc.st")
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   427
    
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   428
    def _getIECrawcodepath(self):
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   429
        # define name for IEC raw code file
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   430
        return os.path.join(self.CTNPath(), "raw_plc.st")
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   431
    
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   432
    def GetLocations(self):
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   433
        locations = []
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   434
        filepath = os.path.join(self._getBuildPath(),"LOCATED_VARIABLES.h")
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   435
        if os.path.isfile(filepath):
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   436
            # IEC2C compiler generate a list of located variables : LOCATED_VARIABLES.h
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   437
            location_file = open(os.path.join(self._getBuildPath(),"LOCATED_VARIABLES.h"))
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   438
            # each line of LOCATED_VARIABLES.h declares a located variable
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   439
            lines = [line.strip() for line in location_file.readlines()]
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   440
            # This regular expression parses the lines genereated by IEC2C
348
054fbf1ae0f8 Bug while parsing long located variables in GetLocations fixed
lbessard
parents: 338
diff changeset
   441
            LOCATED_MODEL = re.compile("__LOCATED_VAR\((?P<IEC_TYPE>[A-Z]*),(?P<NAME>[_A-Za-z0-9]*),(?P<DIR>[QMI])(?:,(?P<SIZE>[XBWDL]))?,(?P<LOC>[,0-9]*)\)")
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   442
            for line in lines:
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   443
                # If line match RE, 
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   444
                result = LOCATED_MODEL.match(line)
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   445
                if result:
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   446
                    # Get the resulting dict
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   447
                    resdict = result.groupdict()
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   448
                    # rewrite string for variadic location as a tuple of integers
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   449
                    resdict['LOC'] = tuple(map(int,resdict['LOC'].split(',')))
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   450
                    # set located size to 'X' if not given 
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   451
                    if not resdict['SIZE']:
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   452
                        resdict['SIZE'] = 'X'
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   453
                    # finally store into located variable list
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   454
                    locations.append(resdict)
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   455
        return locations
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   456
        
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   457
    def _Generate_SoftPLC(self):
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   458
        """
64
531e6a834d7e Change generate_cc to generate_c
lbessard
parents: 62
diff changeset
   459
        Generate SoftPLC ST/IL/SFC code out of PLCOpenEditor controller, and compile it with IEC2C
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   460
        @param buildpath: path where files should be created
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   461
        """
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   462
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   463
        # Update PLCOpenEditor ConfNode Block types before generate ST code
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   464
        self.RefreshConfNodesBlockLists()
41
1608a434fb8c Adding support for refreshing PLCOpenEditor block list
lbessard
parents: 40
diff changeset
   465
        
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   466
        self.logger.write(_("Generating SoftPLC IEC-61131 ST/IL/SFC code...\n"))
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   467
        buildpath = self._getBuildPath()
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   468
        # ask PLCOpenEditor controller to write ST/IL/SFC code file
309
6eb074f0dae9 Adding support for cancelling code generation of function with no input connected
lbessard
parents: 304
diff changeset
   469
        program, errors, warnings = self.GenerateProgram(self._getIECgeneratedcodepath())
6eb074f0dae9 Adding support for cancelling code generation of function with no input connected
lbessard
parents: 304
diff changeset
   470
        if len(warnings) > 0:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   471
            self.logger.write_warning(_("Warnings in ST/IL/SFC code generator :\n"))
309
6eb074f0dae9 Adding support for cancelling code generation of function with no input connected
lbessard
parents: 304
diff changeset
   472
            for warning in warnings:
6eb074f0dae9 Adding support for cancelling code generation of function with no input connected
lbessard
parents: 304
diff changeset
   473
                self.logger.write_warning("%s\n"%warning)
6eb074f0dae9 Adding support for cancelling code generation of function with no input connected
lbessard
parents: 304
diff changeset
   474
        if len(errors) > 0:
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   475
            # Failed !
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   476
            self.logger.write_error(_("Error in ST/IL/SFC code generator :\n%s\n")%errors[0])
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   477
            return False
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   478
        plc_file = open(self._getIECcodepath(), "w")
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   479
        # Add ST Library from confnodes
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   480
        plc_file.write(self.GetLibrariesSTCode())
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   481
        if os.path.isfile(self._getIECrawcodepath()):
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   482
            plc_file.write(open(self._getIECrawcodepath(), "r").read())
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   483
            plc_file.write("\n")
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   484
        plc_file.close()
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   485
        plc_file = open(self._getIECcodepath(), "r")
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   486
        self.ProgramOffset = 0
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   487
        for line in plc_file.xreadlines():
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   488
            self.ProgramOffset += 1
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   489
        plc_file.close()
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   490
        plc_file = open(self._getIECcodepath(), "a")
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   491
        plc_file.write(open(self._getIECgeneratedcodepath(), "r").read())
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   492
        plc_file.close()
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   493
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   494
        self.logger.write(_("Compiling IEC Program into C code...\n"))
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   495
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   496
        # Now compile IEC code into many C files
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   497
        # files are listed to stdout, and errors to stderr. 
110
a05e8b30c024 Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents: 109
diff changeset
   498
        status, result, err_result = ProcessLogger(
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   499
               self.logger,
351
89eca146bee0 Adding support for matiec new command line syntax
lbessard
parents: 350
diff changeset
   500
               "\"%s\" -f -I \"%s\" -T \"%s\" \"%s\""%(
418
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   501
                         self.iec2c_path,
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   502
                         self.ieclib_path, 
351
89eca146bee0 Adding support for matiec new command line syntax
lbessard
parents: 350
diff changeset
   503
                         buildpath,
89eca146bee0 Adding support for matiec new command line syntax
lbessard
parents: 350
diff changeset
   504
                         self._getIECcodepath()),
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   505
               no_stdout=True, no_stderr=True).spin()
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   506
        if status:
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   507
            # Failed !
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   508
            
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   509
            # parse iec2c's error message. if it contains a line number,
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   510
            # then print those lines from the generated IEC file.
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   511
            for err_line in err_result.split('\n'):
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   512
                self.logger.write_warning(err_line + "\n")
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   513
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   514
                m_result = MATIEC_ERROR_MODEL.match(err_line)
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   515
                if m_result is not None:
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   516
                    first_line, first_column, last_line, last_column, error = m_result.groups()
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   517
                    first_line, last_line = int(first_line), int(last_line)
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   518
                    
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   519
                    last_section = None
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   520
                    f = open(self._getIECcodepath())
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   521
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   522
                    for i, line in enumerate(f.readlines()):
661
5d3da49e8029 Fixing bug in displaying lines of code at the origin of matiec errors
laurent
parents: 656
diff changeset
   523
                        i = i + 1
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   524
                        if line[0] not in '\t \r\n':
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   525
                            last_section = line
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   526
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   527
                        if first_line <= i <= last_line:
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   528
                            if last_section is not None:
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   529
                                self.logger.write_warning("In section: " + last_section)
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   530
                                last_section = None # only write section once
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   531
                            self.logger.write_warning("%04d: %s" % (i, line))
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   532
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   533
                    f.close()
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   534
            
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   535
            self.logger.write_error(_("Error : IEC to C compiler returned %d\n")%status)
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   536
            return False
356
e9698d0ee5f3 Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents: 355
diff changeset
   537
        
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   538
        # Now extract C files of stdout
113
78a92a18f8d6 Fixed new project creation bug
etisserant
parents: 110
diff changeset
   539
        C_files = [ fname for fname in result.splitlines() if fname[-2:]==".c" or fname[-2:]==".C" ]
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   540
        # remove those that are not to be compiled because included by others
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   541
        C_files.remove("POUS.c")
115
9ffdac9cf609 Fixed empty build exception.
etisserant
parents: 114
diff changeset
   542
        if not C_files:
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
   543
            self.logger.write_error(_("Error : At least one configuration and one resource must be declared in PLC !\n"))
115
9ffdac9cf609 Fixed empty build exception.
etisserant
parents: 114
diff changeset
   544
            return False
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   545
        # transform those base names to full names with path
23
e007d9d466d7 minor fixes
etisserant
parents: 22
diff changeset
   546
        C_files = map(lambda filename:os.path.join(buildpath, filename), C_files)
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   547
        self.logger.write(_("Extracting Located Variables...\n"))
97
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   548
        # Keep track of generated located variables for later use by self._Generate_C
9c6fdf60ad2e Beremiz layout changed
lbessard
parents: 96
diff changeset
   549
        self.PLCGeneratedLocatedVars = self.GetLocations()
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   550
        # Keep track of generated C files for later use by self.CTNGenerate_C
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   551
        self.PLCGeneratedCFiles = C_files
49
45dc6a944ab6 On the long wat towards generated code comilation...
etisserant
parents: 47
diff changeset
   552
        # compute CFLAGS for plc
418
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   553
        self.plcCFLAGS = "\"-I"+self.ieclib_path+"\""
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   554
        return True
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   555
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   556
    def GetBuilder(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   557
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   558
        Return a Builder (compile C code into machine code)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   559
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   560
        # Get target, module and class name
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   561
        targetname = self.GetTarget().getcontent()["name"]
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   562
        modulename = "targets." + targetname
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   563
        classname = targetname + "_target"
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   564
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   565
        # Get module reference
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   566
        try :
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   567
            targetmodule = getattr(__import__(modulename), targetname)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   568
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   569
        except Exception, msg:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   570
            self.logger.write_error(_("Can't find module for target %s!\n")%targetname)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   571
            self.logger.write_error(str(msg))
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   572
            return None
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   573
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   574
        # Get target class
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   575
        targetclass = getattr(targetmodule, classname)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   576
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   577
        # if target already 
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   578
        if self._builder is None or not isinstance(self._builder,targetclass):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   579
            # Get classname instance
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   580
            self._builder = targetclass(self)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   581
        return self._builder
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   582
677
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   583
    def ResetBuildMD5(self):
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   584
        builder=self.GetBuilder()
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   585
        if builder is not None:
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   586
            builder.ResetBinaryCodeMD5()
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   587
        self.EnableMethod("_Transfer", False)
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   588
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   589
    def GetLastBuildMD5(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   590
        builder=self.GetBuilder()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   591
        if builder is not None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   592
            return builder.GetBinaryCodeMD5()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   593
        else:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   594
            return None
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   595
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   596
    #######################################################################
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   597
    #
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   598
    #                C CODE GENERATION METHODS
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   599
    #
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   600
    #######################################################################
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   601
    
718
5d4dc150b956 refactoring
Edouard Tisserant
parents: 717
diff changeset
   602
    def CTNGenerate_C(self, buildpath, locations):
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   603
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   604
        Return C code generated by iec2c compiler 
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   605
        when _generate_softPLC have been called
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   606
        @param locations: ignored
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   607
        @return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   608
        """
283
d0e6fc0701fb Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents: 280
diff changeset
   609
366
cd90e4c10261 Move python evaluator to create a python plugin containing any related python module
laurent
parents: 363
diff changeset
   610
        return ([(C_file_name, self.plcCFLAGS) 
283
d0e6fc0701fb Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents: 280
diff changeset
   611
                for C_file_name in self.PLCGeneratedCFiles ], 
d0e6fc0701fb Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents: 280
diff changeset
   612
               "", # no ldflags
d0e6fc0701fb Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents: 280
diff changeset
   613
               False) # do not expose retreive/publish calls
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   614
    
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   615
    def ResetIECProgramsAndVariables(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   616
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   617
        Reset variable and program list that are parsed from
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   618
        CSV file generated by IEC2C compiler.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   619
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   620
        self._ProgramList = None
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   621
        self._VariablesList = None
532
a822b0b64252 Fixed startin debugger with non empty debug variable list
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 529
diff changeset
   622
        self._IECPathToIdx = {}
670
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
   623
        self._Ticktime = 0
235
a66e150f2888 Improved debug data feedback.
etisserant
parents: 228
diff changeset
   624
        self.TracedIECPath = []
a66e150f2888 Improved debug data feedback.
etisserant
parents: 228
diff changeset
   625
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   626
    def GetIECProgramsAndVariables(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   627
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   628
        Parse CSV-like file  VARIABLES.csv resulting from IEC2C compiler.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   629
        Each section is marked with a line staring with '//'
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   630
        list of all variables used in various POUs
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   631
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   632
        if self._ProgramList is None or self._VariablesList is None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   633
            try:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   634
                csvfile = os.path.join(self._getBuildPath(),"VARIABLES.csv")
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   635
                # describes CSV columns
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   636
                ProgramsListAttributeName = ["num", "C_path", "type"]
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   637
                VariablesListAttributeName = ["num", "vartype", "IEC_path", "C_path", "type"]
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   638
                self._ProgramList = []
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   639
                self._VariablesList = []
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   640
                self._IECPathToIdx = {}
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   641
                
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   642
                # Separate sections
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   643
                ListGroup = []
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   644
                for line in open(csvfile,'r').xreadlines():
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   645
                    strippedline = line.strip()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   646
                    if strippedline.startswith("//"):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   647
                        # Start new section
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   648
                        ListGroup.append([])
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   649
                    elif len(strippedline) > 0 and len(ListGroup) > 0:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   650
                        # append to this section
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   651
                        ListGroup[-1].append(strippedline)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   652
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   653
                # first section contains programs
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   654
                for line in ListGroup[0]:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   655
                    # Split and Maps each field to dictionnary entries
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   656
                    attrs = dict(zip(ProgramsListAttributeName,line.strip().split(';')))
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   657
                    # Truncate "C_path" to remove conf an ressources names
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   658
                    attrs["C_path"] = '__'.join(attrs["C_path"].split(".",2)[1:])
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   659
                    # Push this dictionnary into result.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   660
                    self._ProgramList.append(attrs)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   661
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   662
                # second section contains all variables
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   663
                for line in ListGroup[1]:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   664
                    # Split and Maps each field to dictionnary entries
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   665
                    attrs = dict(zip(VariablesListAttributeName,line.strip().split(';')))
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   666
                    # Truncate "C_path" to remove conf an ressources names
639
85dad46ae0f6 Fixing bug that prevent to use global variables in configuration
laurent
parents: 630
diff changeset
   667
                    parts = attrs["C_path"].split(".",2)
85dad46ae0f6 Fixing bug that prevent to use global variables in configuration
laurent
parents: 630
diff changeset
   668
                    if len(parts) > 2:
85dad46ae0f6 Fixing bug that prevent to use global variables in configuration
laurent
parents: 630
diff changeset
   669
                        attrs["C_path"] = '__'.join(parts[1:])
85dad46ae0f6 Fixing bug that prevent to use global variables in configuration
laurent
parents: 630
diff changeset
   670
                    else:
85dad46ae0f6 Fixing bug that prevent to use global variables in configuration
laurent
parents: 630
diff changeset
   671
                        attrs["C_path"] = '__'.join(parts)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   672
                    # Push this dictionnary into result.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   673
                    self._VariablesList.append(attrs)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   674
                    # Fill in IEC<->C translation dicts
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   675
                    IEC_path=attrs["IEC_path"]
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   676
                    Idx=int(attrs["num"])
450
18583d13f0fa Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 447
diff changeset
   677
                    self._IECPathToIdx[IEC_path]=(Idx, attrs["type"])
670
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
   678
                
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
   679
                # third section contains ticktime
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
   680
                if len(ListGroup) > 2:
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
   681
                    self._Ticktime = int(ListGroup[2][0]) 
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
   682
                
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   683
            except Exception,e:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   684
                self.logger.write_error(_("Cannot open/parse VARIABLES.csv!\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   685
                self.logger.write_error(traceback.format_exc())
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   686
                self.ResetIECProgramsAndVariables()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   687
                return False
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   688
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   689
        return True
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   690
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   691
    def Generate_plc_debugger(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   692
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   693
        Generate trace/debug code out of PLC variable list
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   694
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   695
        self.GetIECProgramsAndVariables()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   696
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   697
        # prepare debug code
209
08dc3d064cb5 Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents: 206
diff changeset
   698
        debug_code = targets.code("plc_debug") % {
335
c5f3f71e7260 fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents: 334
diff changeset
   699
           "buffer_size": reduce(lambda x, y: x + y, [DebugTypesSize.get(v["type"], 0) for v in self._VariablesList], 0),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   700
           "programs_declarations":
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   701
               "\n".join(["extern %(type)s %(C_path)s;"%p for p in self._ProgramList]),
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   702
           "extern_variables_declarations":"\n".join([
506
24629d4fc805 Adding support for making distinction between external variables and located variables for forcing
laurent
parents: 496
diff changeset
   703
              {"EXT":"extern __IEC_%(type)s_p %(C_path)s;",
24629d4fc805 Adding support for making distinction between external variables and located variables for forcing
laurent
parents: 496
diff changeset
   704
               "IN":"extern __IEC_%(type)s_p %(C_path)s;",
601
d0e3fc4b9951 Fix bug when debugging located variables of type memory (%M)
laurent
parents: 592
diff changeset
   705
               "MEM":"extern __IEC_%(type)s_p %(C_path)s;",
506
24629d4fc805 Adding support for making distinction between external variables and located variables for forcing
laurent
parents: 496
diff changeset
   706
               "OUT":"extern __IEC_%(type)s_p %(C_path)s;",
463
961bddcfc913 Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents: 462
diff changeset
   707
               "VAR":"extern __IEC_%(type)s_t %(C_path)s;"}[v["vartype"]]%v 
275
ff7c8eb3f362 Adding Function Blocks in VARIABLES.csv
lbessard
parents: 274
diff changeset
   708
               for v in self._VariablesList if v["vartype"] != "FB" and v["C_path"].find('.')<0]),
450
18583d13f0fa Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 447
diff changeset
   709
           "for_each_variable_do_code":"\n".join([
506
24629d4fc805 Adding support for making distinction between external variables and located variables for forcing
laurent
parents: 496
diff changeset
   710
               {"EXT":"    (*fp)((void*)&%(C_path)s,%(type)s_P_ENUM);\n",
24629d4fc805 Adding support for making distinction between external variables and located variables for forcing
laurent
parents: 496
diff changeset
   711
                "IN":"    (*fp)((void*)&%(C_path)s,%(type)s_P_ENUM);\n",
604
5b1c92060fc2 memory located variables no behave like outputs, when forced
Edouard Tisserant
parents: 601
diff changeset
   712
                "MEM":"    (*fp)((void*)&%(C_path)s,%(type)s_O_ENUM);\n",
511
518c30f2a507 Adding support for hard forcing located output
laurent
parents: 510
diff changeset
   713
                "OUT":"    (*fp)((void*)&%(C_path)s,%(type)s_O_ENUM);\n",
450
18583d13f0fa Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 447
diff changeset
   714
                "VAR":"    (*fp)((void*)&%(C_path)s,%(type)s_ENUM);\n"}[v["vartype"]]%v
592
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
   715
                for v in self._VariablesList if v["vartype"] != "FB" and v["type"] in DebugTypesSize ]),
450
18583d13f0fa Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 447
diff changeset
   716
           "find_variable_case_code":"\n".join([
18583d13f0fa Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 447
diff changeset
   717
               "    case %(num)s:\n"%v+
458
dfc6164e4022 Debugger still doesn't work crash less...
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 457
diff changeset
   718
               "        *varp = (void*)&%(C_path)s;\n"%v+
506
24629d4fc805 Adding support for making distinction between external variables and located variables for forcing
laurent
parents: 496
diff changeset
   719
               {"EXT":"        return %(type)s_P_ENUM;\n",
24629d4fc805 Adding support for making distinction between external variables and located variables for forcing
laurent
parents: 496
diff changeset
   720
                "IN":"        return %(type)s_P_ENUM;\n",
604
5b1c92060fc2 memory located variables no behave like outputs, when forced
Edouard Tisserant
parents: 601
diff changeset
   721
                "MEM":"        return %(type)s_O_ENUM;\n",
511
518c30f2a507 Adding support for hard forcing located output
laurent
parents: 510
diff changeset
   722
                "OUT":"        return %(type)s_O_ENUM;\n",
450
18583d13f0fa Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 447
diff changeset
   723
                "VAR":"        return %(type)s_ENUM;\n"}[v["vartype"]]%v
592
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
   724
                for v in self._VariablesList if v["vartype"] != "FB" and v["type"] in DebugTypesSize ])}
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   725
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   726
        return debug_code
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   727
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   728
    def Generate_plc_common_main(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   729
        """
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   730
        Use confnodes layout given in LocationCFilesAndCFLAGS to
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   731
        generate glue code that dispatch calls to all confnodes
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   732
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   733
        # filter location that are related to code that will be called
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   734
        # in retreive, publish, init, cleanup
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   735
        locstrs = map(lambda x:"_".join(map(str,x)),
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   736
           [loc for loc,Cfiles,DoCalls in self.LocationCFilesAndCFLAGS if loc and DoCalls])
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   737
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   738
        # Generate main, based on template
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   739
        if not self.BeremizRoot.getDisable_Extensions():
338
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   740
            plc_main_code = targets.code("plc_common_main") % {
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   741
                "calls_prototypes":"\n".join([(
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   742
                      "int __init_%(s)s(int argc,char **argv);\n"+
418
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   743
                      "void __cleanup_%(s)s(void);\n"+
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   744
                      "void __retrieve_%(s)s(void);\n"+
01f6bfc01251 Fix relative matiec path problem
greg
parents: 415
diff changeset
   745
                      "void __publish_%(s)s(void);")%{'s':locstr} for locstr in locstrs]),
338
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   746
                "retrieve_calls":"\n    ".join([
694
fb55fbee202c Inverting order of plugin calls in retrieve and publish
laurent
parents: 692
diff changeset
   747
                      "__retrieve_%s();"%locstrs[i-1] for i in xrange(len(locstrs), 0, -1)]),
338
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   748
                "publish_calls":"\n    ".join([ #Call publish in reverse order
694
fb55fbee202c Inverting order of plugin calls in retrieve and publish
laurent
parents: 692
diff changeset
   749
                      "__publish_%s();"%locstr for locstr in locstrs]),
338
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   750
                "init_calls":"\n    ".join([
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   751
                      "init_level=%d; "%(i+1)+
423
4d7ac355701d Fix some warnings during compilation
greg
parents: 421
diff changeset
   752
                      "if((res = __init_%s(argc,argv))){"%locstr +
338
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   753
                      #"printf(\"%s\"); "%locstr + #for debug
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   754
                      "return res;}" for i,locstr in enumerate(locstrs)]),
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   755
                "cleanup_calls":"\n    ".join([
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   756
                      "if(init_level >= %d) "%i+
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   757
                      "__cleanup_%s();"%locstrs[i-1] for i in xrange(len(locstrs), 0, -1)])
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   758
                }
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   759
        else:
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   760
            plc_main_code = targets.code("plc_common_main") % {
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   761
                "calls_prototypes":"\n",
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   762
                "retrieve_calls":"\n",
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   763
                "publish_calls":"\n",
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   764
                "init_calls":"\n",
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   765
                "cleanup_calls":"\n"
e19c78831d41 Adding support for enable/Disable plugins
greg
parents: 335
diff changeset
   766
                }
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   767
        plc_main_code += targets.targetcode(self.GetTarget().getcontent()["name"])
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   768
        return plc_main_code
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   769
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   770
        
623
8cdb533c3c7a A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents: 619
diff changeset
   771
    def _Build(self):
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   772
        """
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   773
        Method called by user to (re)build SoftPLC and confnode tree
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   774
        """
395
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
   775
        if self.AppFrame is not None:
433fd448dd31 Integrate PLCOpenEditor into Beremiz frame
laurent
parents: 392
diff changeset
   776
            self.AppFrame.ClearErrors()
202
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
   777
        
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   778
        buildpath = self._getBuildPath()
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   779
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   780
        # Eventually create build dir
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   781
        if not os.path.exists(buildpath):
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   782
            os.mkdir(buildpath)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   783
        # There is something to clean
110
a05e8b30c024 Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents: 109
diff changeset
   784
        self.EnableMethod("_Clean", True)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   785
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   786
        self.logger.flush()
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   787
        self.logger.write(_("Start build in %s\n") % buildpath)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   788
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   789
        # Generate SoftPLC IEC code
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   790
        IECGenRes = self._Generate_SoftPLC()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   791
        self.ShowMethod("_showIECcode", True)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   792
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   793
        # If IEC code gen fail, bail out.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   794
        if not IECGenRes:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   795
            self.logger.write_error(_("IEC-61131-3 code generation failed !\n"))
677
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   796
            self.ResetBuildMD5()
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   797
            return False
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   798
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   799
        # Reset variable and program list that are parsed from
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   800
        # CSV file generated by IEC2C compiler.
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   801
        self.ResetIECProgramsAndVariables()
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   802
        
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   803
        # Generate C code and compilation params from confnode hierarchy
24
585d5b387b6a Working CanOpen OD generation
etisserant
parents: 23
diff changeset
   804
        try:
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   805
            CTNLocationCFilesAndCFLAGS, CTNLDFLAGS, CTNExtraFiles = self._Generate_C(
24
585d5b387b6a Working CanOpen OD generation
etisserant
parents: 23
diff changeset
   806
                buildpath, 
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   807
                self.PLCGeneratedLocatedVars)
178
2390b409eb93 Added PLC tick alignement on external synchronization source feature.
etisserant
parents: 176
diff changeset
   808
        except Exception, exc:
721
ecf4d203c4d4 refactoring
Edouard Tisserant
parents: 720
diff changeset
   809
            self.logger.write_error(_("Runtime extensions C code generation failed !\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   810
            self.logger.write_error(traceback.format_exc())
677
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   811
            self.ResetBuildMD5()
24
585d5b387b6a Working CanOpen OD generation
etisserant
parents: 23
diff changeset
   812
            return False
18
0fac6d621a24 Base build mechanism layout.
etisserant
parents: 17
diff changeset
   813
728
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   814
        # Generate C code and compilation params from liraries
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   815
        try:
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   816
            LibCFilesAndCFLAGS, LibLDFLAGS, LibExtraFiles = self.GetLibrariesCCode(buildpath)
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   817
        except Exception, exc:
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   818
            self.logger.write_error(_("Runtime extensions C code generation failed !\n"))
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   819
            self.logger.write_error(traceback.format_exc())
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   820
            self.ResetBuildMD5()
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   821
            return False
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   822
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   823
        self.LocationCFilesAndCFLAGS =  CTNLocationCFilesAndCFLAGS + LibCFilesAndCFLAGS
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   824
        self.LDFLAGS = CTNLDFLAGS + LibLDFLAGS
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   825
        ExtraFiles = CTNExtraFiles + LibExtraFiles
e0424e96e3fd refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
Edouard Tisserant
parents: 726
diff changeset
   826
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   827
        # Get temporary directory path
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   828
        extrafilespath = self._getExtraFilesPath()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   829
        # Remove old directory
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   830
        if os.path.exists(extrafilespath):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   831
            shutil.rmtree(extrafilespath)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   832
        # Recreate directory
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   833
        os.mkdir(extrafilespath)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   834
        # Then write the files
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   835
        for fname,fobject in ExtraFiles:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   836
            fpath = os.path.join(extrafilespath,fname)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   837
            open(fpath, "wb").write(fobject.read())
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   838
        # Now we can forget ExtraFiles (will close files object)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   839
        del ExtraFiles
510
8038c08b9874 Getting default target when no target defined fixed
laurent
parents: 506
diff changeset
   840
        
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   841
        # Template based part of C code generation
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   842
        # files are stacked at the beginning, as files of confnode tree root
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   843
        for generator, filename, name in [
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   844
           # debugger code
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   845
           (self.Generate_plc_debugger, "plc_debugger.c", "Debugger"),
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   846
           # init/cleanup/retrieve/publish, run and align code
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   847
           (self.Generate_plc_common_main,"plc_common_main.c","Common runtime")]:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   848
            try:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   849
                # Do generate
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   850
                code = generator()
335
c5f3f71e7260 fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents: 334
diff changeset
   851
                if code is None:
c5f3f71e7260 fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents: 334
diff changeset
   852
                     raise
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   853
                code_path = os.path.join(buildpath,filename)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   854
                open(code_path, "w").write(code)
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
   855
                # Insert this file as first file to be compiled at root confnode
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   856
                self.LocationCFilesAndCFLAGS[0][1].insert(0,(code_path, self.plcCFLAGS))
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   857
            except Exception, exc:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   858
                self.logger.write_error(name+_(" generation failed !\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   859
                self.logger.write_error(traceback.format_exc())
677
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   860
                self.ResetBuildMD5()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   861
                return False
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   862
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   863
        self.logger.write(_("C code generated successfully.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   864
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   865
        # Get current or fresh builder
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   866
        builder = self.GetBuilder()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   867
        if builder is None:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   868
            self.logger.write_error(_("Fatal : cannot get builder.\n"))
677
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   869
            self.ResetBuildMD5()
51
c31c55601556 Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents: 49
diff changeset
   870
            return False
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   871
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   872
        # Build
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   873
        try:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   874
            if not builder.build() :
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   875
                self.logger.write_error(_("C Build failed.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   876
                return False
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   877
        except Exception, exc:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   878
            self.logger.write_error(_("C Build crashed !\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   879
            self.logger.write_error(traceback.format_exc())
677
607731b33026 Fix 'Transfer" button state according to last build result
laurent
parents: 676
diff changeset
   880
            self.ResetBuildMD5()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   881
            return False
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   882
624
8e74266033f8 Updated console messages for build and stop
Edouard Tisserant
parents: 623
diff changeset
   883
        self.logger.write(_("Successfully built.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   884
        # Update GUI status about need for transfer
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   885
        self.CompareLocalAndRemotePLC()
49
45dc6a944ab6 On the long wat towards generated code comilation...
etisserant
parents: 47
diff changeset
   886
        return True
202
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
   887
    
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
   888
    def ShowError(self, logger, from_location, to_location):
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
   889
        chunk_infos = self.GetChunkInfos(from_location, to_location)
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
   890
        for infos, (start_row, start_col) in chunk_infos:
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
   891
            start = (from_location[0] - start_row, from_location[1] - start_col)
cd81a7a6e55c Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents: 199
diff changeset
   892
            end = (to_location[0] - start_row, to_location[1] - start_col)
707
6880c88e499e Fix bug in debugger when transfer without having build before and and opening debug view before running PLC
laurent
parents: 703
diff changeset
   893
            #print from_location, to_location, start_row, start_col, start, end
396
d1083f580ca1 Many bugs on PLCOpenEditor integration fixed
laurent
parents: 395
diff changeset
   894
            if self.AppFrame is not None:
d1083f580ca1 Many bugs on PLCOpenEditor integration fixed
laurent
parents: 395
diff changeset
   895
                self.AppFrame.ShowError(infos, start, end)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   896
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   897
    def _showIECcode(self):
716
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   898
        self._OpenView("IEC code")
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   899
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   900
    def _editIECrawcode(self):
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   901
        self._OpenView("IEC raw code")
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   902
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   903
    def _OpenView(self, name=None):
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   904
        if name == "IEC code":
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   905
            plc_file = self._getIECcodepath()
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   906
        
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   907
            IEC_code_viewer = TextViewer(self.AppFrame.TabsOpened, "", None, None, instancepath=name)
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   908
            #IEC_code_viewer.Enable(False)
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   909
            IEC_code_viewer.SetTextSyntax("ALL")
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   910
            IEC_code_viewer.SetKeywords(IEC_KEYWORDS)
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   911
            try:
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   912
                text = file(plc_file).read()
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   913
            except:
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   914
                text = '(* No IEC code have been generated at that time ! *)'
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   915
            IEC_code_viewer.SetText(text = text)
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   916
            IEC_code_viewer.SetIcon(self.AppFrame.GenerateBitmap("ST"))
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   917
                
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   918
            self.AppFrame.EditProjectElement(IEC_code_viewer, name)
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
   919
            
716
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   920
            return IEC_code_viewer
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   921
        
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   922
        elif name == "IEC raw code":
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   923
            controler = MiniTextControler(self._getIECrawcodepath())
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   924
            IEC_raw_code_viewer = TextViewer(self.AppFrame.TabsOpened, "", None, controler, instancepath=name)
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   925
            #IEC_raw_code_viewer.Enable(False)
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   926
            IEC_raw_code_viewer.SetTextSyntax("ALL")
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   927
            IEC_raw_code_viewer.SetKeywords(IEC_KEYWORDS)
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   928
            IEC_raw_code_viewer.RefreshView()
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   929
            IEC_raw_code_viewer.SetIcon(self.AppFrame.GenerateBitmap("ST"))
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   930
                
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   931
            self.AppFrame.EditProjectElement(IEC_raw_code_viewer, name)
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   932
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   933
            return IEC_raw_code_viewer
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   934
        
180e4a7d945c Adding search field for finding function or function block in library tree
laurent
parents: 715
diff changeset
   935
        return None
20
d3cb5020997b Beremiz plugins definitions.
etisserant
parents: 19
diff changeset
   936
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   937
    def _Clean(self):
108
280b458e42e5 add clean implementation
greg
parents: 107
diff changeset
   938
        if os.path.isdir(os.path.join(self._getBuildPath())):
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   939
            self.logger.write(_("Cleaning the build directory\n"))
108
280b458e42e5 add clean implementation
greg
parents: 107
diff changeset
   940
            shutil.rmtree(os.path.join(self._getBuildPath()))
280b458e42e5 add clean implementation
greg
parents: 107
diff changeset
   941
        else:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
   942
            self.logger.write_error(_("Build directory already clean\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   943
        self.ShowMethod("_showIECcode", False)
110
a05e8b30c024 Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents: 109
diff changeset
   944
        self.EnableMethod("_Clean", False)
286
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
   945
        # kill the builder
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
   946
        self._builder = None
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   947
        self.CompareLocalAndRemotePLC()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   948
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   949
    ############# Real PLC object access #############
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   950
    def UpdateMethodsFromPLCStatus(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   951
        # Get PLC state : Running or Stopped
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   952
        # TODO : use explicit status instead of boolean
486
2e0fe44044b3 Catch Pyro exception when connection closed and print message
laurent
parents: 483
diff changeset
   953
        status = None
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   954
        if self._connector is not None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   955
            status = self._connector.GetPLCstatus()
486
2e0fe44044b3 Catch Pyro exception when connection closed and print message
laurent
parents: 483
diff changeset
   956
        if status is None:
516
6a926af33ebc Reset connector when disconnected
laurent
parents: 511
diff changeset
   957
            self._connector = None
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
   958
            status = "Disconnected"
446
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   959
        if(self.previous_plcstate != status):
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   960
            for args in {
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   961
                     "Started" :     [("_Run", False),
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   962
                                      ("_Stop", True)],
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   963
                     "Stopped" :     [("_Run", True),
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   964
                                      ("_Stop", False)],
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   965
                     "Empty" :       [("_Run", False),
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   966
                                      ("_Stop", False)],
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   967
                     "Broken" :      [],
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   968
                     "Disconnected" :[("_Run", False),
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   969
                                      ("_Stop", False),
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   970
                                      ("_Transfer", False),
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   971
                                      ("_Connect", True),
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   972
                                      ("_Disconnect", False)],
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   973
                   }.get(status,[]):
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   974
                self.ShowMethod(*args)
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   975
            self.previous_plcstate = status
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   976
            return True
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   977
        return False
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   978
    
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   979
    def PullPLCStatusProc(self, event):
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
   980
        if self._connector is None:
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
   981
            self.StatusTimer.Stop()
446
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   982
        if self.UpdateMethodsFromPLCStatus():
486
2e0fe44044b3 Catch Pyro exception when connection closed and print message
laurent
parents: 483
diff changeset
   983
            
446
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   984
            status = _(self.previous_plcstate)
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   985
            {"Broken": self.logger.write_error,
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   986
             None: lambda x: None}.get(
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
   987
                self.previous_plcstate, self.logger.write)(_("PLC is %s\n")%status)
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
   988
            self.AppFrame.RefreshAll()
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
   989
        
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   990
    def RegisterDebugVarToConnector(self):
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   991
        self.DebugTimer=None
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   992
        Idxs = []
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   993
        self.TracedIECPath = []
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   994
        if self._connector is not None:
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   995
            self.IECdebug_lock.acquire()
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   996
            IECPathsToPop = []
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   997
            for IECPath,data_tuple in self.IECdebug_datas.iteritems():
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
   998
                WeakCallableDict, data_log, status, fvalue = data_tuple
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
   999
                if len(WeakCallableDict) == 0:
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1000
                    # Callable Dict is empty.
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1001
                    # This variable is not needed anymore!
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1002
                    #print "Unused : " + IECPath
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1003
                    IECPathsToPop.append(IECPath)
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1004
                elif IECPath != "__tick__":
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1005
                    # Convert 
450
18583d13f0fa Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 447
diff changeset
  1006
                    Idx, IEC_Type = self._IECPathToIdx.get(IECPath,(None,None))
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1007
                    if Idx is not None:
592
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
  1008
                        if IEC_Type in DebugTypesSize: 
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
  1009
                            Idxs.append((Idx, IEC_Type, fvalue, IECPath))
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
  1010
                        else:
c6408f92da0a Initial TIME support in debugger
Edouard Tisserant
parents: 579
diff changeset
  1011
                            self.logger.write_warning(_("Debug : Unsuppoted type to debug %s\n")%IEC_Type)
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1012
                    else:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1013
                        self.logger.write_warning(_("Debug : Unknown variable %s\n")%IECPath)
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1014
            for IECPathToPop in IECPathsToPop:
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1015
                self.IECdebug_datas.pop(IECPathToPop)
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1016
457
ed
parents: 450
diff changeset
  1017
            if Idxs:
ed
parents: 450
diff changeset
  1018
                Idxs.sort()
475
44fea837f813 Bug on forcing variable value fixed
laurent
parents: 474
diff changeset
  1019
                self.TracedIECPath = zip(*Idxs)[3]
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1020
                self._connector.SetTraceVariablesList(zip(*zip(*Idxs)[0:3]))
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1021
            else:
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1022
                self.TracedIECPath = []
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1023
                self._connector.SetTraceVariablesList([])
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1024
            self.IECdebug_lock.release()
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1025
            
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1026
            #for IEC_path, IECdebug_data in self.IECdebug_datas.iteritems():
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1027
            #    print IEC_path, IECdebug_data[0].keys()
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1028
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1029
    def ReArmDebugRegisterTimer(self):
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1030
        if self.DebugTimer is not None:
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1031
            self.DebugTimer.cancel()
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1032
466
11263fd24566 Fixed remaining thread on close frame
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 465
diff changeset
  1033
        # Timer to prevent rapid-fire when registering many variables
11263fd24566 Fixed remaining thread on close frame
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 465
diff changeset
  1034
        # use wx.CallAfter use keep using same thread. TODO : use wx.Timer instead
11263fd24566 Fixed remaining thread on close frame
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 465
diff changeset
  1035
        self.DebugTimer=Timer(0.5,wx.CallAfter,args = [self.RegisterDebugVarToConnector])
11263fd24566 Fixed remaining thread on close frame
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 465
diff changeset
  1036
        # Rearm anti-rapid-fire timer
11263fd24566 Fixed remaining thread on close frame
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 465
diff changeset
  1037
        self.DebugTimer.start()
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1038
463
961bddcfc913 Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents: 462
diff changeset
  1039
    def GetDebugIECVariableType(self, IECPath):
961bddcfc913 Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents: 462
diff changeset
  1040
        Idx, IEC_Type = self._IECPathToIdx.get(IECPath,(None,None))
961bddcfc913 Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents: 462
diff changeset
  1041
        return IEC_Type
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1042
        
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1043
    def SubscribeDebugIECVariable(self, IECPath, callableobj, *args, **kwargs):
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1044
        """
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1045
        Dispatching use a dictionnary linking IEC variable paths
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1046
        to a WeakKeyDictionary linking 
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1047
        weakly referenced callables to optionnal args
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1048
        """
450
18583d13f0fa Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 447
diff changeset
  1049
        if IECPath != "__tick__" and not self._IECPathToIdx.has_key(IECPath):
246
3613c6ee9e0e Adding support for Debugging in PLCOpenEditor
lbessard
parents: 244
diff changeset
  1050
            return None
3613c6ee9e0e Adding support for Debugging in PLCOpenEditor
lbessard
parents: 244
diff changeset
  1051
        
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1052
        self.IECdebug_lock.acquire()
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1053
        # If no entry exist, create a new one with a fresh WeakKeyDictionary
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1054
        IECdebug_data = self.IECdebug_datas.get(IECPath, None)
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1055
        if IECdebug_data is None:
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1056
            IECdebug_data  = [
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1057
                    WeakKeyDictionary(), # Callables
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1058
                    [],                  # Data storage [(tick, data),...]
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1059
                    "Registered",        # Variable status
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1060
                    None]                # Forced value
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1061
            self.IECdebug_datas[IECPath] = IECdebug_data
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1062
        
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1063
        IECdebug_data[0][callableobj]=(args, kwargs)
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1064
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1065
        self.IECdebug_lock.release()
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1066
        
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1067
        self.ReArmDebugRegisterTimer()
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1068
        
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1069
        return IECdebug_data[1]
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1070
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1071
    def UnsubscribeDebugIECVariable(self, IECPath, callableobj):
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1072
        #print "Unsubscribe", IECPath, callableobj
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1073
        self.IECdebug_lock.acquire()
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1074
        IECdebug_data = self.IECdebug_datas.get(IECPath, None)
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1075
        if IECdebug_data is not None:
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1076
            IECdebug_data[0].pop(callableobj,None)
243
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1077
        self.IECdebug_lock.release()
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1078
90db933fe956 Adding support for Debugging with PLCOpenEditor
lbessard
parents: 239
diff changeset
  1079
        self.ReArmDebugRegisterTimer()
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1080
334
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1081
    def UnsubscribeAllDebugIECVariable(self):
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1082
        self.IECdebug_lock.acquire()
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1083
        IECdebug_data = {}
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1084
        self.IECdebug_lock.release()
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1085
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1086
        self.ReArmDebugRegisterTimer()
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1087
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1088
    def ForceDebugIECVariable(self, IECPath, fvalue):
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1089
        if not self.IECdebug_datas.has_key(IECPath):
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1090
            return
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1091
        
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1092
        self.IECdebug_lock.acquire()
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1093
        
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1094
        # If no entry exist, create a new one with a fresh WeakKeyDictionary
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1095
        IECdebug_data = self.IECdebug_datas.get(IECPath, None)
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1096
        IECdebug_data[2] = "Forced"
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1097
        IECdebug_data[3] = fvalue
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1098
        
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1099
        self.IECdebug_lock.release()
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1100
        
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1101
        self.ReArmDebugRegisterTimer()
463
961bddcfc913 Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents: 462
diff changeset
  1102
    
961bddcfc913 Adding support for forcing PLC variable (still command to PLC to implement)
laurent
parents: 462
diff changeset
  1103
    def ReleaseDebugIECVariable(self, IECPath):
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1104
        if not self.IECdebug_datas.has_key(IECPath):
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1105
            return
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1106
        
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1107
        self.IECdebug_lock.acquire()
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1108
        
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1109
        # If no entry exist, create a new one with a fresh WeakKeyDictionary
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1110
        IECdebug_data = self.IECdebug_datas.get(IECPath, None)
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1111
        IECdebug_data[2] = "Registered"
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1112
        IECdebug_data[3] = None
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1113
        
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1114
        self.IECdebug_lock.release()
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1115
        
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1116
        self.ReArmDebugRegisterTimer()
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1117
    
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1118
    def CallWeakcallables(self, IECPath, function_name, *cargs):
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1119
        data_tuple = self.IECdebug_datas.get(IECPath, None)
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1120
        if data_tuple is not None:
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1121
            WeakCallableDict, data_log, status, fvalue = data_tuple
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1122
            #data_log.append((debug_tick, value))
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1123
            for weakcallable,(args,kwargs) in WeakCallableDict.iteritems():
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1124
                #print weakcallable, value, args, kwargs
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1125
                function = getattr(weakcallable, function_name, None)
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1126
                if function is not None:
481
28d47c1df46f Bug on SFC debugging fixed
laurent
parents: 480
diff changeset
  1127
                    if status == "Forced" and cargs[1] == fvalue:
476
92f449479084 Bug on passing forced values to DataConsumer fixed
laurent
parents: 475
diff changeset
  1128
                        function(*(cargs + (True,) + args), **kwargs)
474
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1129
                    else:
6dc5505d79ce Adding command to PLC for forcing PLC variable
laurent
parents: 468
diff changeset
  1130
                        function(*(cargs + args), **kwargs)
355
e257fe074a90 Fix refresh of Beremiz button when connection lost
greg
parents: 351
diff changeset
  1131
                # This will block thread if more than one call is waiting
334
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1132
670
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
  1133
    def GetTicktime(self):
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
  1134
        return self._Ticktime
fb03cb6da95c Adding support for extracting Common_Ticktime from VARIABLES.csv
laurent
parents: 669
diff changeset
  1135
699
6ff64cadb1ff Adding support for executing python scripts on remote runtime
laurent
parents: 696
diff changeset
  1136
    def RemoteExec(self, script, **kwargs):
6ff64cadb1ff Adding support for executing python scripts on remote runtime
laurent
parents: 696
diff changeset
  1137
        if self._connector is None:
703
2f7b3d1de278 Adding support for selecting plugin parameter value from a tree of available values
laurent
parents: 699
diff changeset
  1138
            return -1, "No runtime connected!"
699
6ff64cadb1ff Adding support for executing python scripts on remote runtime
laurent
parents: 696
diff changeset
  1139
        return self._connector.RemoteExec(script, **kwargs)
6ff64cadb1ff Adding support for executing python scripts on remote runtime
laurent
parents: 696
diff changeset
  1140
235
a66e150f2888 Improved debug data feedback.
etisserant
parents: 228
diff changeset
  1141
    def DebugThreadProc(self):
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1142
        """
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1143
        This thread waid PLC debug data, and dispatch them to subscribers
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1144
        """
286
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
  1145
        self.debug_break = False
461
bcbc472c0ba8 Safer debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 460
diff changeset
  1146
        debug_getvar_retry = 0
286
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
  1147
        while (not self.debug_break) and (self._connector is not None):
674
761de581cf7a Changed GetTraceVariables results unpack to something more robust in debug thread proc.
Edouard Tisserant
parents: 673
diff changeset
  1148
            Trace = self._connector.GetTraceVariables()
761de581cf7a Changed GetTraceVariables results unpack to something more robust in debug thread proc.
Edouard Tisserant
parents: 673
diff changeset
  1149
            if(Trace):
761de581cf7a Changed GetTraceVariables results unpack to something more robust in debug thread proc.
Edouard Tisserant
parents: 673
diff changeset
  1150
                plc_status, debug_tick, debug_vars = Trace
761de581cf7a Changed GetTraceVariables results unpack to something more robust in debug thread proc.
Edouard Tisserant
parents: 673
diff changeset
  1151
            else:
761de581cf7a Changed GetTraceVariables results unpack to something more robust in debug thread proc.
Edouard Tisserant
parents: 673
diff changeset
  1152
                plc_status = None
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1153
            debug_getvar_retry += 1
239
112b4bc523b3 Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents: 236
diff changeset
  1154
            #print debug_tick, debug_vars
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1155
            if plc_status == "Started":
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1156
                self.IECdebug_lock.acquire()
446
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
  1157
                if len(debug_vars) == len(self.TracedIECPath):
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1158
                    if debug_getvar_retry > DEBUG_RETRIES_WARN:
689
dac752b613bb Updated logger calls in debugthread.
Edouard Tisserant
parents: 686
diff changeset
  1159
                        self.logger.write(_("... debugger recovered\n"))
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1160
                    debug_getvar_retry = 0
673
2e1a2ea6242f reverted temporary fix, fixed in PLCopenEditor now.
edouard
parents: 672
diff changeset
  1161
                    for IECPath,value in zip(self.TracedIECPath, debug_vars):
2e1a2ea6242f reverted temporary fix, fixed in PLCopenEditor now.
edouard
parents: 672
diff changeset
  1162
                        if value is not None:
2e1a2ea6242f reverted temporary fix, fixed in PLCopenEditor now.
edouard
parents: 672
diff changeset
  1163
                            self.CallWeakcallables(IECPath, "NewValue", debug_tick, value)
2e1a2ea6242f reverted temporary fix, fixed in PLCopenEditor now.
edouard
parents: 672
diff changeset
  1164
                    self.CallWeakcallables("__tick__", "NewDataAvailable")
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1165
                self.IECdebug_lock.release()
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1166
                if debug_getvar_retry == DEBUG_RETRIES_WARN:
689
dac752b613bb Updated logger calls in debugthread.
Edouard Tisserant
parents: 686
diff changeset
  1167
                    self.logger.write(_("Waiting debugger to recover...\n"))
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1168
                if debug_getvar_retry == DEBUG_RETRIES_REREGISTER:
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1169
                    # re-register debug registry to PLC
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1170
                    wx.CallAfter(self.RegisterDebugVarToConnector)
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1171
                if debug_getvar_retry != 0:
446
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
  1172
                    # Be patient, tollerate PLC to come up before debugging
460
73a53278833b Safer debug unpack result checking, more verbose error message, slower retry when waiting PLC startup
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 459
diff changeset
  1173
                    time.sleep(0.1)
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1174
            else:
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1175
                self.debug_break = True
689
dac752b613bb Updated logger calls in debugthread.
Edouard Tisserant
parents: 686
diff changeset
  1176
        self.logger.write(_("Debugger disabled\n"))
dac752b613bb Updated logger calls in debugthread.
Edouard Tisserant
parents: 686
diff changeset
  1177
        self.DebugThread = None
235
a66e150f2888 Improved debug data feedback.
etisserant
parents: 228
diff changeset
  1178
286
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
  1179
    def KillDebugThread(self):
703
2f7b3d1de278 Adding support for selecting plugin parameter value from a tree of available values
laurent
parents: 699
diff changeset
  1180
        tmp_debugthread = self.DebugThread
286
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
  1181
        self.debug_break = True
703
2f7b3d1de278 Adding support for selecting plugin parameter value from a tree of available values
laurent
parents: 699
diff changeset
  1182
        if tmp_debugthread is not None:
624
8e74266033f8 Updated console messages for build and stop
Edouard Tisserant
parents: 623
diff changeset
  1183
            self.logger.writeyield(_("Stopping debugger...\n"))
703
2f7b3d1de278 Adding support for selecting plugin parameter value from a tree of available values
laurent
parents: 699
diff changeset
  1184
            tmp_debugthread.join(timeout=5)
2f7b3d1de278 Adding support for selecting plugin parameter value from a tree of available values
laurent
parents: 699
diff changeset
  1185
            if tmp_debugthread.isAlive() and self.logger:
624
8e74266033f8 Updated console messages for build and stop
Edouard Tisserant
parents: 623
diff changeset
  1186
                self.logger.write_warning(_("Couldn't stop debugger.\n"))
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1187
            else:
624
8e74266033f8 Updated console messages for build and stop
Edouard Tisserant
parents: 623
diff changeset
  1188
                self.logger.write(_("Debugger stopped.\n"))
286
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
  1189
        self.DebugThread = None
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
  1190
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1191
    def _connect_debug(self): 
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1192
        if self.AppFrame:
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1193
            self.AppFrame.ResetGraphicViewers()
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1194
        self.RegisterDebugVarToConnector()
578
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1195
        if self.DebugThread is None:
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1196
            self.DebugThread = Thread(target=self.DebugThreadProc)
6f5795bdee49 Making debugger more stable with LPC
edouard
parents: 544
diff changeset
  1197
            self.DebugThread.start()
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1198
    
462
274e83a5534e Now debug is not a button anymore
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 461
diff changeset
  1199
    def _Run(self):
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1200
        """
464
46dd4358e8a8 Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 463
diff changeset
  1201
        Start PLC
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1202
        """
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1203
        if self.GetIECProgramsAndVariables():
462
274e83a5534e Now debug is not a button anymore
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 461
diff changeset
  1204
            self._connector.StartPLC()
464
46dd4358e8a8 Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 463
diff changeset
  1205
            self.logger.write(_("Starting PLC\n"))
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1206
            self._connect_debug()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1207
        else:
464
46dd4358e8a8 Fixes in run : messages and refresh
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 463
diff changeset
  1208
            self.logger.write_error(_("Couldn't start PLC !\n"))
675
44b35c27e9ff Adding support for quickly open recent projects in file menu
laurent
parents: 674
diff changeset
  1209
        wx.CallAfter(self.UpdateMethodsFromPLCStatus)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1210
       
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1211
    def _Stop(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1212
        """
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1213
        Stop PLC
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1214
        """
483
bc26c42d2eec fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents: 481
diff changeset
  1215
        if self._connector is not None and not self._connector.StopPLC():
bc26c42d2eec fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents: 481
diff changeset
  1216
            self.logger.write_error(_("Couldn't stop PLC !\n"))
bc26c42d2eec fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents: 481
diff changeset
  1217
689
dac752b613bb Updated logger calls in debugthread.
Edouard Tisserant
parents: 686
diff changeset
  1218
        # debugthread should die on his own
dac752b613bb Updated logger calls in debugthread.
Edouard Tisserant
parents: 686
diff changeset
  1219
        #self.KillDebugThread()
286
a2a8a52b0d4f Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents: 283
diff changeset
  1220
        
675
44b35c27e9ff Adding support for quickly open recent projects in file menu
laurent
parents: 674
diff changeset
  1221
        wx.CallAfter(self.UpdateMethodsFromPLCStatus)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1222
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1223
    def _Connect(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1224
        # don't accept re-connetion is already connected
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1225
        if self._connector is not None:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1226
            self.logger.write_error(_("Already connected. Please disconnect\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1227
            return
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1228
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1229
        # Get connector uri
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1230
        uri = self.\
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1231
              BeremizRoot.\
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1232
              getURI_location().\
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1233
              strip()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1234
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1235
        # if uri is empty launch discovery dialog
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1236
        if uri == "":
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1237
            # Launch Service Discovery dialog
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1238
            dialog = DiscoveryDialog(self.AppFrame)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1239
            answer = dialog.ShowModal()
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1240
            uri = dialog.GetURI()
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1241
            dialog.Destroy()
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1242
            
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1243
            # Nothing choosed or cancel button
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1244
            if uri is None or answer == wx.ID_CANCEL:
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 382
diff changeset
  1245
                self.logger.write_error(_("Connection canceled!\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1246
                return
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1247
            else:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1248
                self.\
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1249
                BeremizRoot.\
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1250
                setURI_location(uri)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1251
       
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1252
        # Get connector from uri
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1253
        try:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1254
            self._connector = connectors.ConnectorFactory(uri, self)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1255
        except Exception, msg:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1256
            self.logger.write_error(_("Exception while connecting %s!\n")%uri)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1257
            self.logger.write_error(traceback.format_exc())
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1258
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1259
        # Did connection success ?
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1260
        if self._connector is None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1261
            # Oups.
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1262
            self.logger.write_error(_("Connection failed to %s!\n")%uri)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1263
        else:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1264
            self.ShowMethod("_Connect", False)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1265
            self.ShowMethod("_Disconnect", True)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1266
            self.ShowMethod("_Transfer", True)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1267
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1268
            self.CompareLocalAndRemotePLC()
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1269
            
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1270
            # Init with actual PLC status and print it
446
1edde533db19 Some cleanup in PLC status - removed that \"Starting\" state ...
ed
parents: 440
diff changeset
  1271
            self.UpdateMethodsFromPLCStatus()
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1272
            if self.previous_plcstate is not None:
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1273
                status = _(self.previous_plcstate)
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1274
            else:
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1275
                status = ""
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1276
            self.logger.write(_("PLC is %s\n")%status)
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1277
            
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1278
            # Start the status Timer
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1279
            self.StatusTimer.Start(milliseconds=500, oneShot=False)
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1280
            
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1281
            if self.previous_plcstate=="Started":
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1282
                if self.DebugAvailable() and self.GetIECProgramsAndVariables():
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1283
                    self.logger.write(_("Debug connect matching running PLC\n"))
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1284
                    self._connect_debug()
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1285
                else:
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1286
                    self.logger.write_warning(_("Debug do not match PLC - stop/transfert/start to re-enable\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1287
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1288
    def CompareLocalAndRemotePLC(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1289
        if self._connector is None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1290
            return
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1291
        # We are now connected. Update button status
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1292
        MD5 = self.GetLastBuildMD5()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1293
        # Check remote target PLC correspondance to that md5
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1294
        if MD5 is not None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1295
            if not self._connector.MatchMD5(MD5):
544
064165a5276a Removed boring PLC/build compare messages.
Lolitech
parents: 535
diff changeset
  1296
#                self.logger.write_warning(
064165a5276a Removed boring PLC/build compare messages.
Lolitech
parents: 535
diff changeset
  1297
#                   _("Latest build does not match with target, please transfer.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1298
                self.EnableMethod("_Transfer", True)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1299
            else:
544
064165a5276a Removed boring PLC/build compare messages.
Lolitech
parents: 535
diff changeset
  1300
#                self.logger.write(
064165a5276a Removed boring PLC/build compare messages.
Lolitech
parents: 535
diff changeset
  1301
#                   _("Latest build matches target, no transfer needed.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1302
                self.EnableMethod("_Transfer", True)
465
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1303
                # warns controller that program match
67d32a91d70b Fixes in debug + reconnect to running PLC
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents: 464
diff changeset
  1304
                self.ProgramTransferred()
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1305
                #self.EnableMethod("_Transfer", False)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1306
        else:
544
064165a5276a Removed boring PLC/build compare messages.
Lolitech
parents: 535
diff changeset
  1307
#            self.logger.write_warning(
064165a5276a Removed boring PLC/build compare messages.
Lolitech
parents: 535
diff changeset
  1308
#                _("Cannot compare latest build to target. Please build.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1309
            self.EnableMethod("_Transfer", False)
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1310
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1311
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1312
    def _Disconnect(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1313
        self._connector = None
350
a3a5561bde1d - now call load, start, free PLC from the python Thread
greg
parents: 348
diff changeset
  1314
        self.StatusTimer.Stop()
675
44b35c27e9ff Adding support for quickly open recent projects in file menu
laurent
parents: 674
diff changeset
  1315
        wx.CallAfter(self.UpdateMethodsFromPLCStatus)
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1316
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1317
    def _Transfer(self):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1318
        # Get the last build PLC's 
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1319
        MD5 = self.GetLastBuildMD5()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1320
        
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1321
        # Check if md5 file is empty : ask user to build PLC 
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1322
        if MD5 is None :
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1323
            self.logger.write_error(_("Failed : Must build before transfer.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1324
            return False
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1325
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1326
        # Compare PLC project with PLC on target
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1327
        if self._connector.MatchMD5(MD5):
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1328
            self.logger.write(
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
  1329
                _("Latest build already matches current target. Transfering anyway...\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1330
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1331
        # Get temprary directory path
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1332
        extrafilespath = self._getExtraFilesPath()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1333
        extrafiles = [(name, open(os.path.join(extrafilespath, name), 
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1334
                                  'rb').read()) \
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1335
                      for name in os.listdir(extrafilespath) \
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1336
                      if not name=="CVS"]
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1337
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1338
        # Send PLC on target
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1339
        builder = self.GetBuilder()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1340
        if builder is not None:
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1341
            data = builder.GetBinaryCode()
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1342
            if data is not None :
707
6880c88e499e Fix bug in debugger when transfer without having build before and and opening debug view before running PLC
laurent
parents: 703
diff changeset
  1343
                if self._connector.NewPLC(MD5, data, extrafiles) and self.GetIECProgramsAndVariables():
334
b4131e5d10a4 Adding support for unsubscribe all variables while transferring
lbessard
parents: 328
diff changeset
  1344
                    self.UnsubscribeAllDebugIECVariable()
246
3613c6ee9e0e Adding support for Debugging in PLCOpenEditor
lbessard
parents: 244
diff changeset
  1345
                    self.ProgramTransferred()
692
8b1ed486f374 Adding support for not closing debug tabs and remove variable in variable debug panel if instance still exist in newly transfered program
laurent
parents: 689
diff changeset
  1346
                    if self.AppFrame is not None:
8b1ed486f374 Adding support for not closing debug tabs and remove variable in variable debug panel if instance still exist in newly transfered program
laurent
parents: 689
diff changeset
  1347
                        self.AppFrame.CloseObsoleteDebugTabs()
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1348
                    self.logger.write(_("Transfer completed successfully.\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1349
                else:
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1350
                    self.logger.write_error(_("Transfer failed\n"))
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1351
            else:
415
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
  1352
                self.logger.write_error(_("No PLC to transfer (did build succeed ?)\n"))
339fa2542481 improved english spelling and grammar and internationalization updated
laurent
parents: 414
diff changeset
  1353
675
44b35c27e9ff Adding support for quickly open recent projects in file menu
laurent
parents: 674
diff changeset
  1354
        wx.CallAfter(self.UpdateMethodsFromPLCStatus)
105
434aed8dc58d Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents: 97
diff changeset
  1355
717
1c23952dbde1 refactoring
Edouard Tisserant
parents: 716
diff changeset
  1356
    ConfNodeMethods = [
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1357
        {"bitmap" : opjimg("Build"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1358
         "name" : _("Build"),
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1359
         "tooltip" : _("Build project into build folder"),
623
8cdb533c3c7a A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
Edouard Tisserant
parents: 619
diff changeset
  1360
         "method" : "_Build"},
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1361
        {"bitmap" : opjimg("Clean"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1362
         "name" : _("Clean"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1363
         "enabled" : False,
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1364
         "tooltip" : _("Clean project build folder"),
105
434aed8dc58d Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents: 97
diff changeset
  1365
         "method" : "_Clean"},
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1366
        {"bitmap" : opjimg("Run"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1367
         "name" : _("Run"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1368
         "shown" : False,
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1369
         "tooltip" : _("Start PLC"),
105
434aed8dc58d Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents: 97
diff changeset
  1370
         "method" : "_Run"},
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1371
        {"bitmap" : opjimg("Stop"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1372
         "name" : _("Stop"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1373
         "shown" : False,
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1374
         "tooltip" : _("Stop Running PLC"),
105
434aed8dc58d Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents: 97
diff changeset
  1375
         "method" : "_Stop"},
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1376
        {"bitmap" : opjimg("Connect"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1377
         "name" : _("Connect"),
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1378
         "tooltip" : _("Connect to the target PLC"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1379
         "method" : "_Connect"},
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1380
        {"bitmap" : opjimg("Transfer"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1381
         "name" : _("Transfer"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1382
         "shown" : False,
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1383
         "tooltip" : _("Transfer PLC"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1384
         "method" : "_Transfer"},
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1385
        {"bitmap" : opjimg("Disconnect"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1386
         "name" : _("Disconnect"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1387
         "shown" : False,
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1388
         "tooltip" : _("Disconnect from PLC"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1389
         "method" : "_Disconnect"},
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1390
        {"bitmap" : opjimg("ShowIECcode"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1391
         "name" : _("Show code"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1392
         "shown" : False,
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1393
         "tooltip" : _("Show IEC code generated by PLCGenerator"),
105
434aed8dc58d Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents: 97
diff changeset
  1394
         "method" : "_showIECcode"},
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1395
        {"bitmap" : opjimg("editIECrawcode"),
361
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1396
         "name" : _("Raw IEC code"),
331d698e1118 Adding support for internationalization
laurent
parents: 356
diff changeset
  1397
         "tooltip" : _("Edit raw IEC code added to code generated by PLCGenerator"),
203
cb9901076a21 Added concepts :
etisserant
parents: 202
diff changeset
  1398
         "method" : "_editIECrawcode"},
65
e55d6faee9d1 Adding icons in Beremiz GUI
lbessard
parents: 64
diff changeset
  1399
    ]