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 !