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