Modbus plugin: reset periodic activation timer when overrun occurs (delays due to communication errors, ...)

Disable MDNS:// scheme support. Also prevent discovery pannel to produce some. For now it seems that that feature is unused, and could be a security issue.

Added support to PYROS in Zeroconf discovery and publish. For now, PYRO://mdnsname._tcp.local. URI are broken, and discovery panel generate IP based URI by default.

PyroServer: fixed naming of class, and reorganized methods in order to ease subclassing, in case of customization of service publication on the local network (i.e. zeroconf)

Fix exception dialog with non recognized URI schemes

Fixed runtime's reconnecting loop not stopping when re-configuring WAMP.
In case WAMP was already trying to connect without success and user change WAMP configuration through web interface, previous ReconnectingClient wasn't stopped.

Removed nonsense code, that I should have check more in details before merging m(

Allow easier monkey patching of WAMP connector Session class

Expose new PLCObject API members to WAMP interface.

Use another way to ensure compatibility with Py3 about text type.

Make easier to read console error message in case of connection problem.

PYRO(S): Added timeout on client side to allow unfreezing IDE after some time when communication with target dropped

Enure that autostart blocks other @RunInMain PLCObject methods, and _unblocks_ them once autostart is done...

Fixed Discovery panel in URI Editor dialog : double click works back again, and avoid setting URI to unicode type.

Bigger chunks, from 16k to 1M

Empirically reverted calls done just after NewPLC back to the order as it was before chunked transfer. Apparently I broke something... To be continued

Chunk based transfer for PLC binary and extra files, and some collateral code refactoring.

Fix failing PLC build when building freshly created project that use default libraries blocks. When controller loads libraries according to attibutes in project files (BeremizRoot/Enable_{libname}_Library), use known default if attribute is missing.

Cosmetic change in PSKManagement.py

Fixed ID,last URI, or last connection date not being updated when connnecting to target.

Merged. Some changes that should already have been incuded during previous merge (mostly about PlcStatus) have been included this time.

IDManager : small cosmetic fixes and cleanup.

python3 support: pylint, W1633 # (round-builtin) round built-in referenced

because round behavior is changed to default behavior in Python3
(Banker round). It can cause slight differences in some cases.
Mostly graphical editors are affected, there could be single pixel differences.
Now I couldn't locate any visual differences in test programs.

python3 support: pylint,W1610 # (reduce-builtin) reduce built-in referenced

python3 support: pylint, W1653 # (next-method-defined) next method defined

python3 support: pylint, W1622 # (next-method-called) Called a next() method on an object

python3 support: pylint, W1625 # (raising-string) Raising a string exception

python3 support: pylint, W1624 # (indexing-exception) Indexing exceptions will not work on Python 3

python3 support: pylint, W1611 # (standarderror-builtin) StandardError built-in referenced

python3 support: pylint, W1652 # (deprecated-types-field) Accessing a deprecated fields on the types module

python3 support: pylint, W1651 (deprecated-itertools-function) Accessing a deprecated function on the itertools module

It's even 20% faster, than previous code. On python3 zip is even much more faster.

python3 support: pylint, W1649 # (deprecated-string-function) Accessing a deprecated function on the string module

python3 support: pylint, W1645 # (exception-message-attribute) Exception.message removed in Python 3

python3 support: pylint, W1646 # (invalid-str-codec) non-text encoding used in str.decode

python3 support: pylint,W1602 # (basestring-builtin) basestring built-in referenced

python3 support: pylint, W1629 # (nonzero-method) __nonzero__ method defined

python3 support: pylint, W1606 # (execfile-builtin) execfile built-in referenced

python3 support: pylint, W1607 # (file-builtin) file built-in referenced

python3 support: pylint, W1659 # (xreadlines-attribute) Accessing a removed xreadlines attribute

python3 support: pylint, W1601 # (apply-builtin) apply built-in referenced

Fix pep8 warning: W605 invalid escape sequence ?x?

pep8, ignore W606 'async' and 'await' are reserved keywords starting with Python 3.7

This error exists in pyjs extension, but pyjs isn't going to Python3.
'noqa' isn't working for W606, so this warning is disabled completely.
'async' and 'await' are still checked by pylint.

python3 support: pylint, W1619 #(old-division) division w/o __future__ statement

Make easier to run pytest on local X-server

cleanup pyc files between running pytest

this is need to avoid problem sometimes tests are run inside docker
container and sometimes local.

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/_pytest/config/__init__.py", line 409, in _importconftest
mod = conftestpath.pyimport()
File "/usr/lib/python2.7/dist-packages/py/_path/local.py", line 686, in pyimport
raise self.ImportMismatchError(modname, modfile, self)
ImportMismatchError: ('conftest', '/beremiz/tests/tools/conftest.py', local('/home/developer/beremiz/tests/tools/conftest.py'))
ERROR: could not load /home/developer/beremiz/tests/tools/conftest.py

python3 support: pylint, W1612 # (unicode-builtin) unicode built-in referenced

Use multiple processes to speed up pylint

0 will auto-detect the number of processors available to use.
version 1.6.5 (Debian 9.5) hangs for some reason in multi-process mode.

python3 support: pylint, W1613 # (xrange-builtin) xrange built-in referenced

python3 support: pylint, W1648 # (bad-python3-import) Module moved in Python 3

Fixed regression in connecting to LOCAL:// targets

Merge, with surprizingly little conflicts

IDManager : finished Import/Export. Added merging capability to import (asks if particular ID is replaced during import). Added ESC as closing shortcut to IDManager dialog, and adjusted its size.

merge

Update localization template

Fix 'msgid' format string with unnamed arguments cannot be properly localized

Add automatic check for localization strings with multiple unnamed arguments

Improve localization support in etherlab (mostly)

cleanup etherlab: pylint, W0602 (global-variable-not-assigned) Using global for 'X' but no assignment is done

cleanup: pylint, W0109 # (duplicate-key) Duplicate key 'X' in dictionary

Add python3 syntax checking to CI

Fix old style exception raise and exec syntax

Use python 3 compatible exception syntax everywhere

cleanup: pylint, R0123 # (literal-comparison) Comparison to literal

Use predefined constants for PlcStatus instead of string literals

cleanup: pylint, R1704 # (redefined-argument-from-local) Redefining argument with the local name 'Y'

cleanup: pylint, R1701 # (consider-merging-isinstance) Consider merging these isinstance calls to isinstance(CTNLDFLAGS, (str, unicode))

cleanup: pylint, E1304 # (missing-format-string-key) Missing key 'X_name' in format string dictionary

cleanup: pylint, E1300 # (bad-format-character) Unsupported format character '"' (0x22) at index 17

cleanup: pylint, W0111 # (assign-to-new-keyword) Name async will become a keyword in Python 3.7

cleanup: pylint, E1310 (bad-str-strip-call) Suspicious argument in str.strip call

Fix segmentation fault when last lines in text POUs should be highlighted

enable etherlab checks

resort enabled pylint check to move likely-most invasive changes to the end

clean etherlab: pylint, C0330 # (bad-continuation) Wrong hanging indentation before block

clean etherlab: pylint, W0612 # (unused-variable) Unused variable 'X'

clean etherlab: pylint, W1618 # (no-absolute-import) import missing `from __future__ import absolute_import`

clean etherlab: pylint,E0602 # (undefined-variable) Undefined variable 'X'

clean etherlab: pylint, E1136 # (unsubscriptable-object) Value 'X' is unsubscriptable

ignore missing MotionLibrary

to fix pylint error 'E0401 # (import-error) Unable to import 'X'

clean etherlab: pylint, E0611 # (no-name-in-module) No name 'X' in module 'Y'

clean etherlab: pylint, C0123 # (unidiomatic-typecheck) Using type() instead of isinstance() for a typecheck.

clean etherlab: pylint, W0104 # (pointless-statement) Statement seems to have no effect

clean etherlab: pylint, W0631 # (undefined-loop-variable) Using possibly undefined loop variable 'X'

clean etherlab: pylint, C1001 # (old-style-class) Old-style class defined.

clean etherlab: pylint, W0611 # (unused-import) Unused import X

clean etherlab: pylint, E0102 # (function-redefined) method already defined

clean etherlab: pylint, W0105 # (pointless-string-statement) String statement has no effect

clean etherlab: pylint,W0231 # (super-init-not-called) __init__ method from base class is not called

clean etherlab: pylint, C0412 # (ungrouped-imports) Imports from package X are not grouped

clean etherlab: pylint,W0108 # (unnecessary-lambda) Lambda may not be necessary

clean etherlab: pylint, C0411 # (wrong-import-order) standard import "import x" comes before "import y"

clean etherlab: pylint, W0404 # reimported module

check_source.sh: add E301 check to the list of selected PEP8 errors

clean etherlab: pep8, E301 expected 2 blank lines, found 1

clean etherlab: pep8, W503 line break before binary operator

clean etherlab: pep8, E266 too many leading '#' for block comment

clean etherlab: pep8, E122 continuation line missing indentation or outdented

clean etherlab: pep8, W191 indentation contains tabs

clean etherlab: pep8, E211 whitespace before '['

clean etherlab: pep8, E129 visually indented line with same indent as next logical line

clean etherlab: pep8, E127 continuation line over-indented for visual indent

clean etherlab: pep8, E129 visually indented line with same indent as next logical line

clean etherlab: pep8, W602 deprecated form of raising exception

clean etherlab: pep8, W601 .has_key() is deprecated, use 'in'

clean etherlab: pep8, E731 do not assign a lambda expression, use a def

clean etherlab: pep8, E203 whitespace before ','

clean etherlab: pep8, E712 comparison to True should be 'if cond is True:' or 'if cond:'

clean etherlab: pep8, E222 multiple spaces after operator

clean etherlab: pep8, E741 ambiguous variable name 'l'

cleanup etherlab: pep8, E306 expected 1 blank line before a nested definition, found X

cleanup etherlab: pep8, E305 expected 2 blank lines after class or function definition, found X

cleanup etherlab: pep8, E201 whitespace after '('

cleanup etherlab: pep8, E202 whitespace before ')'

cleanup etherlab: pep8, E227 missing whitespace around bitwise or shift operator

cleanup etherlab: pep8, E251 unexpected spaces around keyword / parameter equals

cleanup etherlab: pep8, E225 missing whitespace around operator

cleanup etherlab: pep8, E303 too many blank lines (2)

cleanup etherlab: pep8, E231 missing whitespace after ','

cleanup etherlab: pep8, E271 multiple spaces after keyword

cleanup etherlab: pep8, E261 at least two spaces before inline comment

cleanup etherlab: pep8, E302 expected 2 blank lines, found 1

cleanup etherlab: pep8, W293 blank line contains whitespace

cleanup etherlab: pep8, E228 missing whitespace around modulo operator

cleanup etherlab: pep8, E401 multiple imports on one line

cleanup etherlab: pep8, E265 block comment should start with '# '

cleanup etherlab: pep8, W291 trailing whitespace

convert some etherlab source files to unix format

cleanup etherlab: pep8, E722 do not use bare except

Ignore cache files and generated test reports

Update Beremiz translations and list of translators

Added Turkish, Romania, Portuguese, Polish, Dutch, Hungarian.
Most existed translation are updated.

Use the list of supported by app translations instead of supported translations by wx

This will make possible to translate application into locales, that
are not explicitly supported by wx: for example, 'pl' or 'bn_BD', 'bn_IN'.

Suppress message box in case current locale is unsupported or missing in wx

Beremiz can still be translated into it using own locales
available in './locale'.

Add commands to pull translation from transifex

tx - transifex cli client should be installed in the system.
It's free software and is available in Debian archive.

Run following commands:
1. Init your authorization token
$ make transifex_init

2. Pull translations
$ make transifex_pull

Add custom dialog to add/edit comment block in graphical editors

That allows to edit comment and immediately see how it'll be shown on wiresheet.

Cleanup examples so they look clean, nice and almost the same on Windows and GNU/Linux

use the same font size on Windows and GNU/Linux

use nice and pretty mono font in graphical languages (SFC, FBD, LD) as well

it looks like that was original idea, but some bug squashed in and
default font was used for POU.

at the same time fix use of mono font in the header of Variable panel
for SFC/FBD/LD POUs.

Don't need to call extra _init_

_init_ is already called for value in infos["elmt_type"]["initial"]().
Additional _init_() creates second set of child element and that
creates unusable xml project.
This regression cause by not well tested commit "Proper fix for error
'object has no attribute 'getSlave' in EtherCAT extension" (96ca6b056c55595f71bfaca9f54b9e8646460c23)

Fix black background in preview window

Problem found and fixed on GNU/Linux
wxWidgets 3.0 built with GTK3+ support and running on Xorg.

Avoid division by zero in case width or height for page are not specified

traceback:
File "/home/developer/WorkData/PLC/beremiz/beremiz/editors/Viewer.py", line 3755, in OnPaint
self.DoDrawing(dc)
File "/home/developer/WorkData/PLC/beremiz/beremiz/editors/Viewer.py", line 3723, in DoDrawing
for y in xrange(self.PageSize[1] - (ystart * SCROLLBAR_UNIT) % self.PageSize[1], int(window_size[1] / self.ViewScale[1]), self.PageSize[1]):
<type 'exceptions.ZeroDivisionError'>: integer division or modulo by zero

IDManager: added import/export plus little cosmetic enhancements.

IDManager : refactored a bit, moved some code into PSKManagement.py. Now captures URI and PSK on new PYRO(S) and propose them when editing URI. Import/export still to be implemented.

Renaming servicetype into scheme.

Added toolbar button to launch ID Manager dialog.

Renamed IDManager control into IDBrowser, because dialog will be named IDManager

IDManager.py : finished selector mode.

Added early implementation of IDManager.py. For now only used to select ID in URIEditor

Path may contain spaces... sequel of d1359cb

'Merged' URI editor dialog and Discovery dialog, also clean up related code

Cut more useless code from URI Editor

URI Editor Dialog : moved it to /dialog, and fixed naming.

URI editor : Rewrote most of it, cleaner.

PSK : Stunnel and/or OpenSSL (undocumented) handles PSK better without special chars, apparently

Prevent PLCObject to be imported from IDE as a side effect of importing runtime package

WAMP : ensure that unicode string is passed for published events IDs

PYRO PSK: adjusted cipher and key length to be usable with openSSL 1.0.2k.

Automatically get PSK and ID when connecting to PYRO[S], so that future connection through PYROS can use that same key. Also fixed case to UPPER for *PSK.

Runtime : Ensure that a random PSK secret compatible with stunnel is generated if -s commandline switch is used. Stunnel service is restarted after generation, using spawn_subprocess. TODO : give stunnel restart command as a commandline parameter.

Added runtime/spawn_subprocess.py. Force use posix spawn instead of fork, with API similar to subprocess. Using fork in runtime is incompatible with Xenomai, because memory is locked and this can lead to out of memory error.

Small cosmetic change to enhance readability and avoid confusion.

Force Zeroconf to listen and answer only on interface specified with '-i' command line argument.

Useless __name__ == '__main__' tests.

Fixed PYRO's PSK_Adapter : monkey patching was breaking non-PSK protocol, and import ssl was missing.

merge

Fix PYROPSK protocol configuration. After a few iteration of trial and error it appears that TSLv1 and PSK ciphers needs to be specified

merge

PYRO/TLSPSK : must use PYROLOC* protocol scheme in pyro URI, otherwise object ID is missing. Had to use more persuasive pyro3 monkey patching to have PYROLOCPSK resolved properly

PYRO/TLSPSK : fixed typos, used appropriate ciphers (https://github.com/drbild/sslpsk/issues/3), use PYROPSK instead of unresolvable PYROLOCPSK.

Replaced PYROSSL with PYROPSK.
Secrets are files named $ID.secret in project's /psk directory.
Connect with URI formated PYROPSK://host[:port]#ID

Beremiz_service now binds both pyro and nevow ports to interface given with '-i' argument.

Fixed typo in Wampclient.py

Please pylint and pep8

Merged

Show more exceptions on stdout, particularly those that are raised by AutoLoad (first item in Main Thread worker)

Some cleanup in WampClient and added functions that are usefull for extensions that need to use pub/sub.

Merged in Andrey's branch

Merged in yegorich/beremiz/py3-fix (pull request #36)

Use Python 3 compatible syntax for exceptions

Use Python 3 compatible syntax for exceptions

Fix non-usable toolbar on wxPython with GTK3+ in PLCOpenEditor

this problem is related to 'Fix non-usable toolbar on wxPython with
GTK3+' (5927710b). This problem does not happen in Beremiz because
additional necessary self.AUIManager.Update() is called
BeremizIDE. Therefore minimal change in the mentioned commit was
enough for Beremiz, but is not enough for PLCOpenEditor.

Avoid usage of localized strings before initialization during import in many modules

This happens if import is done before i18n setup
(InstallLocalRessources()).
This affects PLCOpenEditor mostly. Beremiz IDE is free from this issue, but moving
initialization from import should make modules more robust.
Otherwise execution result depends on where and when import was done
and this is not a good thing.

Some modules (ConfigTreeNode, features, CodeFileEditor related
classes) still have this, but they are used only in Beremiz.
Most problems result in non-working internatialization.
In some cases (VariablePanel) there is backtrace, because localized
key is not found in non-localized dictionary.

Remove executable bit from source files where it's not needed.

Avoid dictionary initialization during import in PouDialog

Because initialization happened before i18n setup, then it causes later
problems during creating new POU on non-English locales (Russian for example).

Traceback (most recent call last):
File "/home/developer/WorkData/PLC/beremiz/beremiz/IDEFrame.py", line 2332, in OnAddPouMenu
dialog = PouDialog(self, pou_type, type_readonly)
File "/home/developer/WorkData/PLC/beremiz/beremiz/dialogs/PouDialog.py", line 101, in __init__
self.RefreshLanguage()
File "/home/developer/WorkData/PLC/beremiz/beremiz/dialogs/PouDialog.py", line 154, in RefreshLanguage
if language != "SFC" or PouDialog.POU_TYPES_DICT[self.PouType.GetStringSelection()] != "function":
KeyError: u'\u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430'

Increase size of comment block in WAMP example, so all information is visible

Proper fix for error 'object has no attribute 'getSlave' in EtherCAT extension

traceback:
File "/home/developer/WorkData/PLC/beremiz/beremiz/IDEFrame.py", line 1433, in OnPouSelectedChanged
window.RefreshView()
File "/home/developer/WorkData/PLC/beremiz/beremiz/etherlab/ConfigEditor.py", line 837, in RefreshView
self.RefreshProcessVariables()
File "/home/developer/WorkData/PLC/beremiz/beremiz/etherlab/ConfigEditor.py", line 886, in RefreshProcessVariables
slaves = self.Controler.GetSlaves(**self.CurrentNodesFilter)
File "/home/developer/WorkData/PLC/beremiz/beremiz/etherlab/EthercatMaster.py", line 341, in GetSlaves
for slave in self.Config.getConfig().getSlave():
<type 'exceptions.AttributeError'>:_'lxml.etree._Element'_object_has_no_attribute_'getSlave'

Steps to reproduce problem:

- Add new EtherCAT master
- Add new EthercatNode to the master
- double click on


Revert commit "Dirty fix for error '_object_has_no_attribute_'getSlave' in EtherCAT extension"
[a3ac46366b86a0b237dac93be6b2281ac70b98a8].

The problem was that XML elements (proxy object) in some cases were created using custom XML
classes constructors and lxml.etree.Element() call and live python
patching. This causes that lxml backend doesn't know that custom python class
should be used for these XML elements.
Proxy object can be move/deleted and recreated by lxml
backend at any point in time or this can be done in python by copy/deepcopy operations.
If this happens, then newly created
proxy elements are using default class lxml.etree._Element. And all
custom functionality is lost.

All created XML elements should be always created through corresponding
parser and class lookup callback done by lxml backend.
It's described in more details in lxml documentation:
https://lxml.de/element_classes.html

Make comment blocks in examples slightly bigger so text inside is always visible

Separate application tests and code-style checking in different steps in bitbucket-pipelines

Make Beremiz_service print version information

Add support for long options '--help' and '--version' as
is recommended by GNU Coding Standards.

leave execute permissions only on Beremiz.py, Beremiz_serivce.py and PLCOpenEditor.py

Update requirements to include WAMP support

Use static library for Modbus

It makes easier deployment of projects with Modbus (similar to BACnet implementation)

Cleanup WAMP example

Closes #39

Update README for WAMP example to use crossbar with python3

crossbar python2 support is broken in v18.7.2.
I've submitted with fixes for that.
https://github.com/crossbario/crossbar/pull/1376

But they don't test crossbar with python2 in CI, so it's going to be
broken again in the future.
And there is no much reason to use crossbar with python2.

Make ID in WAMP project match with ID PLC runtime.

See project_files/wampconf.json. ID for runtime is "wamptest". The
same id should be used in project's location URI: WAMP://127.0.0.1:8888#Automation#wamptest

Fix SetServer method in WAMP

Remove non-existed PLCObject method 'ForceReload'

remote execute permissions from README file

Fix wxHMI example after upgrading wxGlade

Newer wxGlade generates code to initialize GridSizer's with empty
elements.

...
grid_sizer_1.Add(self.window_1, 1, wx.ALIGN_CENTER, 0)
sizer_2.Add((0, 0), 0, 0, 0)
sizer_2.Add((0, 0), 0, 0, 0)
sizer_2.Add((0, 0), 0, 0, 0)
sizer_2.Add((0, 0), 0, 0, 0)
...

That causes following traceback, if new buttons are added
to already full sizer.

PLCobject : Traceback (most recent call last):

File "./Beremiz_service.py", line 389, in default_evaluator
res = (tocall(*args, **kwargs), None)

File "/tmp/tmpQS8ct2/runtime_0.py", line 540, in _runtime_0_start
wx.MessageBox(_("Please stop PLC to close"))

File "/tmp/tmpQS8ct2/runtime_0.py", line 504, in Init
lambda axis:( MakeButtonFunc(self, sizer, axis+"axisMinus"),

File "/tmp/tmpQS8ct2/runtime_0.py", line 502, in <lambda>
lambda btname: MakeButtonFunc(self, sizer, btname), ActionButtons)

File "/tmp/tmpQS8ct2/runtime_0.py", line 461, in MakeButtonFunc
print sizer, btname

File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/_core.py", line 14453, in Add
return _core_.Sizer_Add(*args, **kwargs)

PyAssertionError: C++ assertion "Assert failure" failed at
../src/common/sizer.cpp(1401) in DoInsert(): too many items (11 > 2*5)
in grid sizer (maybe you should omit the number of either rows or
columns?)


Tested with wxGlade version 0.8.3
Closes #41

Remove useless print statement from wxHMI GUI code

It's py3k incompatible.

Rename extension instance 'wxHMI' to 'wxglade_hmi'

It is necessary because of following commit 7f59aa398669 ('WxGlade HMI extension now does
only instanciate wx object who's name match extension's name. If no
object match the name and no code is provided in 'start' user python
code section, then a warning is issued')

Remove backup .bak files

Drop EtherCAT examples, because they are non-functional without releasing motion control library

Closes #38

merge

Dirty fix for error '_object_has_no_attribute_'getSlave' in EtherCAT extension

traceback:
File "/home/developer/WorkData/PLC/beremiz/beremiz/IDEFrame.py", line 1433, in OnPouSelectedChanged
window.RefreshView()
File "/home/developer/WorkData/PLC/beremiz/beremiz/etherlab/ConfigEditor.py", line 837, in RefreshView
self.RefreshProcessVariables()
File "/home/developer/WorkData/PLC/beremiz/beremiz/etherlab/ConfigEditor.py", line 886, in RefreshProcessVariables
slaves = self.Controler.GetSlaves(**self.CurrentNodesFilter)
File "/home/developer/WorkData/PLC/beremiz/beremiz/etherlab/EthercatMaster.py", line 341, in GetSlaves
for slave in self.Config.getConfig().getSlave():
<type 'exceptions.AttributeError'>:_'lxml.etree._Element'_object_has_no_attribute_'getSlave'

Steps to reproduce problem:

- Add new EtherCAT master
- Add new EthercatNode to the master
- double click on


this is looks like dirty hack to fix strange problem with initial[0]
changing its type after returning from _init_ method to lxml.etree._Element
As a result all methods generated by class factory are lost.

For example, in function initMethod initial[0].__class__ points to
xmlclass.xmlclass.Config. After map(self.append, initial)
self.Config.__class__ is 'xmlclass.xmlclass.Config' as well.
But after returning from initMethod (_init) in CreateElement
self.Config.__class__ has changed to lxml.etree._Element.


I've noticed similar behavior if copy/deepcopy is used for any child
of etree.ElementBase. See simple example below.
[-------------------------------------------------------------]
#!/usr/bin/python

from __future__ import print_function
from lxml import etree
import copy

class DefaultElementClass(etree.ElementBase):
def getLocalTag(self):
return etree.QName(self.tag).localname


def printInformation(x):
print(x, x.__class__, "getLocalTag" in dir(x))


a = DefaultElementClass()
printInformation(a)

#
printInformation(copy.copy(a))
printInformation(copy.deepcopy(a))
[-------------------------------------------------------------]

Fix wrong ST code generation in case of several coils connected to each other.


For example,
|---|Var0|----(Var1)--(Var2)---|

Closes #32

Update README with instruction to build BACnet library for BACnet support

Improve fix wrong code generation if EN/ENO are used in FBD/LD/SFC

Commit c9915bc6 "Fix wrong code generation if EN/ENO are used in
FBD/LD/SFC" caused following backtrace in some cases:

File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 476, in GenerateProgram
self.GeneratePouProgram(pou_name)
File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 258, in GeneratePouProgram
program = pou_program.GenerateProgram(pou)
File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 1713, in GenerateProgram
self.ComputeProgram(pou)
File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 997, in ComputeProgram
eno_var = self.GetUsedEno(body, connections)
File "/home/developer/WorkData/PLC/beremiz/beremiz/PLCGenerator.py", line 929, in GetUsedEno
for invar in blk.inputVariables.getvariable():
File "/home/developer/WorkData/PLC/beremiz/beremiz/xmlclass/xmlclass.py", line 1363, in getattrMethod
return DefaultElementClass.__getattribute__(self, name)
<type 'exceptions.AttributeError'>: 'inOutVariable' object has no attribute 'inputVariables'

Load images for EtherCAT extension

Fixes following backtrace:

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/_core.py", line 16765, in <lambda>
lambda event: event.callable(*event.args, **event.kw) )
File "/home/developer/WorkData/PLC/beremiz/beremiz/BeremizIDE.py", line 1074, in AddConfNode
self._Refresh(TITLE, FILEMENU, PROJECTTREE)
File "/home/developer/WorkData/PLC/beremiz/beremiz/IDEFrame.py", line 917, in _Refresh
self.RefreshFunctions[element]()
File "/home/developer/WorkData/PLC/beremiz/beremiz/IDEFrame.py", line 1526, in RefreshProjectTree
self.GenerateProjectTreeBranch(root, infos)
File "/home/developer/WorkData/PLC/beremiz/beremiz/IDEFrame.py", line 1565, in GenerateProjectTreeBranch
self.GenerateProjectTreeBranch(item, values)
File "/home/developer/WorkData/PLC/beremiz/beremiz/IDEFrame.py", line 1554, in GenerateProjectTreeBranch
self.TreeImageDict[icon_name] = self.TreeImageList.Add(GetBitmap(icon_name))
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/_gdi.py", line 6735, in Add
return _gdi_.ImageList_Add(*args, **kwargs)
ValueError: invalid null reference in method 'ImageList_Add', expected argument 2 of type 'wxBitmap const &

Flush standard output when runtime ready, so that IDE knows it, and can continue connection to LOCAL:// uri

Change behaviour of python_eval function block : if TRIG is false, then ACK is also false except a pulse precisely when receiving answer from interpreter

Removed useless condition in Worker.py that was allowing misfit non-serialized call when worker still not running its loop.

Refactoring. Separated PLC Object, PYRO Server and MainWorker :
- PLC Object is now a Singleton, instantiated through runtime.CreatePLCObjectSingleton(...)
- Pyro server doesn't hold any reference to PLCObject, and doesn't create it anymore
- PLC Object class doesn't inherit from Pyro.ObjBase anymore
- Pyro related code moved to runtime.PyroServer.py
- MainWorker class moved to runtime/Worker.py
- Both PLC Object and MainWorker creation happens in runtime/__init__.py

Fixed new code-generation code, that was making exception with simple variable-to-variable assignments.

BACnet : Fixed missing header include in server.c introduced in 37ef7a3c6b8b

merged

NevowServer : Added minimalist css style customization and a link to go to settings page and back

fixed setServer call in WampClient module. Was doing nothing because _PySrv wasn't global.

Removed now deprecated ForceReload from WAMP exposed calls

fixed documentation bug

NevowServer : added addInfoString to allow extensions to declare some read-only strings to be displayed in settings. Also renamed addExtension in addSettings for clarity.

fixed problems reported by certification testing : vendor identifier acces rights (now read only), and bvlc_maintenance timer was increasing too fast.

Some blank lines to make bitbucket's PEP8 2.2.0 happy

merged Andrey's default

Fix wrong code generation if EN/ENO are used in FBD/LD/SFC

This problem appears for example here

--------
------- | MOVE |
| MOVE1 |------|EN ENO|
------- | |
| |
------- | | -----------
| 23 |------|IN OUT|---| LocalVar0 |
------- -------- -----------


--------
------- | MOVE |
| MOVE2 |------|EN ENO|
------- | |
| |
------- | | -----------
| 15 |------|IN OUT|---| LocalVar0 |
------- -------- -----------

Before wrong code was generated for this case:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
LocalVar0 := MOVE6_OUT;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
LocalVar0 := MOVE4_OUT;

With this patch now following code is generated:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
IF MOVE6_ENO THEN
LocalVar0 := MOVE6_OUT;
END_IF;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
IF MOVE4_ENO THEN
LocalVar0 := MOVE4_OUT;
END_IF;


See discussion here:
https://sourceforge.net/p/beremiz/mailman/message/36378805/

Fix flickering in debug panel

This flickering made debug panel unusable, because most of the time
panel was white. This problem effects wxPython with GTK3+ backend
(at least on GNU/Linux systems).

Removed code IIUC draws box with content of moved debug variable, I
don't see any effect of it neither on GNU/Linux nor on Windows. It
should be safe to remove.

Fix non-usable toolbar on wxPython with GTK3+

On GNU/Linux if wxPython uses wxWidget with GTK3+ backend (this is
what most modern distributions do), then size of EditorToolBar was
always to store only one button.
This is because GetBestSize() is updated only after pane is shown and
updated.
The code does work correctly on python-wxgtk3.0 (gtk2 backend) on
GNU/Linux and with wxpython 2.8 on Windows.

Fix problem with decreasing size of StatusToolBar when tools are removed from toolbar.

StatusToolBar - toolbar with tool to build, clear, connect, ...
This problem appears only in python-wxgtk3.0. In python-wxgtk2.8 there
was not such problem.

If call StatusToolBar.SetMinSize(wx.DefaultSize), all is working, but
following warning message appears:

(Beremiz.py:15155): Gtk-WARNING **: 18:42:24.115: Negative content
width -6 (allocation 1, extents 4x3) while allocating gadget (node
toolbar, owner GtkToolbar)

To avoid that StatusToolBar.GetToolBitmapSize() is used instead of wx.DefaultSize

Add BACnet example

Rework README.md, add examples section, add instructions for Modbus extension, more information about runtime.

Add Modbus example

Disable source quality checking on ethercat plugin - will fix it later

Passed bacnet*.py through autopep8, and attemped to fix manually what went wrong + fixed pylint complains

More pylint+pep8 conformance

autopep8 + hand made fixes on ProjectController.py runtime/WampClient.py wxglade_hmi/wxglade_hmi.py

pylint on runtime/NevowServer.py

pep8 on runtime/NevowServer.py

merged

Make some POU libraries selected by default or not. This changes structure of features.libraries, please check and update your extensions if they use libraries

remove useless code

1. hotkey is already defined in menu string
2. remove duplicated code

Add full screen mode (menu and title are hidden)

It's can be switched by pressing Shift-F12 or by clicking button on the toolbar

Add information how to make shelve command work with check_source.sh called from hg hook

and added coresponding flag handling in check_source.sh

Automatically increment IEC-location address if copy of the variable is created

Make information about translation to be in unicode

This is necessary because some translator's names contains non-ASCII
characters and they are not handled properly in about dialog on Windows

Take plcopen_icons.svg as source of png icons as well

generate poe.ico from png images of different sizes.

Add 256x256 and 64x64 Beremiz icons


remove svg:midPointStop tags from icons.svg, because Inkscape
complained about unsupported tag. It seems that these tags were made
by Adobe Illustrator and aren't supported by any other app.

Add PLCOpenEditor icon to plcopen_icons.svg

add 256x256 size to the icon

Fix rounding of thousandths of microseconds in duration editor

Add checking value in microseconds field in duration editor dialog

Catch 'clipboard already open' errors in editors

Apparently following commits have not fixed the problem completely,
because it still happens (although not so often).

changeset: 2019:b8f795bdfe9f
user: Andrey Skvortsov <andrej.skvortzov@gmail.com>
date: Fri May 25 17:40:29 2018 +0300
summary: fix hangs on mouse selection in case if wxPython uses wxWidgets with GTK3+ support

changeset: 2018:5ce6d08ff2c7
user: Andrey Skvortsov <andrej.skvortzov@gmail.com>
date: Fri May 25 17:23:15 2018 +0300
summary: make clipboard open minimal time as wxPython documentation recommends

If task type is changed from 'interrupt' to 'cyclic' init interval with T#20ms.

Explicitly enable required libraries in test projects

Disable by default unlisted in project beremiz.xml libraries

Used libraries should be explicitly enabled.

Fix 'DoGetTextExtent - invalid DC' error

most likely this error happens only on certain wx backends.
GTK3+ on GNU/Linux is apparently one of them.
The problem is described in wxWidgets issue tracker.
http://trac.wxwidgets.org/ticket/12486

[-------------------------------------------------------------------------------------------------------------------]
platform:
Linux-4.16.0-2-rt-amd64-x86_64-with-debian-buster-sid

python-version:
2.7.15

traceback:
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 1605, in DispatchDebugValuesProc
self.CallWeakcallables("__tick__", "NewDataAvailable", debug_ticks)
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 1585, in CallWeakcallables
function(*cargs)
File "/home/developer/WorkData/PLC/beremiz/beremiz/editors/Viewer.py", line 1217, in NewDataAvailable
refresh_rect.Union(element.GetRedrawRect())
File "/home/developer/WorkData/PLC/beremiz/beremiz/graphics/GraphicCommons.py", line 1609, in GetRedrawRect
self.ValueSize = self.Parent.GetMiniTextExtent(self.ComputedValue)
File "/home/developer/WorkData/PLC/beremiz/beremiz/editors/Viewer.py", line 932, in GetMiniTextExtent
return self.MiniTextDC.GetTextExtent(text)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/_gdi.py", line 4127, in GetTextExtent
return _gdi_.DC_GetTextExtent(*args, **kwargs)
<class 'wx._core.PyAssertionError'>: C++ assertion "m_graphicContext" failed at ../src/common/dcgraph.cpp(1160) in DoGetTextExtent(): wxGCDC(cg)::DoGetTextExtent - invalid DC

wx-platform:
__WXGTK__

wx-version:
3.0.2.0

[-------------------------------------------------------------------------------------------------------------------]

traceback:
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/LogViewer.py", line 740, in OnMessageToolTipTimer
self.MessageToolTip.SetFont(self.Font)
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/CustomToolTip.py", line 75, in SetFont
self.RefreshTip()
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/CustomToolTip.py", line 158, in RefreshTip
self.SetClientSize(self.GetToolTipSize())
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/CustomToolTip.py", line 145, in GetToolTipSize
w, h = dc.GetTextExtent(line)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/_gdi.py", line 4127, in GetTextExtent
return _gdi_.DC_GetTextExtent(*args, **kwargs)
<class 'wx._core.PyAssertionError'>: C++ assertion "m_graphicContext" failed at ../src/common/dcgraph.cpp(1160) in DoGetTextExtent(): wxGCDC(cg)::DoGetTextExtent - invalid DC

[-------------------------------------------------------------------------------------------------------------------]

Fix size of ProjectDialog used by PLCOpenEditor

Disable scrolling for ProjectDialog, because otherwise very very small
windows is created.
This regression was introduced by 5701225 ("replaced normal panel with scrolled panel under project
properties").

Fix some compilation warnings for better ANSI C compliance

Customizable columns in VariableTables (i.e. can be monkey patched properly)

Merged

Customizable update of toolbar buttons (i.e. 'methods') according to PLCStatus

Fixed small typo in error message.

WAMP : complains about failure to start WAMP only if it was successfully imported.

WAMP: now config and secret given in project files always override those given in commandline. Also made extensions web customisations happen before registration of web interface.

Moved Wamp configuration file selection logic into runtime/wampclient.py. Added Wamp CRA secret file upload and download. Slightly reworked code for config and secret file loading and saving.

Added a way for extension to register dedicated URL under settings page URL (i.e. /settings/something)

Fixed a bit of everything in WAMP, and added web settings for that same extension.

Added some immutable field (platform) in default runtime web setting page, for the example.

Fix misc typos in exception handling code.

Fixed i18n related typo.

Fixed typo

Better logging of Nevow Server import in case of exception.

WampClient : Simplified, removed dead code, use exception for handling failures and misconfiguration, check existence of mandatory parameters.

Merged #2486, enhancements to WAMP client : auto reconnecting, wamp conf checking and saving, additional attributes for exposed calls, etc

Nevow based web interface now show simple Log message sending form for basic runtime, and allow extensions to add their own web settings.

Now, runtime extensions should be able to add their own settings to web configuration interface.

Embrio of setting form, just to test

#2486 Exception if custom protocol options are wrong.

#2486 ExposedCalls with register options as a dictionary.

#2486 Renaming functions.

#2486 Reconnect funtion in SaveWampClientConf function.

#2486 Modified reconnect function. Added 'active' parameter to wampconf.json file.

#2486 Adding reconnect funtion to WampClient. Global TransportFactory not needed anymore.

#2486 Added global TransportFactory, needed in WebInterface reconnecting function.

#2486 WampClient needs pyro.plcobj before registration calls.

#2486 Fix if protocol, register options are not present in wapmconf.json file.

#2486 Added ExposedProgressCalls list using details argument for registration progress calls.

#2486 Unnecessary variable removed.

#2486 Added option to use websocket register options. Added function getValidOptins to read options from wampconf.json.

#2486 Added option to use websocket protocol options.

#2486 Updated wamp test project to work with the latest Crossbar version.

#2486 Reset delay function added. It resets the delay and the retry counter on reconnect.

merge

merge

Fix compilation warning/error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]

merge

WxGlade HMI extension now does only instanciate wx object who's name match extension's name. If no object match the name and no code is provided in 'start' user python code section, then a warning is issued

BACnet : ensure that Init did happen before continuing with PLC startup.

Update list of files with strings for i18n and templates for translations

Add small contributing document with information about codestyle checking

Add argument to set list of source files to check

This is necessary, in case you want to use docker run in pretxncommit
Mercurial hook. Unfortunately for some reason if hg running in
container can't find just created commit defined by $HG_NODE. And it
throws error 'unknown revision'.

Here is example for hgrc.

[hooks]
pretxncommit.linter = hg status -m -n -a -n -I '**.py' --change $HG_NODE > files.lst && docker run --volume=$PWD:/beremiz --workdir="/beremiz" --volume=$PWD/../CanFestival-3:/CanFestival-3 --memory=1g --entrypoint=/beremiz/tests/tools/check_source.sh skvorl/beremiz-requirements --files-to-check files.lst

check_source.sh: handle case if there are no files to check

Fix linter errors

Add command line argument to run linter only on changed files

./tests/tools/check_source.sh --only-changes

It's recommended to run check_source.sh automatically on each commit,
so the rules are always enforced.
Even better is to use docker for that, so the versions of pep8 and
pylint are the same as on pipeline server.

To do this couple of lines should be added into repository's hgrc file.

[----------- cut from .hg/hgrc------------------]

[hooks]
precommit.linter = ./tests/tools/check_source.sh --only-changes
# precommit.linter = docker run -it --volume=$PWD:/beremiz --workdir="/beremiz" --volume=$PWD/../CanFestival-3:/CanFestival-3 --memory=1g --entrypoint=/beremiz/tests/tools/check_source.sh skvorl/beremiz-requirements --only-changes

[-----------------------------------------------]

Don't use fixed width labels in WAMP and PYRO dialogs

This causes problems if labels are translated into other languages and
width wasn't enough.

Fix internatialization in UriLocationEditor, PYRO dialog and Modbus configurator

Add copyright headers to retain implementation for GNU/Linux and Win32

Drop support for wxPython 2.6 and below

Autoresize UriLocationEditor dialog window

Fix compilation problem in case of TARGET_LOGGING_DISABLE turned on and TARGET_DEBUG_DISABLE turned off

Use the same retain implementation for Win32 targets

Currently plc_Win32_main_retain.c is exact copy of
plc_Linux_main_retain.c, because it's not possible to use symbol
links.

It'd be nice in the future to have possibility to modify targets.code.

Add retain basic implementation on GNU/Linux

Retain is saved in file and backup of this file is done every time.
File isn't saved on every PLC cycle to avoid high I/O load.
By default, retain is saved every second and on PLC stop/shutdown.
It's possible to override retain flush period by using CFLAGS option
in project's settings. For example, for 0.5 seconds period
use "-DFILE_RETAIN_SAVE_PERIOD_S=0.5".

Add helper function GetRetainSize()

it will be useful for retain implementations.

use CLOCK_MONOTONIC instead of CLOCK_REALTIME for timer setup

CLOCK_REALTIME is a wall clock, that could change back and forth (user
changes system time, winter/summer time, NTP corrections and so on).
For real-time application CLOCK_MONOTONIC should be used, it doesn't
have such jumps.

Add function example to first_steps example

It'll be used in documentation to show how to create function in
Beremiz.

fix type introduced by f33942053466 (fix pylint warning "(undefined-loop-variable) Using possibly undefined loop variable 'X'")

Build by default with optimization level -O2 for GCC

before -O0 was used by default, that caused pretty bad performance.

Amd64, i6700k, 4200MHz, GNU/Linux (non-RT kernel), gcc 7.2.0

-------------------------------------
Optimization | EN/ENO |no EN/ENO |
-------------------------------------
default | 11 | 9.5 |
-O3 | 3.9 | 5.2 |
-O2 | 4 | 4.8 |
-Os | 4.1 | 3.5 |
-Ofast | 3.9 | 5.2 |
-------------------------------------

ARM, BBB Cortex-A8, 600Mhz, GNU/Linux, gcc 4.6.3

-------------------------------------
Optimization | EN/ENO |no EN/ENO |
-------------------------------------
default | 273 | 226 |
-O3 | 141.8 | 106.2 |
-O2 | 142 | 107 |
-Os | 152.5 | 112.2 |
-Ofast | 141.7 | 106.2 |
-------------------------------------

For embedded systems with size constaints (like Cortex-Mx, AVR and so
on) I usually use -Os. It gets pretty good results. For
GNU/Linux-based systems -O2 is usually a good choice, as you see the
test results.

fix hangs on mouse selection in case if wxPython uses wxWidgets with GTK3+ support

This is default configuration on Debian Buster+ and Ubuntu 18.04+.
Probably it'll fix completely problem with 'clipboard already open'
described in the previous commit 5ce6d08f ("make clipboard open minimal time as wxPython documentation recommends")

make clipboard open minimal time as wxPython documentation recommends

https://wxpython.org/Phoenix/docs/html/wx.Clipboard.html#wx.Clipboard.GetData

"Call wx.Clipboard.Open to get ownership of the clipboard. If this
operation returns True, you now own the clipboard. Call
wx.Clipboard.SetData to put data on the clipboard, or
wx.Clipboard.GetData to retrieve data from the clipboard. Call
wx.Clipboard.Close to close the clipboard and relinquish ownership.
You should keep the clipboard open only momentarily."

Maybe it makes situation with pretty annoying error 'clipboard already
open' a little bit better.

traceback:
File "/home/developer/WorkData/PLC/beremiz/avangard-beremiz-ide/src/../../beremiz/BeremizIDE.py", line 955, in OnSaveProjectMenu
self.RefreshAfterSave()
File "/home/developer/WorkData/PLC/beremiz/avangard-beremiz-ide/src/../../beremiz/BeremizIDE.py", line 946, in RefreshAfterSave
self._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES)
File "/home/developer/WorkData/PLC/beremiz/avangard-beremiz-ide/src/../../beremiz/IDEFrame.py", line 926, in _Refresh
self.RefreshFunctions[element]()
File "/home/developer/WorkData/PLC/beremiz/avangard-beremiz-ide/src/../../beremiz/BeremizIDE.py", line 766, in RefreshEditMenu
IDEFrame.RefreshEditMenu(self)
File "/home/developer/WorkData/PLC/beremiz/avangard-beremiz-ide/src/../../beremiz/IDEFrame.py", line 1185, in RefreshEditMenu
if self.GetCopyBuffer() is not None:
File "/home/developer/WorkData/PLC/beremiz/avangard-beremiz-ide/src/../../beremiz/IDEFrame.py", line 956, in GetCopyBuffer
if wx.TheClipboard.Open():
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/_misc.py", line 5793, in Open
return _misc_.Clipboard_Open(*args, **kwargs)
<class 'wx._core.PyAssertionError'>: C++ assertion "!m_open" failed at ../src/gtk/clipbrd.cpp(598) in Open(): clipboard already open

Merged GPL + LGPL v2 or later EtherCAT extension. Fixed headers and copyright notice.

Propagated matiec changes in FB var accessors

Fixed most obvious bugs appear after grafting changes from previous development branches : re-enable openning non-CoE, CoE and CiA 402 nodes config

Fixed xslt stylesheet for extracting entries defined in module, rewiting xslt stylesheet to yslt

Fixed bug in information returned for module where entries are defined only in PDO mapping

Added support for loading XML file even if not following XSD schema (but still following XML syntax), warning user of errors in XML file

Fixed bug when compiling

Fixed higen example removing obsolete attribute in CIA402 node params file

Fixed controllers for working with latest version of xmlclass

Added bug in support for set flag for optional variables activation in axis public struct

Added support for set flag for optional variables activation in axis public struct

Replaced location for axis ref from %IW(location).0 to %IW(location).402. Added location for network position at %IW(location).

Rewrite CIA402 node specific code generating part

Cherry-pick and re-commit to legitimate ancestor of commit 'Ethercat Management Function Refactoring Source by RTES Lab.' from youcu <youcu1022@gmail.com>

Fixed bug when drag'n dropping variable in master startup command grid

Moved ratio scaling back to MCL. Rewrote CiA402 C part in a way it can be read and understood by some humans.

Added icon for Ethercat extension root and Ethercat master node

Fixed bug with global instance declaration

Fix bug in when moving Ethercat slaves fixed

Added mapping for TouchProbe function in CIA402 slave node

Fixed bug with axes boolean parameters value

Added error message when a device informations can't be found in ESI files

Fixed ToolTip on VariablesGrid columns on Windows

Update higen drive example introducing usage of csv mode

Merged

Fixed bug in support for module extra params in EthercatCFileGenerator

Added support for module extra params in EthercatCFileGenerator

Fixed support for multiple module extra params in ModulesLibrary

Added support for multiple module extra params in ModulesLibrary

Added support for using CIA402 motion mode csp, csv and cst

Fixed order of LocationCFilesAndCFLAGS, master was called after slaves in PLC init and retrieve functions

Fixed bug on Windows with sizers on Windows in Master Editor panel when its size changed

Fixed Save As... function in Beremiz

Added support for stopping SDOThreadProc when stopping PLC

Fixed bug when modifying slave module type

Fixed bug in filters behavior on Windows

Fixed filter behavior in MasterEditor and SlaveEditor

Fixed CIA402 node template for working with MC_Power modification removing implicit set position

Fix scan network functionality, project tree not refreshed after adding slaves

Rollback last commit

Fixed CIA402 node template for working with MC_Power modification removing implicit set position

Fixed bugs in drag'n drop from variables panel in master and slaves editor panel

Added initialization of abort_code and result_size to prevent warning message if not used in following code

Fixed header files inclusion in CIA402 node template file

Fixed (again) some non-clean exit in case of SDO failure at init

Merged

Fixed ethercat test with higen drive project

Fixed bug when using real axis and simulated axis at the same time (got the same index)

Now failure in template based part of C code also release the master for later use...

Better logging, saffer failure at init (allows restart)

Added error logging when SDO FB fails

Added logging based on collecting Kernel logs

Fixed typo

Fixed linking with non RTDM etherlab lib. Now with rtdm...

Split etherlab.py into multiple files

Fixed bug with process variables grid

Stripped useless depricated comments, changed print format of sdo abort code

Updated generated code to etherlab 1.5.2

Added Logging

Now use beremiz.h

Fixed bugs in Network Configuration Editor

CiA402 now fills NetworkPosition member of public axis struct

Fixed bugs in process variables generated code

Added specific add menu for directly choose slave type while adding new slave

Added code generation for process variables

Fixed modifications in Startup Commands grid

Improved Ethercat Network Configurator panels

Improved Ethercat Network Configurator panels

Added panel for managing ESI files from project and from database including module PDO alignment setting

Added support for MC_*DigitalOutput, MC_ReadAxisInfo and MC_ReadAxisError blocks from MCL in DS402 nodes generated code

Replaced SplitterWindow in ConfTreeNodeEditor by Notebook

Fix bug in support for Etherlab specific fieldbus interface function blocks

Fix bug in support for Etherlab specific fieldbus interface function blocks

Adding support for Etherlab specific function blocks for MCL fieldbus interface function blocks

Adding support for extracting ActualVelocity from CIA402 nodes PDOs

Fix bug in EtherLabSDODownload function block

Fix bug when Drag'n Dropping located variables on Windows

Adding support for using Etherlab SDO function blocks in MCL

Updating ethercat example for higen drive adding an example of Ethercat SDO upload block usage

Adding block library for SDO download and SDO upload

Fix bug in CIA402 slave digital inputs

Adding support to enable CIA402 slave digital inputs

Fix Axis_Ref type defined in VariableLocationTree

Adding support for selecting a PDO in a list of mutually exclusive configured PDOs in Ethercat Network Configurator

Fix bug in endianization in value transmit and received by SDO

Fix bug when modifying slave position

Fix C code Generator to use CoE section contained in the slave ESI file for defining Ethercat network configuration

Merged

Fix bug when modifying slave position

Better jitter compensation before sending Ethercat frame. Jitter can be compensed in both directions, within some limits

Different etherlab sequencing within retrieve and publish. Now, timer is polled after PLC exec until frame have to be sent. This slightly reduce jitter, compared to previous sequencing

Adding support for loading Profile dictionaries only if needed

Fix bug modules present in all groups with the same name even if they are defined by different vendors

Fix bug variable entries table column headers not translated

Fix import after integration of plcopeneditor into Beremiz

Removing call to UpdateAxis and ComputeAxis in CIA DS402 node generated retrieve and publish functions. These calls have been transfered to MCL library retrieve and publish functions.

Fix bug with AXIS_REF allocation

Adding support using plcopeneditor bitmap library for icon request

Fix bug slave information panel not refreshed when slave type changed

Fix bug when modifying node parameters

Merged

Fix disable dynamic PDOs support

Fix bug with AXIS_REF located variable drag'n drop and disable dynamic PDOs support

Adding support for getting CIA402 slave AXIS_REF located variables and disabling dynamic PDO mapping algorithm for drives than doesn't support this functionality

Changed AXIS_REF registration call name

Fixing bug on ConfNodeEditors refresh

fixed multiple cia402 instance symbol collision

Replacing Panel by ScrolledWindow for displaying node information for more clarity when window is small

Removing ModesOfOperation parameter until handled by MCL

Fix bug with VariablesList on Windows

refactoring

Merged

refactoring

Merged

refactoring

Fixed example build with installer 1.1

updated examples also

reflected changes in beremiz extension mechanism

Fixed wrong PDO in unused sync managers\nFix higen drive ethercat example

Fix Ethercat xsd files

Adding test project using higen drive

Adding forgotten icons

Adding plugin icons and replacing reference to DS402 by CIA402

Adding support for remotely scanning Etherlab network and automatically configure it

Defining all slaves as Etherlab master subplugin instead of editing them in an editor with vertical notebook

Adding Ethercat network scan command for testing (print result, network configuration not modified)

Adding support for uploading default value for unused entries in output pdos from slaves before starting master

Replacing wx.Grid control by a wx.TreeListCtrl for displaying slaves entries

Fix bug when trying to drag'n drop variable from slave variables grid

Adding support for setting TargetPosition only if PositionSetPoint value from MCL is valid

Fix bug with PowerFeedback value

Adding support for MCL

Added test directory

Adding support for DS402 node subplugin (only simple state transition implemented)

Fix some issues regarding arbitrary variable mapping

Moving Add and Remove button to Plugin menu items

Adding support for displaying slave sync managers and profile object dictionary and for arbitrarily mapping variable through variable location

Merge with Donggu modifications

Merge with Donggu modifications

Adding support for drag'n dropping located variables from topology panel to configurations and resources variable panel for declaring global located variables

Master relase code added

Master release code added

Adding support for not configuring pdos when not mandatory and not needed by locations defined in PLC program. Adding support for displaying locations tree in Topology panel and BrowseLocationsDialog. Merging pdos grid and variables grid into one single grid in slave infos panel.

First working implementation of Beremiz plugin for etherlab

merge

Add BACnet extension from Mario de Sousa <msousa@fe.up.pt>

Make Modbus extension license compatible with the rest of Beremiz IDE python code : GPLv2.

Commented out safety check to prevent deadlock in wxEvaluator, since wx Mainloop is not anymore in main thread. That safety check actually leads to having wx code running outside of MainLoop

Merge

Print version information about software used for tests

Fix codestyle

Fix typos introduced by 9fa2f8e "Fixed random segfault happening when loading new PLC in runtime, when using Xenonai."

merged changes in README.md

add python-cycler dependence in readme

Make Modbus mutexes non blocking for PLC. If data related to some modbus request is alredy locked when PLC wants to access it, then data isn't copied to/from PLC

Merged #2476, URI dialog fixes

close branch #2476 - URI dialog fixed

#2476 Changes to the comment.

#2476 Connectors dialog module added.

#2476 Separate connectors dialogs from connectors module.

#2476 Additional check added if we can import wx.

Allow deleting configuration tree node with no corresponding directory in project tree

Support unicode in LDFLAGS returned by extensions

Fixed typos

#2476 Added uri location editor, getting connectors from list in Beremiz.

Fixed random segfault happening when loading new PLC in runtime, when using Xenonai.

PEP-8 and PyLint

merged Denis change to apply input as we type in CTN configuration forms text fieds

PEP-8 and PyLint

Add safety check to prevent exception when disconnecting while debugging

Removed DebugThread. Take advantage of the fact that buffering is done in runtime. No need to poll for traces more than ten per second, then use simple wxTimer for that. Also removed Debug Lock since now everything happens in wx' mainloop.

Rework of runtime non-real-time threading, and shared object dynamic loading :
- All exposed operations on PLCObject are now serialized through main thread
(@RunInMain). Only one exception : python trace thread calling _GetDebugData
- Re-loading of same shared object is prevented. dlclose/delte/rewrite/dlopen
don't happen in that case. This is a workaround for some xenomai copperplate
bug triggering segfault, inbetween delete and rewrite.
- Trace thread now waits for data, dies if no data, and dies instead of
suspending as before when no data consumed after 3 seconds.
- Disabled threading in Pyro client
- Enforced auxiliary threads starting sequence : Pyro -> [UI] ->
PLCWorker.RunLoop

Stripped forgotten debug code

close branch

#2476 Fix for saving text in URI edit text box. No need to click out of URI edit text box to save edited text.

Fixed Xenomai 3 PLC stop freeze. Now use explicit finish command with pipes. Closing both ends of pipes doesn't abort blocking read anymore.

More canonical test.
There is an exception happening around here in some cases when connection is dropped while waiting for answer. Not sure that this fixes it but this is anyhow better.

PLCObject got more methods serialized through worker : Start, Stop, NewPLC.
This particularly helps with initialization/startup/re-load problems
when targeting Xenomai. It should help in general for runtime robustness,
since those operations aren't meant to be executed concurrently.

Fixed implementation of runtime worker that ensure that PLCObject Load and Unload methods always run main thread.

merged

merged

Intermediate state while implementing runtime worker to ensure that PLCObject Load and Unload methods always run main thread.

Stripped more dead code.

Cleanup of some dead code in PYRO connector.

Added logging in Xenomai init phase.

Apply new RT Pipes API from Xenomai 3

Removed useless try/except in Canfestival.py

#2579 On showing search result, text color of tree item is set to white. We need to change back color to show the result.

PEP-8...

Fixed bug that was creating many frames at starup on Windows

re-merge

Xenomai 3

merged Sergeys changes

fix bug with indelible values in some 'optional' fields in project properties panel

only 'required' fields should be indelible

make the URI model compatible with https

add address validation in Company URL field

remove duplicating code for variables name generate

add fields autocomplete when adding task or instance in resources

values will be copied from previous row, first row fills with the default values

fix search in TextViewer objects, search returns only first entry

side effect of a63bb40

fix import order according to PEP8

fix default time range choice for debug variable panel

only localized versions were affected

enlarge canvas border for debug variable graphic viewer

fix rounding milliseconds from nanoseconds

example:rounding 299999 ns to 300ms, if division result is an
integer, remainder will be lost, and result will be 299.

fix display TIME type variables in debug variable panel

fix for test app from skv. thanks

Prevent catching exception if exception handling was not enabled (or disabled by test test app).

pep8 and pylint hate me

Fixed typo introduced in 5736d25bb393

GetEditedElementInstancesInfos now optimized as well. Forgotten because not using [R.I.P]LibraryResolver, but still XSLT compiling was hapenning on each call.

Another attempt to make BitBuket's version of pylint happy.

Attempt to make BitBuket's version of pep8 and pylint happy.

Removed dead slow code

PEP8 and PyLint conformance: whitespaces and stuff

Copy pasted, no time wasted !

GetVariableDictionary and GetPouInterfaceReturnType optimized with new VariableInfoCollector based on XSLTModelQuery. Moved corresponding definitions out of PLCControler.py.

GetPouInstanceTagName optimized with XSLTModelQuery.

Better writing of some xpath added in previous commits about XSLT optimization.

Moved some definitions away from controller class, and adaped references them through all code.

Hook Beremiz Launcher AppStart to AdvancedSplash OnPaint event in order to ensure image is beeing displayed before loading.

Avoid endline escaping in multiline xpath epressions in xslt. '&#10;' Is apparently ignored but never know...

Fixed earlier XSLT optimizations. Some/most results were missing.

Moved some code from PLCController.py to other modules. Added necessary imports.

GetPouVariables optimized with XSLTModelQuery

Added /plcopen/InstancesPathCollector.py, to move more model xslt querying code away from PLCController.py.

Fixed Exception dialog disapearing after a view second when exception occurs during app startup.
Problem was caused by splashscreen timeout, wx closing averything else if there is no more main frame.
Changes:
- no more timeout for splashscreen
- use wx.App OnInit method to give first operation to mainloop, object are then now created in mainloop
- main loop is then created _before_ showing splash screen
- no more wxyield or wx processevent tricks needed to display splash screen
- exception handler not blocking anymore on dialog (callafter)
- because of mainloop being there before everything, exit must be called explicitely if exception caught during startup -> exit parameter in handle_exception + try/except around startup calls

UNTESTED ON WINDOWS

Moved XSLTModelQuery class to own module in plcopen package.

Added a class to speedup all XSLT queries. WIP, now only for instances_path.xslt / GetInstanceList()

Stripped useless node creation in instances_path stylesheet.

This should really help GetInstanceList to perform better: resolver removed, no more deepcopy, no more useless xml serialization, no more node-set() calls.

YSLT auto indent trick is useless here, added yslt_noindent.yml2, regenerated XSLT files

Prevent compiling XSLT on each call of GetInstanceList. To be continued. More optimization needed here. 100x would be fine...

Changed meaning of -c commandline argument for Beremiz service : only gives DEFAULT wamp config.
If existing project already has a wamp config, it is taken instead.

Factorized duplicated code

Better variable naming, and small optimization.

Unclutter graphics package scope.
Moved some import statements from "graphics" package to "viewer" module.
It also avoid systematic import of everything in graphics when we only need one submodule.

Removed dead code

Fixed pyro timeout for runtime, was set too short and runtime was disconnecting when building PLC

Ask to stop PLC before transfer if it is running

Factorized some repeated refresh code into a method, to allow customisation.

Launcher : add a debug attribute, instead of BMZ_DBG, so that customization can use it.

Stripped old dead code.

More changes in Launcher. Modules to be loaded in the background are given in a list, and assigned as object attributes. Also splitted CreateUI into CloseSplashScreen and CreatueUI.

ClassImporter now accepts string, callable or class, for compatibility with some old extensions.

Launcher: ShowUI call moves from preStart to start. ShowUI() split into CreateUI() and ShowUI(). Start()'s arguments are passed to CreateUI()
This is meant to allow customizations to pass own pre-instanciated controller to UI at startup.

Launcher: allows customizations to specify what globals passed to extensions

Documentation

Another set of meaningless changes to satisfy PEP8 and PyLint.