Merge

SVGHMI: Add more local HMI variable tests in tests/svghmi.

SVGHMI: finished initial implementation of PAGE_LOCAL and HMI_LOCAL variables.

SVGHMI: add a SetPoint to Slider Widget, visible only when operating the slider.

SVGHMI: Update Slider widget so that it doesn't display future value but actual value only.

SVGHMI: provide request_animate() to Widget authors so that they can register redraw code when events lead to redraw. Widget member animate() is called when it is time to update DOM.

Merge

SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change.

Beremiz test project with newly created widgets.

Rebuilded gen_index_html.xslt after all new widgets were commited

Create new multistate widget which extand class widget

Create new CircularSlider widget which extand class widget

Create new slider widget which extand class widget

Reworked togglebutton widget to extand class widget

Changed keyboard to show on defined position.

* svghmi.js
added size paramter to edit_value
changed show_modal function to offset keyboard if paramter passed

*widget_input.ysl2
in on_edit_click:
function get position if key_pos element is defined in input widget

*widget_keypad.ysl2
Reworked keypad widget to extand class widget,
added support for changing keyboard position to user defined location

Reworked button widget so it uses classes.

SVGHMI: allow multiple variables and formatting in Display widget. Formatting is printf style and given as first argument. If no formating is given as widget argument, space separated.

SVGHMI : have to move some JS declarations from "preamble" to "declarations" and others from "declarations" to "definitions" section to make room for JS libraries that would be used by widget classes.

SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit)

SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness".

Because of allowing multiple variables per widget, we must distinguish if individual variables is relative to page, not the whole widget.

SVGHMI: More JS code refactoring : change_hmi_value and apply_hmi_value now methods of widget class.

SVGHMI: Better JS code semantic in ForEach widget class. Update lagging generated xslt.

SVGHMI: Add ForEach Widget is svghmi test

SVGHMI: add get_idx(index) to widget objects to factorize a bit code repeated accross widgets. To be continued.

SVGHMI: prefer apply_hmi_value() to change_hmi_value() when possible

SVGHMI: Add RelativePages to tests

SVGHMI: Update Widget Display templates to generate Class based declaration.

SVGHMI: JsonTable now picks items from HMI:List, and update texts, all according to Json data. Still miss scrolling.

SVGHMI: JsonTable now generate working data access code for data/* elements.

SVGHMI: Minimal support for HMI:List : clones pointing to elements of any HMI:List are never unlinked, widgets using HMI:List will rely on this.

SVGHMI: minimal JSON Table Widget communication infra + corresponding python code as py_ext code in svghmi test. To be continued.

Python Runtime: order of execution of extension's init() and cleanup() now reflects order of appearance of extensions in configuration tree.

Python Runtime : stil untested optimization of Python Safe Globals.

Now only one python_poll block per python extension is used to trigger
execution of OnChange calls.

Prevent global python_poll blocks to be created when accidentally adding content to C-File OnChange column.

Merge from default

Modbus: fix strange side effect of re-use of condition variables or mutex with Xenomai : without bzero of the associated types, mutex keeps locked.

Modbus: fix client timer invalid arguments.

Modbus add a timer thread, and switch timer to SIGEV_THREAD_ID to follow xenomai posix skin restrictions.

Runtime: Fix typo in PLCObject leading to exception when reporting failure.

merged

SVGHMI: Fix bug introduced when merging default

SVGHMI: Add use of Python PLC Globals it test

Merge default changes in SVGHMI

Merge default changes in SVGHMI

SVGHMI: add "unsubscribable" property to widgets in order to generalize what already happens for jump buttons.
In most cases jump buttons do not really subscribe to pointed HMI variable, path is given as a relative page jump path. When widget.unsubscribable is set to true, no subscription is made on page switch, but still offset is updated.
This fixes bug happening on relative jump buttons without "disabled" element where offset did not change on relative page switch.

merge

Merge

SVGHMI: Added widget toggleButton.

SVGHMI: Changed widget button handler to element attribute.

Runtime: create .md5 file at the end of all transfered files being written to disk, so that it presence indicates completeness of transfer.

IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.

Runtime: fsync() files when transfering them, to prebent data loss when poweroff soon after programming. Fixed variable naming as a side effect.

PLCObject : reorganize code in StartPLC(), add a PreStartPLC() empty method, to be overloaded by runtime extensions.

Solve import order problem when POULibrary imports ConfigTreeNode because of UserAddressedException. Now UserAddressedException is declared in POULibrary.py, as a quick and dirty fix, but some independant module should be created for beremiz exceptions in general.

SVGHMI: stop using eval in change_hmi_value, apparently slowly leaking memory.

SVGHMI: Switch widget was picking sub-elements from original SVG, not the result SVG ehwe clones are unlinked, thus making problems with svg:use based widgets.

SVGHMI: When unlinking a clone of a group, do not create additional group, but merge transformation and styles, and replace label. This allows svg:use based widgets to directly access elements of svg:use targeted element.

SVGHMI: Applies clone unlinking to widget themselves, not only to clones inside widgets.

merge

SVGHMI: Makes error when HMI tree is not well formed. Prevents multiple and non-first HMI_NODE, and ensure that all paths in HMI tree are unique.

Added FatalError call to Libraries code gen, so that they can emit messages addressed like config tree nodes do.

SVGHMI: more Widget properties declared ES6 style.

SVGHMI: Switch widget now use class declaration

SVGHMI: Update Button widget to class declaration, and add a button widget in tests/svghmi.

SVGHMI: explicit handling of undefined maximum widget update frequency

SVGHMI: removed dead code

SVGHMI: Back button updated to class style

merge

DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing

SVGHMI: Exclude non-widget HMI:* labeled elements from hmi_widget. Namely : HMI:Page HMI:Lang and HMI:List have been excluded.

SVGHMI: clean up dead code, update generated xslt.

SVGHMI: apply per class overloading of sub/unsub to Jump widget

SVGHMI: apply per class overloading of sub/unsub to ForEach widget

SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class.

SVGHMI: Parameters common to all widget constructors now passed as ordered parameters.

SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets.

SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes.

SVGHMI: Systematically output local name as /* comment */ when emiting content.

Merge

SVGHMI: Fix flawed logic to place nodes in the HMI tree, leading to wrecked tree in some cases.

Added button and circular bar widgets.

SVGHMI: added more meaningful namespaces to emit javascript code from.

SVGHMI: moved JS code of foreach and jump widget in corresponding widget_*.ysl2. To be continued.

SVGHMI: spread JS code from svghmi/scripts.ysl2 in other .ysl2 files, using dedicated preamble and epilogue namespaces

SVGHMI: Introduced "emit" to simplify producing per-topic code and content from anywhere in code. Applied to debug output, next to JS.

SVGHMI: Move reflective debug tags from "reflect" to "debug" namespace, preparing for per-purpose namespaces.

SVGHMI: Added scripts.ysl2

SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability.

SVGHMI: HMI:DropDown: more documentation.

SVGHMI: Comments in HMI:DropDown source code

SVGHMI: HMI:DropDown menu aligns to selected when opening

SVGHMI: When clicking outside of opened HMI:DropDown box, close it.

SVGHMI: Fix HMI:DropDown flicker on close.

SVGHMI: HMI:DropDown now temporarily takes content from widget's arguments, until HMI:List is implemented.

SVGHMI: Connect HMI:DropDown to value in HMI Tree, in svghmi test as well.

SVGHMI: fix probable problem in HMI:Input, where value could be applied to wrong index if used in relative page.

SVGHMI: HMI:DropDown element is brought in front when opened, so that it isn't occulted by other widgets at the same level.

SVGHMI: HMI:DropDown now catches all clicks when open

SVGHMI: Add button element to HMI:DropDown, also fix problem with computed box margins.

SVGHMI: HMI:DropDown now scrolls forward and backward

SVGHMI: progress on HMI:DropDown - now selects some value on click, and close

SVGHMI: HMI:DropDown work in progress, intermediate commit. Now menu's rectangle grows up to viewport borders.

SVGHMI: intermediate commit while working on dropdown widget.

Here is the plan :
HMI:DropDown : svg:g of svg:rect + svg:text
rect is extended to match content size, and if content size exceed page size, user can scroll
HMI:List : either HMI:List:ListName as svg:text, one tspan per list entry
or HMI:List:ListName:Foreach:HMI_CLASS:SUB/PATH/TO/VALUE@/ROOT/PATH as empty svg:g

SVGHMI: HMI is not speculating on PLC variable update anymore when sending new variable value.

HMI variable cache in JS was changed in advance for more responsive behaviour when updating a HMI tree variable. This was leading to display value different from hmi tree variable in case the expected update did not happen because PLC program did revert it.

SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled...

SVGHMI: fixed keypad JS regarding shift/capslock and other details

Fix unmatched "Courier" font for monospace fonts on latest ubuntu 20.04. Selected "FreeMono" instead, present since at least 18.04

SVGHMI: Keypad working for HMI_STRING, still Shift/CapsLock not finished.

SVGHMI: fix keyboard not showing

SVGHMI: Added keypads to svghmi test's SVG file

merge

SVGHMI: Keypad: added code to re-attach keypad when starting edit.

SVGHMI: removed debug code

SVGHMI: More infrastructure for editing values with a keypad.

SVGHMI: Widget input buttons should be clickable through svg:use (onclick attribute instead of addEventListener)

SVGHMI: moved dead code to where it belongs

SVGHMI: empty widget_keypad.ysl2, WIP

SVGHMI: HMI:Switch now accepts boolean values 'true' and 'false'

SVGHMI: Jump widget, if it has a 'disabled' labeled element, reflects value of the pointed HMITree variable by showing this element when value is False, and behaving normaly otherwise.

SVGHMI: prevent man-made memory leak by limiting back button history items count to 42

SVGHMI: collect debug data through xslt reflectivity instead of yml2/python trick

SVGHMI: Jump widget can now display as active or inactive, if corresponfing "active" and "inactive labeled elements are provided.

SVGHMI: added Back widget.

SVGHMI: Jump widget now make errors if path given for relative jump doesn't match target page reference path class.

SVGHMI: Check that explicit relative page jump path is consistant with destination page reference path.

SVGHMI: ForEach Widget now has a better wrap-around when scrolling : hit the boundary systematically before wrapping

SVGHMI: Alow relative relative Jump. (i.e, relative jump from a foreach widget)

SVGHMI: Generalize applying cache to widgets, be it from page or ForEach widgets. Now ForEach widget buttons work as expected.

SVGHMI: Widget ForEach buttons now call corresponding methods.

SVGHMI: ForEach now has working (un)subscribe. Fixed PageSwitch that wasn't behaving when jumping to current page with another path.

SVGHMI: Easier way to match HMI tree elements to paths. ForEach widget now looks for paths and indexes of all items, and enforce path to be consistent with ForEach items sub widgets

SVGHMI: added func:get_hmi_tree_elt to match HMI tree node from path. Continue implementing ForEach widget : force order and completeness of items list. Now also collecting ForEach buttons.

SVGHMI: ForEach knows its own widgets

SVGHMI: add widget_foreach.ysl2

SVGHMI: make root HMI tree node a HMI_NODE, droped HMI_ROOT node type

SVGHMI: reworked widget (un)subscription now a method of widgect object, allowing special subscription methods

SVGHMI: Exclude (again) sub-widgets of forEach widget from page-switch managed widget.

SVGHMI: cosmetic changes

SVGHMI: Simplification and optimization. func:parselabel becomes a template.

All labels are parsed into a global variable containing resulting widget
description as a node-set. func:widget(id) was added for random access to
widget description.

SVGHMI: intermediate untested state. Excluded ForEach widget from pages handled widgets.

SVGHMI: update Makefile to pick all changes to any dependency

SVGHMI: created widget_*.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing.

SVGHMI: moving comments

SVGHMI: added widget_common.ysl2

SVGHMI: More readable debug output gen code

SVGHMI: Cosmetic changes

SVGHMI: added inline_svg.ysl2

SVGHMI: detachable_elements.ysl2 becomes detachable_pages.ysl2, and includes logic to process pages elements. Other minor code moves.

SVGHMI: moved debug code

SVGHMI: created detachable_elements.ysl2

SVGHMI: more debug code moved to hmi_tree.ysl2

SVGHMI : create hmi_tree.ysl2, rename bbox_intersect.ysl2 into geometry.ysl2 and move more code into. Add per included ysl2 file debug output.

SVGHMI: created bbox_intersect.ysl2

SVGHMI: Re-enable dispatch to arrays of functions in case of multiple suscription per widget. Still unused, but disabled for reasons not any more true.

SVGHMI: relative pages and page jumps

SVGHMI: take care of path given in HMI:Page and HMI:Jump, but do not apply subscription offset for now. Intermediate commit in a "working" state.

SVGHMI: significant whitespace changes

SVGHMI: unsignificant changes or changes in generated code

SVGHMI: Stop ignoring HMI_NODE in HMI tree, and count it as a BOOL. Soon we use those nodes as reference for relative page jump, and as an "enable" bit for features associated to an HMI tree fragment.

SVGHMI: cosmetic code moving

SVGHMI: split page switch into switching subscription and switching elements in the DOM, to ensure that subscriptions have been send before changing DOM, and avoid some flicker.

SVGHMI: fix wrong updates of HMI variables on each change, especially when not subscribed.

SVGHMI: whitespaces

SVGHMI: fixed repeated error when Input widget is missing 'value' element

SVGHMI: more decoupling in between UI related and the rest of JS code, still in the aim of enhancing robustness under heavy load.

SVGHMI: use requestAnimationFrame to delegate rendering of updates from network. Should help prevent browser collapse leading to watchdog in case of overload.

SVGHMI: Fix disapearing elements in case of nested detachable elements.

SVGHMI: Meter widget accepts 2 arguments : min and max, taken in account when min or max text element is missing

SVGHMI: More precise error message on missing HMI path. Meter widget now defaults 0-100 range when min and max elements arent's present, without error.

SVGHMI: more whitespace fixes

SVGHMI: unlink clones (i.e. deep copy elements refered by svg:use) inside widget.

Designer can use Inkscape clones to duplicate similar assets accross widget. Those clones are unliked so that elements can be independently transformed by individual widgets.

SVGHMI: whitespaces and comments

SVGHMI: completely fixed indentation of generated widget description. Lets try to keep it as-is until we can use yslt indentation.

SVGHMI: re-indent generated JS

SVGHMI: detach/re-attach elements required by pages on page switch

This is meant to optimize performances with large drawings leading to long restyle or reflow.

SVGHMI: re-indenting

SVGHMI: declares pages detachable requirements as an object, to find more efficiently common requirements

SVGHMI: fix some JS + add generation of detachable elements, to be continued

SVGHMI: now compute discardable elements first so that we can do better grouping of required elements when sumarizing.

SVGHMI : documentation for new geometry intersection computation code + little fixes...

SVGHMI: detachable and discardable elements sets, Reworked geometric intersection, toward more accurate page content detection.

Moved page's widget/element dependency crawling functions so that it is possible to compute a global detachable and discardable elements sets.
Reworked geometric intersection detection logic to distinguish ovelapping and inclusion.
Goal is to include englobing and overlapping graphical elements, but not groups (would then include everything around...). Intermediate commit, to be continued.

SVGHMI : still trying to optimize. Added xslt code to identitfy minimum set of elements needed by a particular page. Plan is to remove unseen/unused elements from the DOM, and re-appending them later when used, on page switch. Disabled previous optimization.

SVGHMI: attempt to optimize for webkit, because of really slow style recompute in svg:use : "unlink clones" (as in inkscape) but stop deep-copy when meeting a widget, and create a new clone instead.

SVGHMI: optimize browser work by hiding (display:none) pages that are not displayed.

SVGHMI: Better and less verbose SVG namespace handling in XSLT transform

SVGHMI: Added mostly untested switch widget

SVGHMI: HMI:Page can now be a svg:g group or a svg:use clone, and included/linked widget are included in page. HMI:Jump was updated to be clickable through svg:use, to be generalized.

SVGHMI: ensure that coordinate in CSV file generated by inkscape are both matching svg default unit and in default reference frame

SVGHMI : still behave, even if important things are missing in SVG widget definitions (ex: needle missing for Meter widget)

SVGHMI : fix watchdog exception when timeout null

SVGHMI: be a bit more tolerant with missing HMI paths or missing elements in widgets : continue build (with warning) and fail silently at runtime.

SVGHMI : fixed bug happening when some SVG ids are containing dashes

SVGHMI : wait for initial timeout after watchdog is triggered, since it generaly induces HMI restart

SVGHMI : watchdog is now taking an initial and interval duration as CTN fields.

SVGHMI : avoid caching of xhtml file by forcing cache-control header in http response.

SVGHMI : HMI_STRING now also supported from HMI to PLC

SVGHMI : cosmetic

SVGHMI non significant fixes

SVGHMI : support for HMI_STRING and HMI_BOOL

plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes

SVGHMI : Added python fomating {port} and {name} to commands so that command can build target URL

SVGHMI : add on Start, Stop and Watchdog command fields to configuration

SVGHMI: added a watchdog. To ensure that the whole chain is checked, watchdog use a periodic echo of a hearteat variable. JS client code systematically register /HEARTBEAT at 1s update freq, and reacts on updates of /HEARTBEAT by systematically incrementing it. C code catch /HEARTBEAT update and feeds python-implemented watchdog. For now, watchdog does nothing when tiggered

Add --on-plc-start --on-plc-stop and --status-change to runtime command line, calling given command respectively on start stop or any event. Command line string is python formated (to eventually include status with {}) before being split (supports quoted strings) and passed to Popen for non-blocking execution.

SVGHMI : had to move the problem of wkaing up python thread from plc thread to platform specific code.
Since Xenomai's cobalt thread are definitely incompatible with normal posix python interpreter binary's thread, we must synchronize them with arcane rt_pipes (the only ones that really work cross domain) as already done in debug and python async eval blocks.

SVGHMI: change collect/send thread looping condition to fix infinite loop in some cases

SVGHMI: re-implemented tree view with classic wxTreeCtl

Non significant changes, whitespaces, etc.

SVGHMI: Added simple HMI Tree View.

SVGHMI: add a class attribute to HMI Tree nodes, set when using HMI_NODE

SVGHMI: HMI_LABEL and HMI_CLASS become HMI_NODE.
- Name of parent POU becomes HMI tree node name,
- Name of HMI_NODE variable becomes class of the node.

Add FatalError() method to ConfigTreeNode.
Extensions can report error addressed to user, without a traceback.

SVGHMI: various fixes to make SVGHMI behave on more versions of twisted and GCC.

SVGHMI - prepare page with cached data when switching. This prevents values that do not change and that was already subscribed in previous page from keeping undefined.

SVGHMI: various insignificant code moves, commenting and typos fixes.

SVGHMI : fancier second page in tests/svghmi

SVGHMI: SVG viewport now defined so that HMI take scales and fit to the view. Implemented page switch through viewport change, no hiding of widget for now.

SVGHMI - added simple Meter widget.

SVGHMI: Quicker update path for input widget when pressing on buttons, do not wait until data comes back, and simply update value text of the pressed widget. Updated PLC prog for more amimated value to display

SVGHMI: fixed HMI->PLC dataflow : not updates as expected, and not initialized properly after subscribe.

Fixed one more sequel of 5f79b194fa63 'SVGHMI: filter out temporary variables created while generating ST code out of FBD.'

SVGHMI: Added relative changes of HMI value from widgets.

SVGHMI - Fixed svghmi.{c,js} about HMI -> PLC data unpack.

SVGHMI: Added init call to all widgets at startup to bind events. More features in Input widget : Edit and Change buttons. WIP HMI->PLC value update, incoherent data detected in C part on update.

SVGHMI: dispatching data to minimalist "Display" text widget.

SVGHMI: Many fixes. Subscriptions to HMItree seems to be working, and dispatch function is called in JS with good data. Bidirectional communication now really working.

SVGHMI : many details about communication implemented in JS, with side effects.

SVGHMI: added a widgets description object, accessed by id. Added frequency to widgets, as separate template to allow future customization. Excluded non svg elements (i.e inkscape Sets) with HMI: labels from widgets.

SVGHMI fix logic for page membership detection

SVGHMI compute default page

SVGHMI: deduce pages content out of geometry (elements contained in page bounding box are in)

SVGHMI: use func:function for parsing labels so that it can be used in predicates

SVGHMI: moved/fixed some templates, avoided namespace problems, added parsing of HMI:* inkscape labels

SVGHMI: now generating JS object describing widgets and pointing to SVG elements

SVGHI: compute hmitree variables ordered index in xslt

SVGHMI: now built.

SVGHMI: Work in progress. C side mostly implemented, neither built nor tested.

SVGHMI: More strict formating of active HMI labels : @ separator only used for paths

SVGHMI: new test svg to drive next implementation

Non significant changes in generated xslt, side effect of changes in yslt_noindent.yml2

Merge default in SVGHMI branch

SVGHMI: Starting to define JS side more in details.

SVGHMI: added transformation of code given in inkscape's description fields into javascript functions

SVGHMI: gui.svg -> svghmi.svg

SVGHMI: moved static JS code to a separate file included at xhtml generation time

SVGHMI: Work In Progress : fixed pointer types in ctypes interface, cleaned up server startup and cleanup code, changed document type to XHTML, cleaner JS script : encapsulated in a function and in CDATA.

PLCobject: Call "stop" and "cleanup" methods from python runtime files in reverse order compared to "init" and "start".

SVGHMI: WIP for python<->C data exchange : message from browser hit the C side.

SVGHMI: WIP for python<->C data exchange

SVGHMI: WIP for python<->C data exchange

SVGHMI: WIP for python<->C data exchange

SVGHMI: single session for now

SVGHMI: few fixes on serving

WIP on svghmi, now builds and runs. HTTP serving + WS transport ready, missing actual data to transmit and thread to collect it.

Non significant changes to mute GCC warnings about unused variables.

Fixed sequel of 5f79b194fa63 'SVGHMI: filter out temporary variables created while generating ST code out of FBD.'. Some ref to temporary variables are still not using the _TMP_ prefix. They are quite hard to find, so to be continued...

SVGHMI: Intermediate state while working on svghmi.c

svghmi.c : deduplicated variable access code borrowed from plc_debug.c. Added targets/var_access.c.

SVGHMI: Added iterators in svghmi.c copy-pasted form plc_debug.c

SVGHMI: svghmi.c now has mutex, iterator, and read/write buffer.

SVGHMI: draft for svghmi.c. It has all PLC variables pointed in HMI tree in an array.

Pass HMITree to SVG transform. It seems it could really help to reduce JS tree binding logic in the end.

Add special nodes at HMI Tree root, fix code to handle special node (no path).

Swap CTN code gen and Libraries code gen, because SVGHMI use both, and need the library part to produce hmitree before CTN part.

yslt_noindent : Avoid YSLT's indent logic to interfere when using linequote.

SVGHMI: make a reasonably basic test

SVGHMI: filter out temporary variables created while generating ST code out of FBD.

SVGHMI: added deduction of HMI tree from list of HMI_* instances.

SVGHMI: added extraction of SVG bounding boxes, obtained from "inkscape -S", and passed to XSLT transform as variable.

Allow using docutil.get_inkscape_path() on Linux also.

SVGHMI: little fixes to make the build go through

SVGHMI: Added XSLT transformation, Makefile to get XSLT from ysl2 (copy of plcopen/Makefile) and a minimal stylesheet to start with.

Moved XSLT model query python code so that XSLT part can be reused for other transformations (i.e. in SVGHMI)

Complete SVGUI test minimal skeleton so that it builds.

intermediate commit, work in progress

Use a POU Library's Generate_C to collect all variables in SVGHMI.

merged

Enable svghmi plugin in features, and small fixes to skeleton.

Merged default in svghmi

Skeleton for svghmi extension

IDE: Allow POU Libraries to inject PLC Configurations globals during build.

WIP: initial setup.

IDE: Fixed variable traces graphs RingBuffers. Removed an apparently useless wxCallAfter in trend graph that was leading to pydeadobject exception on wxGTK when double-clicking.

IDE: Cleaned up some useless tests in variable trace data handling code, changed from bare numpy arrays to RingBuffers inorder to avoid RAM outage and crash after long tracing session.

IDE: Log: Prevent crash when display progress on empty log.

Copy description when DnD variables from CodeFile CTN to POUs

Runtime: Fix exception "Worker is disabled" when connecting while PLC runtime is starting.

Pyro/wamp/UI delegate jobs to Worker, causing race condition if worker isn't already started.
Added a function to ensure that Worker is already created when pyro or UI starts

Finished fixing Wx IDs abuse. There was still some wasted IDs because of wx.NewId calls in many places where it wasn't needed, and those IDs were not re-used. As a consequence Beremiz was making exception crashing after a few hours of intensive use.

Add ThirPartyPath call in util.path module, so that individual extensions don't have to each implement same logic to find dependencies

IDE: Add a shortcut to project "Clean" action : F9

Fixed misuse of GridCellEditor in DurationCellEditor, potentially leading to crash on windows.

Allow using spin() from ProcessLogger even with no logger given.

Runtime: Added PostStart methot to PLCObject, called after PLC is started, with all libraries and python object already created, and python extensions "Start" methods being called.
This is called before python thread processing py_eval blocks starts. Example purpose: attach additional ressource to web services

IDE: Fix logging of external process execution time so that it is visible on windows as well.

IDE: Process Logging : Add annotation in log so that user can see build is still alive and how long external process takes.

IDE: Iec2CSettings: Log wasn't available in case of exception when launching iec2c.

IDE: Log: Cosmetic changes, refactoring

IDE: Make ST code generation more verbose, since it can be really long in case of big programs, and it is better to let the user know build is still in progress.

IDE: Fixed log console that was not updating line by line smoothly when building.

merge

Merge

merge

modbus plugin: add (user accessible) transaction bool flags for servers/slaves; FIX BUG in previous commit affecting RTU slaves.

modbus plugin: add (user accessible) transaction counters for servers/slaves

PLCObject : Ensure that PreStart is executed before starting PLC. Also, make sure that python thread doesn't enter in a start/stop loop when ordered to stop.

Merge

merge

modbus plugin: add/fix comments

merge

Modbus plugin: fix bug - map BOOL flag onto C u8 (was incorrectly mapped onto u16)

Modbus plugin: map status of MB transaction onto 2 located BYTE vars (instead of a singlw WORD var).

Modbus plugin: provide user programs feedback on current connection status mapped onto a WORD located variable

Removed harmful assert in ProcessLogger.

ProcessLogger was having an assert in constructor when missing logger, leading to systematic exception when testing options accepted by compiler. This exception was silenced in ProjectController, and then MatIEC was always called without options.

Fix missing import, consequence of bad resolution of conflicting hg graft of f0a822ef9fa0 into d15a997859b1

plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes

Prevent global python_poll blocks to be created when accidentally adding content to C-File OnChange column.

DEBUG: (IDE side) fixed wrong implementation of anti-rapid-fire leading to systematic delay in subscribing

XSLTransform.py: added get_error_log()

Attempt to workaround problem reported about empty plc.xml after unrelated crash. Now, if etree model is corrupted in a way tostring() would generate an empty string, exception prevents saving.

docsvg.py : Better error message when inkscape is not installed.

Fix unmatched "Courier" font for monospace fonts on latest ubuntu 20.04. Selected "FreeMono" instead, present since at least 18.04

Python Runtime: order of execution of extension's init() and cleanup() now reflects order of appearance of extensions in configuration tree.

Runtime: change PLCObject 'BlobAsFile' method to allow customization by overriding

WebInterface: better wording for wiping PLC content: "Repair"

runtime: added restart/reset button in web settings. Accidentaly fixed web settings logging feature.

Add a little test to see OnChange's .count .first .last in action

Fixed "Onchange" object added in previous commit

Python Safe Globals now have more reliable triggering of OnChange call. Added "Onchange" object to accessible runtime variables that let user python code see count of changes and first and last values.

Project tree: avoid flickering and glitches in notebook when selecting some still not opened ConfigTreeNode

Project tree: Clicking on ConfigTreeNode should have same behaviour as for POUS and other IEC types : simple click to select and double click to open.

py_ext: better handling of coma separated OnChange attribute for python safe global variables.

Allow customization of generated py_ext OnChange calls, by adding a static method to PythonFileCTNMixin that can the be later hot patched.

PY_EXT: OnChange is now a coma separated list of callables. Updated tests/python accordingly.

Modbus: fixed typo in ctype typing.

MODBUS: Fix saving of websettings.

Runtime/PLCObject : move call to PreStartPLC right after call to the "start" method of all python extensions, and then just before the start of the python loop executing python_* blocks.

Modbus plugin: reformat code, and add comment.

Modbus plugin: fix runtime periodic timer (don't use POSIX timer)

Modbus and Bacnet websettings : Rename variables and functions to avoid name collisions.

Websettings for modbus and bacnet are now passed to runtime as python files loaded (execfile) at init of PLCObject with the same globals.
Because if this, same names used in previously different modules now colide.

Modbus: fix strange side effect of re-use of condition variables or mutex with Xenomai : without bzero of the associated types, mutex keeps locked.

Modbus: fix client timer invalid arguments.

Modbus add a timer thread, and switch timer to SIGEV_THREAD_ID to follow xenomai posix skin restrictions.

Runtime: Fix typo in PLCObject leading to exception when reporting failure.

Py_ext: use non-derived type when generating C code for handling Python PLC globals.

tests/python : add some STRING PLC Python globals with OnChange.

Runtime: STRING type for Python PLC Globals was making problem with strings, since generated code wasn't doing comparison properly.

Merge

Modbus: more comments to remember some necessary changes.

Modbus/BACnet : add some comments so that we don't forget some pending optimization.

Modbus: Delete stored configuration when identical to default configuration.

BACnet: prevent saving configuration that is same as default, delete it if so.

BACnet and Modbus : fix configuration storage directory

Runtime extrension web settings: distinguish display string and token when calling NS.newExtensionSetting, thus allowing meaningful name to be displayed instead of an id.

Debug : when BEREMIZ_DEBUG file exist, display all commands issued in console.

BACnet and Modbus : Simpler configuration management. NevowServer.py now allows each extension to create and delete multiple configuration forms in the setting page, deprecating delSettings and addAfter.

BACnet and Modbus: Remove additional loading and unloading, use the one already in place for extensions.

merge

Bacnet plugin web configuration: strip leading and trailing spaces for net. interface and port numb.

Modbus plugin, web interface: strip leading and trailing spaces from string parameters

Modbus plugin web interface: show the keyword "#ANY#" on TCP servers

Modbus plugin: fix bug: was checking user configuration against wrong limits

Modbus plugin: fix algorithm detecting Modbus TCP servers using the same IP port on the same network interface

Modbus plugin: check for duplicate "Configuration_Name"

add comment

add comment

merge

Modbus plugin web configuration: fix comments, and delete un-used code

Modbus plugin web configuration: use drop down choices for baud, parity and stop bits.

Modbus plugin web configuration: save node type and addr type to persistant storage

Add web extension: configure Modbus Server plugin parameters

Add web extension: configure Modbus plugin parameters (currently only supports Modbus clients)

Runtime: create .md5 file at the end of all transfered files being written to disk, so that it presence indicates completeness of transfer.

IDE: Main toolbar : Show repair button also in stop mode. Move repair button after disconnect button.

Runtime: fsync() files when transfering them, to prebent data loss when poweroff soon after programming. Fixed variable naming as a side effect.

merge

BACnet plugin: Add web interface for online parameter configuration

modbus_plugin: generate nicer error message, instead of a traceback

Modbus plugin: Add "exec. req. flag" and "write on change" features

PLCObject : reorganize code in StartPLC(), add a PreStartPLC() empty method, to be overloaded by runtime extensions.

Solve import order problem when POULibrary imports ConfigTreeNode because of UserAddressedException. Now UserAddressedException is declared in POULibrary.py, as a quick and dirty fix, but some independant module should be created for beremiz exceptions in general.

Add --on-plc-start --on-plc-stop and --status-change to runtime command line, calling given command respectively on start stop or any event. Command line string is python formated (to eventually include status with {}) before being split (supports quoted strings) and passed to Popen for non-blocking execution.

Etherlab : Merged 2014-2018 changes from jblee and others

Close branch ethercat_from_kosmos

EtherCat master plugin : commit changes recovered from KOSMOS 2018 installer, unkown author(s).

Add FatalError() method to ConfigTreeNode.
Extensions can report error addressed to user, without a traceback.

Fixed one more sequel of marking temporary variables created while generating ST code out of FBD

Changed yslt_noindent.yml2 again

Non significant changes in generated xslt, side effect of changes in yslt_noindent.yml2

More customizations to yslt

PLCobject: Call "stop" and "cleanup" methods from python runtime files in reverse order compared to "init" and "start".

Non significant changes to mute GCC warnings about unused variables.

Fixed sequel of earlier commit in PLCGenerator.py. Some ref to temporary variables are still not using the _TMP_ prefix. They are quite hard to find, so to be continued...

variable access code moved from plc_debug.c to targets/var_access.c for easiewr re-use in ext.

Swap CTN code gen and Libraries code generation order. In general library part of an extension needs to be computed before CTN part.

yslt_noindent : Avoid YSLT's indent logic to interfere when using linequote.

Add marker to temporary variables created while generating ST code out of FBD, so that they can be recognized as such.

Allow using docutil.get_inkscape_path() on Linux also.

Moved XSLT model query python code so that XSLT part can be reused for other transformations

Fixed unitialized parameter in instances_path stylesheet, leading to
calls to add_instance with no data when passing datatypes insteatd of project
root. That bug was making exceptions (for exemple when editing type) when
having arrays of derivated types in project.

Fixed code quality according to pep8 and pylint.

Fix exception on exit in some case, sequel of an earlier cleanup commit I couldn't find back. Disconnecting the event is apparently the way to go. https://wiki.wxpython.org/Surviving%20with%20wxEVT%20KILL%20FOCUS%20under%20Microsoft%20Windows

PurgeBlobs was faulty, but it was never having anything to purge. Fixed.

Fixed repetitive freezing of IDE when connection drops.
when connection lost error was beeing displayed, the involved wxYield
was calling pending plc status periodic update, itself trying to use connector.
At that time connector is still not destroyed and connection
is attempted again when calling GetPLCStatus.
=> Hack : Ensure connector is destroyed before reporting error.

Better error handling when blob transfer fail

Removed dead code.

Now expects 1 more columns in VARIABLE.CSV file generated by MatIEC. Pair with MatIEC commit 9cb7c8bf7dbc :
Add a column to VARIABLES.CSV, containing variable (derived) type name, additionally to current last column contyaining base type name

Merged workaround for loading bug happening after automatic resize of function blocks. It appears that some code in GraphicCommons.py loop endlessly when wires coordinate do not align with x or y axis. Those erroneous coordinate are now filtered out when loaded in the view.

Removed debug code and closed branch

GraphicCommons.py : Wire.SetPoints() move filtering before computation of Start and End points to avoid setting them with arbitrary directions.

GraphicCommons.py : rewrote Wire.Setpoints.
- trying to make it fix diagonal wires,
- wasn't clear what was intended before, so made it clear :
- duplicate point removal
- segment merging (only if asked)
- remove corners made of opposite direction segments

'Change POU Type To' becomes 'Duplicate as...', avoiding side effects of type change when POU is already instanciated. Also remove leftover returType tag in ex-function POUs, triggering exceptions at build time.

Fix PLCObject's purge failing silently with extra_files.

LogMessage shouldn't be serialized (can lead to blocking in case of exception in main thread), and do not require it.

Fixed typo leading to some exception in some rare corner cases in worker.py

Added missing 'path' field to WAMP addresses in URI editor.

Fixed exception when using URI editor for PYRO addresses

Avoid loading PLC at startup when autostart is not set in command line. As a side effect PLC status is artificially set to Stopped, and StartPLC eventually loads PLC if it is not already loaded.

Add Repair() to WAMP interface

Merged fix_PLC_runtime_shutdown

Close fix_PLC_runtime_shutdown

Runtime worker : unblock the last waiting job and prevent any new job to wait when Main Worker is being shut down.

Add some "pipe to self" trick in Pyro server to accelerate runtime shutdown instead of waiting for arbitrary pyro timeout.

If call to GetPLCstatus can't be executed in PLC, then obtained status is disconnected. Status on "None" is not relevant anymore, and is replaced by Disconnected.

Enure that all threads are joined before trying to exit

Named runtime's threads to ease debugging

Added Repair() png icon

pep8 again...
./connectors/PYRO/PSK_Adapter.py:49:1: E302 expected 2 blank lines, found 1
./connectors/PYRO/PSK_Adapter.py:57:5: E303 too many blank lines (2)

PEP8 fix : ./connectors/PYRO/PSK_Adapter.py:49:1: E302 expected 2 blank lines, found 1

Added RepairPLC() to PLCObject. For now just calling PurgePLC and quit PLC runtime.

Ensure Beremiz_service.py quits properly when Main Worker stops and wa are using Wx and/or Twisted.

Added PurgePLC() method to PLCObject, to be invoked when PLC Status is broken. It clears PLC shared object an extra files and force status to Empty. Added correponding Repair button to toolbar, visible only when PLC status is broken.

Background erase of debug variable panel was disabled for some reason, and it not anymore compatible with EVT_PAINT based refresh. It was leaving traces behind when removing traced variable. Fixed.

force redraw only through EVT_PAINT event and use wxPaintDC, as described in wx documentation

Fixed refresh problem following 9c5f835b031e, 9622418ac28c, c67488bd8134 : force redraw only through EVT_PAINT event and use wxPaintDC, as described in wx documentation

merged

Nicer name than 'var_name' for variable auto-renaming in Modbus

Allow starting IDE without sslpsk module installed. Fail when connecting to PYROS if sslpsk unavailable.

Fixed preview drawing/refresh problem in sfc/ld/fbd graphical element creation dialogs on windows (introduced in 9c5f835b031e, continuation of 9622418ac28c)

pep8 white spaces

Now default_evaluator is provided by runtime package

merge

Continue fixing deadlock of previous commit, this time occuring when waiting for 'cleanup' python runtime call to finish. Now 'init' and 'cleanup' python runtime calls are called directly from main thread, and aren't anymore invoked in the context of wxMainloop and/or twisted reactor.

Fix deadlock when indirectly calling PLCObject's evaluator() from twisted of wx event loops. Was freezing while transfer/start/stop through Wamp. Serialize all PLCObject's call to self.PythonRuntimeCall into the same PythonThread thread.

Fixed Wamp assertion because of unexpected type

Enhanced statistics display code, used it and saw no more noticable leak while editing. Closing branch.

Conform to pep8 and pylint :

pep8 version: 2.3.1
./ConfigTreeNode.py:130:49: E231 missing whitespace after ','
./editors/Viewer.py:643:24: E128 continuation line under-indented for visual indent
./editors/Viewer.py:670:12: E221 multiple spaces before operator
./editors/Viewer.py:671:13: E221 multiple spaces before operator
./editors/Viewer.py:2138:52: E203 whitespace before ':'
./editors/Viewer.py:2139:66: W291 trailing whitespace
./controls/VariablePanel.py:154:25: E231 missing whitespace after ','
./controls/LocationCellEditor.py:88:1: W293 blank line contains whitespace
./controls/LocationCellEditor.py:191:25: E221 multiple spaces before operator
./controls/LocationCellEditor.py:200:17: E128 continuation line under-indented for visual indent

pylint 1.8.3,
************* Module controls.LocationCellEditor
controls/LocationCellEditor.py:200: [C0330(bad-continuation), ] Wrong continued indentation (add 9 spaces).
_("Selected location is identical to previous one"))
^ |
************* Module controls.VariablePanel
controls/VariablePanel.py:154: [E1601(print-statement), VariableTable.SetValue] print statement used
************* Module editors.Viewer
editors/Viewer.py:643: [C0330(bad-continuation), ] Wrong continued indentation (add 1 space).
self.GetAddMenuCallBack(self.AddNewComment))
^|
editors/Viewer.py:598: [W0612(unused-variable), Viewer.AddDivergenceMenuItems] Unused variable 'add_branch'
editors/Viewer.py:1655: [E0602(undefined-variable), Viewer.PopupConnectionMenu] Undefined variable 'variable_type'
editors/Viewer.py:1649: [W0612(unused-variable), Viewer.PopupConnectionMenu] Unused variable 'connection_type'
************* Module connectors.PYRO.PSK_Adapter

Merged

Fix typo in README.md

Closes #80

merged rename_on_location_change branch

Rename checkbox and immediately apply.
Added a checkbox in Location selection dialog (saved as user settings) to let user choose if variable is being renamed.
Also forced closing celle editor once new location is selected.

LocationCellEditor use better source for variable name replacement, and validate variable name before applying it or complains otherwise.

LocationCellEditor now systematically change variable name according to name given by CTN, calls VariablePanel' OnVariableNameChange to update POU accordingly.

Fix problem introduced in 9c5f835b031e : Exception in LDPowerRailDialog.py because of change in OnPaint/RefreshView/DrawPreview.

Fixed RecentProjectMenu in BeremizIDE.py broken by untested changes in wx.NewID_abuse_fix.

Merged wx.NewID_abuse_fix branch

More wx.NewID abuse removal. This time BeremizIDE.py was cleaned.

Merged more of wx.NewID_abuse_fix branch

More wx.NewID abuse removal. All Viewer.py got cured.

More wx.NewID abuse removal. This one was apparently silently unbinding toolbar butons when running out of mew wx IDs.

Dyslectic typos

Close branch py3-fix.

Close branch 1.1 Korean release.

Close branch generate-button.

close #2486 head

Close branch nevow_service_rework.

Close branch wx3-fix.

Intermediate merge of wx.NewID_abuse_fix branch but kept debug code in the branch. This is still work in progress, banch is NOT closed.

Continued wx.NewID abuse removal in Viewer.py : Added AppendItem to use instead of AppendMenu, made examples with AddBlockPinMenuItems and AddAlignmentMenuItems

Continued wx.NewID abuse removal in Viewer.py : get rid of one call to AppendMenu method, having no real purpose apparently. To be continued.

Start fixing wx.NewId abuse in viewer.py. This shows how to avoid using AppendMenu() function, definitely useless.

VariablePanel's menu do not waste Wx IDs anymore (directly binds wx objects rather than crating new ID wit wx.NewId)

Instrument IDE code to find code abusing wx.NewId.

Fix error when searching accross project. Collection of result wasn't initialized and was failing in case some CTN was returning no result.

Make spaghetti-code-quality great again.

Merged

Add Docker files to build containers to run automated tests

merge

check_source.sh: fix sed error: -e expression #1, char 25: Invalid range end

Warning happen only if old sed (4.4) is used.

Fix pylint warning [C0325(superfluous-parens), ] Unnecessary parens after u'if' keyword

************* Module runtime.PLCObject
runtime/PLCObject.py:609: [C0325(superfluous-parens), ] Unnecessary parens after u'if' keyword

Update Beremiz dependencies because of added PYROS:// support