author | Andrey Skvortsov <andrej.skvortzov@gmail.com> |
Mon, 07 Jan 2019 20:32:40 +0000 | |
branch | py3-fix |
changeset 2564 | 186f0137b0ca |
parent 1902 | 2b7e2db31d81 |
child 2418 | 5587c490a070 |
permissions | -rw-r--r-- |
1511
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
1 |
#!/usr/bin/env python |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
2 |
# -*- coding: utf-8 -*- |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
3 |
|
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
4 |
# This file is part of Beremiz, a Integrated Development Environment for |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
5 |
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
6 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
7 |
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
1680
6db967480b7d
make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
8 |
# Copyright (C) 2017: Andrey Skvortsov |
1511
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
9 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
10 |
# See COPYING file for copyrights details. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
11 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
12 |
# This program is free software; you can redistribute it and/or |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
13 |
# modify it under the terms of the GNU General Public License |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
14 |
# as published by the Free Software Foundation; either version 2 |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
15 |
# of the License, or (at your option) any later version. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
16 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
17 |
# This program is distributed in the hope that it will be useful, |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
18 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
19 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
20 |
# GNU General Public License for more details. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
21 |
# |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
22 |
# You should have received a copy of the GNU General Public License |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
23 |
# along with this program; if not, write to the Free Software |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
24 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
91538d0c242c
add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1503
diff
changeset
|
25 |
|
1853
47a3f39bead0
fix pylint warning "(relative-import) Relative import 'Y', should be 'X.Y'"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
26 |
|
47a3f39bead0
fix pylint warning "(relative-import) Relative import 'Y', should be 'X.Y'"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
27 |
from __future__ import absolute_import |
1732
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
28 |
import os |
94ffe74e6895
clean-up: fix PEP8 E401 multiple imports on one line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1680
diff
changeset
|
29 |
import re |
1680
6db967480b7d
make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
30 |
import util.paths as paths |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
31 |
|
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
32 |
from xmlclass import GenerateParserFromXSD |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
33 |
|
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
34 |
from CodeFileTreeNode import CodeFile |
1853
47a3f39bead0
fix pylint warning "(relative-import) Relative import 'Y', should be 'X.Y'"
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1850
diff
changeset
|
35 |
from py_ext.PythonEditor import PythonEditor |
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
36 |
|
1736
7e61baa047f0
clean-up: fix PEP8 E302 expected 2 blank lines, found 1
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1734
diff
changeset
|
37 |
|
1097 | 38 |
class PythonFileCTNMixin(CodeFile): |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
39 |
|
1124
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
40 |
CODEFILE_NAME = "PyFile" |
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
41 |
SECTIONS_NAMES = [ |
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
42 |
"globals", |
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
43 |
"init", |
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
44 |
"cleanup", |
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
45 |
"start", |
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
46 |
"stop"] |
657
340c0b9caeca
Adding support for integrating Python code Editor into Beremiz frame.
laurent
parents:
654
diff
changeset
|
47 |
EditorType = PythonEditor |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
48 |
|
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
49 |
def __init__(self): |
1097 | 50 |
CodeFile.__init__(self) |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
51 |
|
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
52 |
filepath = self.PythonFileName() |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
53 |
|
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
54 |
if os.path.isfile(filepath): |
1680
6db967480b7d
make run Beremiz and PLCOpen Editor, if full path contain non-lating
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1511
diff
changeset
|
55 |
PythonParser = GenerateParserFromXSD(paths.AbsNeighbourFile(__file__, "py_ext_xsd.xsd")) |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
56 |
|
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
57 |
xmlfile = open(filepath, 'r') |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
58 |
pythonfile_xml = xmlfile.read() |
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
59 |
xmlfile.close() |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
60 |
|
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
61 |
pythonfile_xml = pythonfile_xml.replace( |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
62 |
'xmlns="http://www.w3.org/2001/XMLSchema"', |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
63 |
'xmlns:xhtml="http://www.w3.org/1999/xhtml"') |
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
64 |
for cre, repl in [ |
1766
c1e5b9f19483
clean-up: fix PEP8 E129 visually indented line with same indent as next logical line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1764
diff
changeset
|
65 |
(re.compile("(?<!<xhtml:p>)(?:<!\[CDATA\[)"), "<xhtml:p><![CDATA["), |
c1e5b9f19483
clean-up: fix PEP8 E129 visually indented line with same indent as next logical line
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1764
diff
changeset
|
66 |
(re.compile("(?:]]>)(?!</xhtml:p>)"), "]]></xhtml:p>")]: |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
67 |
pythonfile_xml = cre.sub(repl, pythonfile_xml) |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
68 |
|
1330
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
69 |
try: |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
70 |
python_code, error = PythonParser.LoadXMLString(pythonfile_xml) |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
71 |
if error is None: |
1330
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
72 |
self.CodeFile.globals.setanyText(python_code.getanyText()) |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
73 |
os.remove(filepath) |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
74 |
self.CreateCodeFileBuffer(False) |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
75 |
self.OnCTNSave() |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
76 |
except Exception, exc: |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
77 |
error = unicode(exc) |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
78 |
|
1330
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
79 |
if error is not None: |
96b242e4c59d
Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file
Laurent Bessard
parents:
1315
diff
changeset
|
80 |
self.GetCTRoot().logger.write_error( |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
81 |
_("Couldn't import old %s file.") % self.CTNName()) |
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
82 |
|
1097 | 83 |
def CodeFileName(self): |
84 |
return os.path.join(self.CTNPath(), "pyfile.xml") |
|
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
85 |
|
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
86 |
def PythonFileName(self): |
721 | 87 |
return os.path.join(self.CTNPath(), "py_ext.xml") |
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
88 |
|
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
89 |
PreSectionsTexts = {} |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
90 |
PostSectionsTexts = {} |
1751
c28db6f7616b
clean-up: fix PEP8 E301 expected 1 blank line, found 0
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1748
diff
changeset
|
91 |
|
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
92 |
def GetSection(self, section): |
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
93 |
return self.PreSectionsTexts.get(section, "") + "\n" + \ |
1315
ff14a66bbd12
Fixed Beremiz for working with new xmlclass support using lxml
Laurent Bessard
parents:
1160
diff
changeset
|
94 |
getattr(self.CodeFile, section).getanyText() + "\n" + \ |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
95 |
self.PostSectionsTexts.get(section, "") |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
96 |
|
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
97 |
def CTNGenerate_C(self, buildpath, locations): |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
98 |
# location string for that CTN |
1833
2269739dd098
fix unnecessary lambda and enable corresponding pylint check
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1777
diff
changeset
|
99 |
location_str = "_".join(map(str, self.GetCurrentLocation())) |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
100 |
configname = self.GetCTRoot().GetProjectConfigNames()[0] |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
101 |
|
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
102 |
def _onchangecode(var): |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
103 |
return '"' + var.getonchange() + \ |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
104 |
"('" + var.getname() + "')\"" \ |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
105 |
if var.getonchange() else '""' |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
106 |
|
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
107 |
def _onchange(var): |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
108 |
return repr(var.getonchange()) \ |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
109 |
if var.getonchange() else None |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
110 |
|
1447
d6b878525ceb
Fixed systematically loading PLC binary at startup even without -a parameter. Extended py_ext extensions instances variable description (PLCGlobalsDesc). Now contains list of variables organizd by extension, with extension name
Edouard Tisserant
parents:
1436
diff
changeset
|
111 |
pyextname = self.CTNName() |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
112 |
varinfos = map( |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
113 |
lambda variable: { |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
114 |
"name": variable.getname(), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
115 |
"desc": repr(variable.getdesc()), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
116 |
"onchangecode": _onchangecode(variable), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
117 |
"onchange": _onchange(variable), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
118 |
"opts": repr(variable.getopts()), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
119 |
"configname": configname.upper(), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
120 |
"uppername": variable.getname().upper(), |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
121 |
"IECtype": variable.gettype(), |
1901
e8cf68d69447
Enforced check_source.sh pep8 and pylint rules.
Edouard Tisserant
parents:
1897
diff
changeset
|
122 |
"initial": repr(variable.getinitial()), |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
123 |
"pyextname": pyextname |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
124 |
}, |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
125 |
self.CodeFile.variables.variable) |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
126 |
# python side PLC global variables access stub |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
127 |
globalstubs = "\n".join([ |
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
128 |
"""\ |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
129 |
_%(name)s_ctype, _%(name)s_unpack, _%(name)s_pack = \\ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
130 |
TypeTranslator["%(IECtype)s"] |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
131 |
_PySafeGetPLCGlob_%(name)s = PLCBinary.__SafeGetPLCGlob_%(name)s |
1145
203f4eff3313
Fixed PLC global var access from python. Added test in tests/python
Edouard Tisserant
parents:
1144
diff
changeset
|
132 |
_PySafeGetPLCGlob_%(name)s.restype = None |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
133 |
_PySafeGetPLCGlob_%(name)s.argtypes = [ctypes.POINTER(_%(name)s_ctype)] |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
134 |
_PySafeSetPLCGlob_%(name)s = PLCBinary.__SafeSetPLCGlob_%(name)s |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
135 |
_PySafeSetPLCGlob_%(name)s.restype = None |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
136 |
_PySafeSetPLCGlob_%(name)s.argtypes = [ctypes.POINTER(_%(name)s_ctype)] |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
137 |
_%(pyextname)sGlobalsDesc.append(( |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
138 |
"%(name)s", |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
139 |
"%(IECtype)s", |
1897
62f9cae9a25f
Extend python<->PLC global variable description "GlobalDesc" to support Initial value setting.
Edouard Tisserant
parents:
1878
diff
changeset
|
140 |
%(initial)s, |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
141 |
%(desc)s, |
1449
5f09fa31d7b0
Added __ext_name__ variable accessible from user python code, reflecting extension name. Fixed contend of OnChange field in PLCGlobalsDesc
Edouard Tisserant
parents:
1448
diff
changeset
|
142 |
%(onchange)s, |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
143 |
%(opts)s)) |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
144 |
""" % varinfo for varinfo in varinfos]) |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
145 |
|
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
146 |
# Runtime calls (start, stop, init, and cleanup) |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
147 |
rtcalls = "" |
1124
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
148 |
for section in self.SECTIONS_NAMES: |
b1705000eba1
Fixed support for defining python runtime code using sections like in c_ext
Laurent Bessard
parents:
1120
diff
changeset
|
149 |
if section != "globals": |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
150 |
rtcalls += "def _runtime_%s_%s():\n" % (location_str, section) |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
151 |
sectiontext = self.GetSection(section).strip() |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
152 |
if sectiontext: |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
153 |
rtcalls += ' ' + \ |
1154
da9ccfceff31
Fixed build error with python <-> PLCglobals variables declared with no initial value
Edouard Tisserant
parents:
1148
diff
changeset
|
154 |
sectiontext.replace('\n', '\n ')+"\n\n" |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
155 |
else: |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
156 |
rtcalls += " pass\n\n" |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
157 |
|
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
158 |
globalsection = self.GetSection("globals") |
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
159 |
|
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
160 |
loc_dict = { |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
161 |
"pyextname": pyextname, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
162 |
"globalstubs": globalstubs, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
163 |
"globalsection": globalsection, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
164 |
"rtcalls": rtcalls, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
165 |
} |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
166 |
|
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
167 |
PyFileContent = """\ |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
168 |
#!/usr/bin/env python |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
169 |
# -*- coding: utf-8 -*- |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
170 |
## Code generated by Beremiz python mixin confnode |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
171 |
## |
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
172 |
|
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
173 |
## Code for PLC global variable access |
1902
2b7e2db31d81
Clarify licensing, and packaging of runtime only files :
Edouard Tisserant
parents:
1901
diff
changeset
|
174 |
from runtime.typemapping import TypeTranslator |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
175 |
import ctypes |
1447
d6b878525ceb
Fixed systematically loading PLC binary at startup even without -a parameter. Extended py_ext extensions instances variable description (PLCGlobalsDesc). Now contains list of variables organizd by extension, with extension name
Edouard Tisserant
parents:
1436
diff
changeset
|
176 |
_%(pyextname)sGlobalsDesc = [] |
1449
5f09fa31d7b0
Added __ext_name__ variable accessible from user python code, reflecting extension name. Fixed contend of OnChange field in PLCGlobalsDesc
Edouard Tisserant
parents:
1448
diff
changeset
|
177 |
__ext_name__ = "%(pyextname)s" |
1452 | 178 |
PLCGlobalsDesc.append(( "%(pyextname)s" , _%(pyextname)sGlobalsDesc )) |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
179 |
%(globalstubs)s |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
180 |
|
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
181 |
## User code in "global" scope |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
182 |
%(globalsection)s |
366
cd90e4c10261
Move python evaluator to create a python plugin containing any related python module
laurent
parents:
diff
changeset
|
183 |
|
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
184 |
## Beremiz python runtime calls |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
185 |
%(rtcalls)s |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
186 |
|
1449
5f09fa31d7b0
Added __ext_name__ variable accessible from user python code, reflecting extension name. Fixed contend of OnChange field in PLCGlobalsDesc
Edouard Tisserant
parents:
1448
diff
changeset
|
187 |
del __ext_name__ |
5f09fa31d7b0
Added __ext_name__ variable accessible from user python code, reflecting extension name. Fixed contend of OnChange field in PLCGlobalsDesc
Edouard Tisserant
parents:
1448
diff
changeset
|
188 |
|
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
189 |
""" % loc_dict |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
190 |
|
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
191 |
# write generated content to python file |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
192 |
runtimefile_path = os.path.join(buildpath, |
1768
691083b5682a
clean-up: fix PEP8 E128 continuation line under-indented for visual indent
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1766
diff
changeset
|
193 |
"runtime_%s.py" % location_str) |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
194 |
runtimefile = open(runtimefile_path, 'w') |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
195 |
runtimefile.write(PyFileContent.encode('utf-8')) |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
196 |
runtimefile.close() |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
197 |
|
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
198 |
# C code for safe global variables access |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
199 |
|
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
200 |
vardecfmt = """\ |
1154
da9ccfceff31
Fixed build error with python <-> PLCglobals variables declared with no initial value
Edouard Tisserant
parents:
1148
diff
changeset
|
201 |
extern __IEC_%(IECtype)s_t %(configname)s__%(uppername)s; |
da9ccfceff31
Fixed build error with python <-> PLCglobals variables declared with no initial value
Edouard Tisserant
parents:
1148
diff
changeset
|
202 |
IEC_%(IECtype)s __%(name)s_rbuffer = __INIT_%(IECtype)s; |
da9ccfceff31
Fixed build error with python <-> PLCglobals variables declared with no initial value
Edouard Tisserant
parents:
1148
diff
changeset
|
203 |
IEC_%(IECtype)s __%(name)s_wbuffer; |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
204 |
long __%(name)s_rlock = 0; |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
205 |
long __%(name)s_wlock = 0; |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
206 |
int __%(name)s_wbuffer_written = 0; |
1154
da9ccfceff31
Fixed build error with python <-> PLCglobals variables declared with no initial value
Edouard Tisserant
parents:
1148
diff
changeset
|
207 |
void __SafeGetPLCGlob_%(name)s(IEC_%(IECtype)s *pvalue){ |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
208 |
while(AtomicCompareExchange(&__%(name)s_rlock, 0, 1)); |
1145
203f4eff3313
Fixed PLC global var access from python. Added test in tests/python
Edouard Tisserant
parents:
1144
diff
changeset
|
209 |
*pvalue = __%(name)s_rbuffer; |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
210 |
AtomicCompareExchange((long*)&__%(name)s_rlock, 1, 0); |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
211 |
} |
1160
e9e9d3193894
Fixed GCC warnings when building stub code for python PLC globals access
Edouard Tisserant
parents:
1154
diff
changeset
|
212 |
void __SafeSetPLCGlob_%(name)s(IEC_%(IECtype)s *value){ |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
213 |
while(AtomicCompareExchange(&__%(name)s_wlock, 0, 1)); |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
214 |
__%(name)s_wbuffer = *value; |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
215 |
__%(name)s_wbuffer_written = 1; |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
216 |
AtomicCompareExchange((long*)&__%(name)s_wlock, 1, 0); |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
217 |
} |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
218 |
|
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
219 |
""" |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
220 |
|
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
221 |
vardeconchangefmt = """\ |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
222 |
PYTHON_POLL* __%(name)s_notifier; |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
223 |
""" |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
224 |
|
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
225 |
varretfmt = """\ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
226 |
if(!AtomicCompareExchange(&__%(name)s_wlock, 0, 1)){ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
227 |
if(__%(name)s_wbuffer_written == 1){ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
228 |
%(configname)s__%(uppername)s.value = __%(name)s_wbuffer; |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
229 |
__%(name)s_wbuffer_written = 0; |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
230 |
} |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
231 |
AtomicCompareExchange((long*)&__%(name)s_wlock, 1, 0); |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
232 |
} |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
233 |
""" |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
234 |
varpubfmt = """\ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
235 |
if(!AtomicCompareExchange(&__%(name)s_rlock, 0, 1)){ |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
236 |
__%(name)s_rbuffer = __GET_VAR(%(configname)s__%(uppername)s); |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
237 |
AtomicCompareExchange((long*)&__%(name)s_rlock, 1, 0); |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
238 |
} |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
239 |
""" |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
240 |
|
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
241 |
varpubonchangefmt = """\ |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
242 |
if(!AtomicCompareExchange(&__%(name)s_rlock, 0, 1)){ |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
243 |
IEC_%(IECtype)s tmp = __GET_VAR(%(configname)s__%(uppername)s); |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
244 |
if(__%(name)s_rbuffer != tmp){ |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
245 |
__%(name)s_rbuffer = %(configname)s__%(uppername)s.value; |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
246 |
PYTHON_POLL_body__(__%(name)s_notifier); |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
247 |
} |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
248 |
AtomicCompareExchange((long*)&__%(name)s_rlock, 1, 0); |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
249 |
} |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
250 |
""" |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
251 |
varinitonchangefmt = """\ |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
252 |
__%(name)s_notifier = __GET_GLOBAL_ON%(uppername)sCHANGE(); |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
253 |
__SET_VAR(__%(name)s_notifier->,TRIG,,__BOOL_LITERAL(TRUE)); |
1449
5f09fa31d7b0
Added __ext_name__ variable accessible from user python code, reflecting extension name. Fixed contend of OnChange field in PLCGlobalsDesc
Edouard Tisserant
parents:
1448
diff
changeset
|
254 |
__SET_VAR(__%(name)s_notifier->,CODE,,__STRING_LITERAL(%(onchangelen)d,%(onchangecode)s)); |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
255 |
""" |
1452 | 256 |
vardec = "\n".join([(vardecfmt + vardeconchangefmt |
1742
92932cd370a4
clean-up: fix PEP8 E225 missing whitespace around operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1740
diff
changeset
|
257 |
if varinfo["onchange"] else vardecfmt) % varinfo |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
258 |
for varinfo in varinfos]) |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
259 |
varret = "\n".join([varretfmt % varinfo for varinfo in varinfos]) |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
260 |
varpub = "\n".join([(varpubonchangefmt if varinfo["onchange"] else |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
261 |
varpubfmt) % varinfo |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
262 |
for varinfo in varinfos]) |
1878
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
263 |
varinit = "\n".join([varinitonchangefmt % |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
264 |
dict(onchangelen=len(varinfo["onchangecode"]), **varinfo) |
fb73a6b6622d
fix pylint warning '(bad-continuation) Wrong hanging indentation before block'
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1853
diff
changeset
|
265 |
for varinfo in varinfos if varinfo["onchange"]]) |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
266 |
|
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
267 |
loc_dict = { |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
268 |
"vardec": vardec, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
269 |
"varinit": varinit, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
270 |
"varret": varret, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
271 |
"varpub": varpub, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
272 |
"location_str": location_str, |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
273 |
} |
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
274 |
|
1452 | 275 |
# TODO : use config name obtained from model instead of default |
276 |
# "config.h". User cannot change config name, but project imported |
|
277 |
# or created in older beremiz vesion could use different name. |
|
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
278 |
PyCFileContent = """\ |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
279 |
/* |
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
280 |
* Code generated by Beremiz py_ext confnode |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
281 |
* for safe global variables access |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
282 |
*/ |
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
283 |
#include "iec_types_all.h" |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
284 |
#include "POUS.h" |
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
285 |
#include "config.h" |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
286 |
#include "beremiz.h" |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
287 |
|
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
288 |
/* User variables reference */ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
289 |
%(vardec)s |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
290 |
|
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
291 |
/* Beremiz confnode functions */ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
292 |
int __init_%(location_str)s(int argc,char **argv){ |
1448
20ff66dcc31d
Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call
Edouard Tisserant
parents:
1447
diff
changeset
|
293 |
%(varinit)s |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
294 |
return 0; |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
295 |
} |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
296 |
|
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
297 |
void __cleanup_%(location_str)s(void){ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
298 |
} |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
299 |
|
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
300 |
void __retrieve_%(location_str)s(void){ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
301 |
%(varret)s |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
302 |
} |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
303 |
|
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
304 |
void __publish_%(location_str)s(void){ |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
305 |
%(varpub)s |
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
306 |
} |
1846
14b40afccd69
remove unused variables found by pylint
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1833
diff
changeset
|
307 |
""" % loc_dict |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
308 |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
309 |
Gen_PyCfile_path = os.path.join(buildpath, "PyCFile_%s.c" % location_str) |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
310 |
pycfile = open(Gen_PyCfile_path, 'w') |
1144
21475ee0e688
Added stub code and declarations for bidirectional access to PLC globals from python code (untested)
Edouard Tisserant
parents:
1132
diff
changeset
|
311 |
pycfile.write(PyCFileContent) |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
312 |
pycfile.close() |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
313 |
|
1734
750eeb7230a1
clean-up: fix some PEP8 E228 missing whitespace around modulo operator
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1732
diff
changeset
|
314 |
matiec_CFLAGS = '"-I%s"' % os.path.abspath( |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
315 |
self.GetCTRoot().GetIECLibPath()) |
1436
e15ca67197b9
py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly
Edouard Tisserant
parents:
1330
diff
changeset
|
316 |
|
1503
3a238c0c5993
fix regression introduced by changeset: 1431:28e9d479aa65 [Use '-p' command line option when running matiec (iec2c)]
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1475
diff
changeset
|
317 |
return ([(Gen_PyCfile_path, matiec_CFLAGS)], |
1132
28f96aa9c070
Rewrote py_ext and wxglade generators in a clean factored way, added C skeleton for python access to PLC global vars
Edouard Tisserant
parents:
1124
diff
changeset
|
318 |
"", |
1145
203f4eff3313
Fixed PLC global var access from python. Added test in tests/python
Edouard Tisserant
parents:
1144
diff
changeset
|
319 |
True, |
1740
b789b695b5c6
clean-up: fix PEP8 E231 missing whitespace after ':' or ','
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1739
diff
changeset
|
320 |
("runtime_%s.py" % location_str, file(runtimefile_path, "rb"))) |