Merge

fix infinite recursion in 'Reset Execution Order' functionality if FBD body contains feedback connections

fix issues in PLCOpenEditor with moving from wxWidgets 2.8 to 3.0

1)
./PLCOpenEditor.py:63: wxPyDeprecationWarning: Using deprecated class PySimpleApp.
app = wx.PySimpleApp()

2)
./PLCOpenEditor.py:475: wxPyDeprecationWarning: Call to deprecated item.
wx.InitAllImageHandlers()

3)
Traceback (most recent call last):
File "./PLCOpenEditor.py", line 480, in <module>
frame = PLCOpenEditor(None, fileOpen=fileOpen)
File "./PLCOpenEditor.py", line 163, in __init__
IDEFrame.__init__(self, parent)
File "/tmp/f/beremiz/IDEFrame.py", line 657, in __init__
self._init_ctrls(parent)
File "/tmp/f/beremiz/IDEFrame.py", line 485, in _init_ctrls
self._init_icon(prnt)
File "/tmp/f/beremiz/IDEFrame.py", line 476, in _init_icon
if self.icon:
AttributeError: 'PLCOpenEditor' object has no attribute 'icon'

update messages and add Russian translation for new menu entry 'switch perspective'

Merged in Surkovsv/beremiz (pull request #4)

Add hotkey (F12) for switching perspective.

Add hotkey (F12) for switching perspective.

Switching perspective feature hides/restores all panels except of the main editor window for current FB.
So all available screen space is used for editor.

Merged skvorl/beremiz into default

Fixed crash when starts on OS X with wxPython 3.0.x

Merged skvorl/beremiz into default

Added .idea dir to ignore.

cleanup logging example

add comments, rename variables, some rework for algorithm

fix non-working logging at first connection to PLC after Beremiz launch

At the same time this helps to avoid exception described in 1484:d5efbb20927e.

Merged in Surkovsv/beremiz (pull request #2)

fix bug with non-editable names and types of FB local variables in POU's written in ST or IL

fix bug with non-editable names and types of FB local variables in POU's written in ST or IL

fix highlighting input/outputs in function call in ST, if comment section is placed
inside call.

For example:

PackOutputs(
W4 := OUT1,
W5 := OUT2,
W6 := OUT3,
W7 := OUT4,
W8 := OUT5 (* comment inside call *),
W9 := OUT6,
W10 := OUT7,
W11 := OUT8);

add initialization tick time on Beremiz start

This fixes issue #6

fix race condition in ProcessLogger

- Fixed startup from ancestor code.

This fixes issue #5

fix bug: Beremiz IDE hangs during launching Beremiz_service

this is regression introduced as side effect by d7f474d [fix issue
with sometimes wrong return code of ProcessLogger]

automatically detect flags supported by matiec and find correct path
for matiec C library files

This makes possible to use an old matiec and the new one.

fix bug that appears if datatype in the project tree is renamed to wrong name (keyword, existend type,...)

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 16765, in <lambda>
lambda event: event.callable(*event.args, **event.kw) )
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/expando.py", line 126, in _adjustCtrl
numLines = self.GetNumberOfLines()
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 16710, in __getattr__
raise PyDeadObjectError(self.attrStr % self._name)
PyDeadObjectError: The C++ part of the TreeTextCtrl object has been deleted, attribute access no longer allowed.

add distribution license notice to about dialog as GPL requires

add GPLv2 license

add copyright notices to python files where there were missing, that
is required by GPLv2

fix issue that was impossible to remove local instance of functional
block if pou is written in ST or IL

fix highlighting of multiline comments in ST and IL

close #2

fix error if non-latin character was entered in initial value in
data type element

Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 575, in OnStructureElementsGridCellChange
value = self.StructureElementsTable.GetValue(row, col)
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)

fix issue with sometimes wrong return code of ProcessLogger


As a result of wrong return code Beremiz gives folowing traceback:
Traceback (most recent call last):
File "./Beremiz.py", line 850, in OnMenu
getattr(self.CTR, method)()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 925, in _Build
IECGenRes = self._Generate_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 568, in _Generate_SoftPLC
return self._Compile_ST_to_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 661, in _Compile_ST_to_SoftPLC
C_files.remove("POUS.c")
ValueError: list.remove(x): x not in list

The problem is that both threads (for reading stdout and stderr) call self.Proc.poll(),
that updates internal returncode field. This call is done without any locking and the first thread gets correct result,
but other gets 0 as retval. If 0 gets thread, that afterwards calls callback finish, then wrong return code is returned
to the parent. Now only the thread with a callback polls for the return code, other thread just checked local value.

Additionally function spin() waits now until all threads finish reading their pipes, so the results are always correct.

Fix error about missing attribute 'timeout' that happens sometimes during compilation

The fix [1476:49f1763a5613] of the problem with following trace was wrong.
Traceback (most recent call last):
File "./Beremiz.py", line 1229, in run_with_except_hook
run_old(*args, **kw)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 68, in run
self.endcallback(self.Proc.pid, err)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 169, in finish
if self.timeout: self.timeout.cancel()
AttributeError: ProcessLogger instance has no attribute 'timeout'
The problem was that compilation process was finished before the timeout attribute is set.
Now timeout is set before launcing of compilation process.

fix copying elements with non-latin content like comment element, or
variables with description in non-latin character set

before any non-latin text was converted after copying to strings like '&#1069;&#1090;&#1086;...'

fix issue that if functional block is dragged from project panel into
ST text editor and in dialog 'Please enter a block name' button
'cancel' is pressed, despite of cancel text about drag'n'dropped type
is pasted in ST program.

fix regression introduced by changeset: 1431:28e9d479aa65 [Use '-p' command line option when running matiec (iec2c)]

Variable matiec_flags in c_ext.py and PythonFileCTNMixin.py is not
used for flags for matiec (IEC to C compiler) actually, but it's used
to compile C-code generated for extensions using normal C-compiler,
like gcc.

fix display of ARRAY fields inside of structure data types.

Previously ARRAY fields in structures were displayed, for example,
like 'ARRAY [1..2] OF ARRAY' instead of 'ARRAY [1..2] OF INT'. Because
of this error the array type can be really edited.

fix Traceback if search icon on library panel is clicked, when no
category/item is selected in the library.

The problem is here, that if nothing is selected method GetSelection()
returns root item, that doesn't have any python data associated with it.
This issue seems to be wx3.0 specified, because it doesn't exist
with wx2.8 on Windows.

update Russian about Beremiz dialog window

fix issue, that was impossible to change time interval for cyclic
tasks, when wx 3.0 is used

fix deprecation warnings about accessing properties m_x, m_y of wxKeyEvent

/home/beremiz/beremiz/controls/PouInstanceVariablesPanel.py:354: wxPyDeprecationWarning: Accessing deprecated property.
event.m_x = size.width / 2

fix set_color_cycle from matplotlib deprecation warning

/usr/lib/python2.7/dist-packages/matplotlib/cbook.py:137: MatplotlibDeprecationWarning: The set_color_cycle attribute was deprecated in version 1.5. Use set_prop_cycle instead.
warnings.warn(message, mplDeprecation, stacklevel=1)

update Russian translation

add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor

fix wrong Row number in DiscoveryDialog.py that caused following traceback:

Traceback (most recent call last):
File "/home/beremiz/beremiz/ProjectController.py", line 1536, in _Connect
dialog = DiscoveryDialog(self.AppFrame)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 124, in __init__
self._init_ctrls(parent)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 121, in _init_ctrls
self._init_sizers()
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 73, in _init_sizers
self._init_coll_ButtonGridSizer_Growables(self.ButtonGridSizer)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 64, in _init_coll_ButtonGridSizer_Growables
parent.AddGrowableRow(1)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 15343, in AddGrowableRow
return _core_.FlexGridSizer_AddGrowableRow(*args, **kwargs)
PyAssertionError: C++ assertion "!m_rows || idx < (size_t)m_rows" failed at ../src/common/sizer.cpp(1967) in AddGrowableRow(): invalid row index

increase height of some dialog windows so they have enough space for buttons

add translation into Russian for dialog window "About PLCOpen Editor"

add translation of "about" window into Russian

make About and Find dialogs have the same icon as main Beremiz window

all child windows will take the parent's icon, if no other is specified.

fix splash loading with wx3.0

Previously only gray square was shown. Apparently to show splash screen several calls of wx.Yield() are necessary.
Unfortunately splash.IsShowOnScreen() returns always 1 regardless of whether splash is on the screen or not.
this fix is a dirty hack. It just process all events after splash is created during 0.3 seconds.

add i18n for couple of strings in TextViewer.py
add source file for Russian translation
update messages.pot and app.fil
update Russian translation

increase height for ConnectionDialog and ArrayTypeDialog to have
enough place for buttons

add Russian translation

bitmap in wx3.0 doesn't have useAlpha() method

Suppress WXDEBUG assertions, as happens by default with wx2.8. This is
necessary for wx3.0

Exception while connecting LOCAL://!
Traceback (most recent call last):
File "/home/beremiz/beremiz/ProjectController.py", line 1560, in _Connect
self._SetConnector(connectors.ConnectorFactory(uri, self))
File "/home/beremiz/beremiz/ProjectController.py", line 1508, in _SetConnector
self.StatusTimer.Start(milliseconds=500, oneShot=False)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_misc.py", line 1324, in Start
return _misc_.Timer_Start(*args, **kwargs)
PyAssertionError: C++ assertion "m_window" failed at ../src/gtk/dcclient.cpp(2043) in DoGetSize(): GetSize() doesn't work without window

enable use of wxWidgets-3.0

make mki18n.py wx-3.0 compatible and fix segmentation fault

$ python mki18n.py -m -v --moTarget=../locale --domain=Beremiz
No project directory given. Using current one: /home/beremiz/beremiz/i18n
Application domain used is: 'Beremiz'
Target directory for .mo files is: ../locale
../src/common/stdpbase.cpp(62): assert "traits" failed in Get(): create wxApp before calling this
Segmentation fault

fix issue, then it wasn't possible to view FBD programs

the reason for that is possible wx-3.0-gtk2 bug that happens if
ALWAYS_SHOW_SB is set.

Traceback (most recent call last):
File "Beremiz.py", line 1045, in OnProjectTreeItemActivated
IDEFrame.OnProjectTreeItemActivated(self, event)
File "IDEFrame.py", line 1667, in OnProjectTreeItemActivated
self.EditProjectElement(item_infos["type"], item_infos["tagname"])
File "IDEFrame.py", line 1752, in EditProjectElement
new_window = Viewer(self.TabsOpened, tagname, self, self.Controler)
File "editors/Viewer.py", line 611, in __init__
EditorPanel.__init__(self, parent, tagname, window, controler, debug)
File "editors/EditorPanel.py", line 68, in __init__
self._init_ctrls(parent)
File "editors/EditorPanel.py", line 52, in _init_ctrls
self._init_Editor(self)
File "editors/Viewer.py", line 603, in _init_Editor
style=wx.HSCROLL | wx.VSCROLL | wx.ALWAYS_SHOW_SB)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_windows.py", line 296, in __init__
_windows_.ScrolledWindow_swiginit(self,_windows_.new_ScrolledWindow(*args, **kwargs))
PyAssertionError: C++ assertion "scrolled" failed at ../src/gtk/scrolwin.cpp(205) in DoShowScrollbars(): window must be created

fix issue, then it wasn't possible to remove functional blocks from
project using right click and popup menu.

The problem is that, PopupMenu was called using IDEFrame object and as
a result item in ProjectTree loosed focus and focus went to IDEFrame.
Therefore later functions couldn't detect which item in ProjectTree
was selected.

fix many compilation warnings about static variables used by non-static functions

[CC] plc_main.c -> plc_main.o
/tmp/be/build/plc_main.c:396:40: warning: ?LogBuff? is static but used in inline function ?copy_from_log? which is not static
memcpy((char*)buf + remaining, LogBuff[level], size - remaining);
^
/tmp/be/build/plc_main.c:395:22: warning: ?LogBuff? is static but used in inline function ?copy_from_log? which is not static
memcpy(buf, &LogBuff[level][buffpos], remaining);
^
...

^
/tmp/be/build/plc_debugger.c:825:20: warning: ?retain_offset? is static but used in inline function ?BufferIterator? which is not static
Retain(retain_offset, size, real_value_p);
^
/tmp/be/build/plc_debugger.c:823:47: warning: ?retain_offset? is static but used in inline function ?BufferIterator? which is not static
unsigned int next_retain_offset = retain_offset + size;
^
^

make attribute CFLAGS and LDFLAGS optional and add default empty value

Actually CFLAGS and LDFLAGS are not required and can be empty.
Without default empty value if target platform in project settings was
set to "Linux" CFLAGS and LDFLAGS was initialized with NoneType.
The result was broken build and it wasn't to save/load project with
such settings.

Traceback (most recent call last):
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 956, in _Build
if not builder.build() :
File "/home/developer/WorkData/PLC/beremiz/beremiz/targets/toolchain_gcc.py", line 96, in build
Builder_CFLAGS = ' '.join(self.getBuilderCFLAGS())
TypeError: sequence item 0: expected string, NoneType found

fix issue, when structure data type with array field is created

Traceback (most recent call last):
File "editors/DataTypeEditor.py", line 669, in ElementArrayTypeFunction
self.RefreshTypeInfos()
File "editors/DataTypeEditor.py", line 761, in RefreshTypeInfos
self.Controler.SetDataTypeInfos(self.TagName, infos)
File "PLCControler.py", line 2075, in SetDataTypeInfos
array.baseType.setcontent(PLCOpenParser.CreateElement(
AttributeError: 'lxml.etree._Element' object has no attribute 'setcontent'

fixes sometimes happened error during project compilation

Traceback (most recent call last):
File "./Beremiz.py", line 1229, in run_with_except_hook
run_old(*args, **kw)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 68, in run
self.endcallback(self.Proc.pid, err)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 169, in finish
if self.timeout: self.timeout.cancel()
AttributeError: ProcessLogger instance has no attribute 'timeout'

merge

Use '-p' command line option when running matiec (iec2c)

Add command line option '-l' when calling matiec

merge

merge

merge

Update __SET_VAR() macros to reflect changes made to matiec

Merged

Merged

Fixed win32 build warning caused by leftover debug code

Fixed win32 runtime crashing when attempting to log before errors before PLC start. Added pictures to wxHMI and fixed it so that it loads on windows as well

Fixed canfestival extension own path resolution

Changed runtime's global PLCID to PLC_ID, working around redefinition in windoze' headers.

Extended wxHMI test

Added wxHMI test

merged forgotten changesets

Added log message when RETAIN memory not valid

Fixed leftover typo

Added PLCID variable accessible from C side, set with binarie's MD5. Added retain init and cleanup calls. Extended tests/python to test PLCID

Splitted plc_Xenomai_main.c to enable further customization

add pyrossl client side

fixed build of some tests

Fixed Nevow website startup

Fixed build of tests/python.

Added Ronan Bignaux (genesis) patch to use wxversion. Fixed side effects with sys.path. Other cosmetic fixes about path included.

Fixed SFC code generation bug detected by Mario

Added __ext_name__ variable accessible from user python code, reflecting extension name. Fixed contend of OnChange field in PLCGlobalsDesc

Added more columns in variable list of extensions' code editors - updating python's PLCGlobals from PLC logic can trigger asynchronous 'OnChange' python call

Fixed systematically loading PLC binary at startup even without -a parameter. Extended py_ext extensions instances variable description (PLCGlobalsDesc). Now contains list of variables organizd by extension, with extension name

Split runtime's twisted modules import and setup to ease runtime extensions hotpatching

More versatile registering of wamp callees

Added forgotten wampconf.json in tests/wamp

WAMP : prefix callee names with given ID so that multiple PLC and IDE can join the same realm

Fixed race condition preventing to stop PLC through WAMP

Added auto-reconnect for runtime. Fixed Beremiz closing problem caused by remaining twisted reactor thread in IDE.

Runtime : Added PLCobject methods registring. IDE : Added WAMP connector. Still need some fixes

Added stub code for runtime WAMP client. Added runtime command line switch to select WAMP url and Nevow web site port. Web port is now fixed, next port number is not tested if bind fails.

Moved twisted/nevow/athena away from Berermiz_service.py + some minor cleanup

Added Beremiz_service.py command line switch to load python extention for runtime independently from PLC program

py_ext user python code can now know about global variables shared with PLC. updated tests/python accordingly

Fixed python runtime trace thread auto suspend. Now suspends after 3 seconds when no trace is requested

Added runtime side trace buffer, handled in a separate thread, limited to 1MB, and dropped after 3 seconds if not used by IDE. GetTraceVariables is not anymore blocking on next PLC cycle

Moved trace buffer unpacking in the IDE. Latest traced variable samples are now passed as a single string

Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.

more minor cleanup

minor cleanup

merged forgotten changes

Simplified use of runtime's global variable __common_ticktime accross extensions.

Use '-p' command line option when running matiec (iec2c)

Add command line option '-l' when calling matiec

Fixed location of directory containing IEC standard library in C format.

Change location of directory containing IEC standard library in C format.

Added highlighting of wrong SINGLE task trigger

Fixed incomplete task grid update on interface change, in Resource editor

Enable overloading of availables languages in POU creation dialog

Enable overloading of task triggerring source cell editor (SINGLE) in resource editor. PLCGenerator now generates MULTI keywork instead of SINGLE when task's activation is surroundes with square brackets

Updated tests/python : added derivated return type function declaration+call and re-enabled refrences to global FB interfaces

Fixed declaration and ST code gen for IEC function that return derivated types

Added a variable name text entry dialog to allow name change on drag'n'drops

'NamedConstant' variable D'n'D is now allowed on variable grid

Allow specification of command line arguments encoding in ProcessLogger

Splitted type selection menu code in VariablePanel, making easier to override behaviour by inheritence

Fixed crash at project load when features.libraries is empty (i.e. no libraries are provided).

Added plcopen.definitions.DefaultType, set to INT.

Fixed POU paste exception

Propagated changes made in matiec/lib/accessor.h _SET_VAR macro (Mario's matiec changes merged at 39086e324665) to py_ext library, and other (not compiled in) XML standard FB definitions.

Added 'NamedConstant' drag'n'drop in text programs as well (was only accepted on graphical languages).

Fixed launch of PLCopenEditor, broken since 611fded24ce4.