merge

Xenomai runtime: report and mitigate when PLC cycle overruns.

Side effect :
_Log* macro was changed in plc_Xenomai_main.c,
and fixed in plc_Linux_main.c

SVGHMI: Do not generate Popen call when comamn is empty.

Fix python path in readme.

Python runtime: ensure that python thread finished before returning from StopPLC.

C runtime: initial fixes. Now runs and traces first_steps example.

beremiz_runtime -v -t tcp -p 61131 -h localhost

IDE: fix eRPC exception handling

All Runtimes: Now sizeof(tick)=4 on all platforms (unsigned int).

eRPC: update erpc version, add readme

C++ runtime: WIP. Continue PLCObject implementation.

Tests: fix wx_widgets.pytest/test_CustomIntCtrl.py

Merge commit 'e2df70b60b84031d3ccd3ae799a4e3aa8112f3ff' into python3

Doc: Add about section (PR #33)

* added about section

* updated .gitignore to exclude doc/_build/

ERPC: fix SetTraceVariablesList interface

This fix debug not suspending when having no variables, and other debug error being not reported.

C++ runtime: WIP: untested PLCObject implementation. Still missing tracing.

Update revisions used in tests running on GitHub.

merge

C++ runtime: add eRPC server, minimal CLI and Makefile. WIP.

More documentation. Work in progress.

IDE: Fix crashing non-thread safe code using Zeroconf

BACnet: Fixed grid cell choice editor. Consequence of wxPython4.

SVGHMI: fix font embedding with py3

IDE: Fix Variable grid ignoring edits. WxPython4 consequence.

IDE: Remove all occurrences of deprecated wx.grid.PyGrid

Merge commit '80e123b34e488ffea851dc2168b366ba6124c09b' into python3

Doc: start converting Standard Library documentation from old MC8 manual.

merge

Modbus: fix test: add missing filles and add Modbus source+build in GH CI

Modbus: add CI test + test project

Doc: re-organize existing, sketch outline, add SVGHMI intro.

Examples: add svghmi_json_table

SVGHMI: add "DISCARD:" prefix to force discarding an SVG element

SVG: fix HMI:Assign widget to properly handle single-letter variable names.

SVGHMI: Fix wrong documentation copy-pasted in HMI:Page.

SVGHMI: add FlatButton with no active or inactive elements.

SVGHMI: i18n: minimize warnings for incomplete/fuzzy/outdated translations

SVGHMI: i18n: fix .POT generation + other cosmetic fixes.

merge

Removed forgotten debug print.

SVGHMI: fix py3 consequences on i18n

merge

SVGHMI: Fix thumbnail generation.

Tests: update svghmi test project to py3 and erpc

IDE: Fix local runtime not starting on windows.
Consequence of updating ProcessLogger's argument handling.

Add credits for Czech i18n

Shows AboutDialog even if revisions.tx is missing

IDE: Fix encrypted ERPC: newer TLS, better error handling, re-add explicit ERPCS scheme, use sslpsk better.

merge

IDE: display contents of revisions.txt (put there by installer builder script) in About Dialog.

eRPC Server: fix exception at disconnect and reconnecting

Merge pull request #31 from martinpihrt/python3

Czech translation from Martin Pihrt

Create Beremiz_cs_CZ.po

Create Beremiz.mo

Fix SVGHMI build exception on windows: return bytes for inkscape path in docsvg.

SVGHMI: fix consequence of last change in ProcessLogger

Update requirements.txt

Remove forgotten debug prints

merge

Updates requirements.txt about forks of Nevow and sslpsk

Fix deprecated WX call producing warning.

Fix exception on right click, showing context menu.

GCC toolchain: Add {SYSROOT} substitution with support for whitespaces

Any instance of {SYROOT} string in config's CFLAGS and LDFLAGS is replaced by sysroot path obtained from "gcc -print-sysroot"

Fix argument lexer in ProcessLogger, replace it with shlex standard python module.

SVGHMI: Fix warning with WxPython > 4.x

docsvg: safer version checking of Inkscape

IDE. update genicons.sh to inkscape 1.1 command line

IDE: adjust Build and Clean icons colors.

Fix variable forcing. Now works with eRPC. PLCObject API changed.

Fix strings displaying as repr(bytes) in debug view.

Fix variable tracing in new eRPC interface.

Replace PYRO with ERPC. Work In Progress.

Fix blind replace ('text' into 'str') from py3 port

Fix settings URL: now '/' instead of '/settings'

Merge

SVGHMI: Fixes UI lifecycle problems

Was sometime showing HMI tree of previously closed project : no more module globals to store hmi tree.
C++ dead object exceptions happened when re-opening SVGHMI UI or building after close of UI.

IDE: Libraries in OrderedDict for access by name

SVGHMI: fix exception when stopping

SVGHMI: fix JS error loading empty single page

svg:svg tag should not be considered as a detachable group,
so filter only svg:g elements

IDE: fix exception showing network discovery

SVGHMI: Fix creation of SVG file if none provided

IDE: Auto-select required libraries when adding extension

IDE: Disable not-yet-working extensions

Fix typo in README.md

IDE: py3.10 related float/int fixes in debug plots

Move tests/project/modbus in exemples.

Python3 fixes for Modbus Web Settings

Fix template conflict in XSLT with lxml>=4.9.0 again

Earlier attempt was fixing conflict with -1.0 priority attribute,
as a side effect of such low priority, SFC Actions were not
editable anymore.

This time move template around instead of using explicit priority.

Revert "IDE: fix exception when adding Action"

This reverts commit 94e42cda0a8e093aac4830b5c40656c240ec8cf9.

IDE: fix exception when adding Action

IDE: Fix status bar update when conection lost

SVGHMI: Fix watchdog exception on windows

Typo

Upgrade wxPython to 4.2.1, drop 4.2.0 workaroud

Runtime: add GetVersions() call to PLCObject, use it in web settings and expose it in WAMP and Pyro.

Note: WAMP changes are untested

Runtime: Add stderr support to local posix spawn based subprocess replacement

Modbus: More verbose error message in case of thread creation problem

Runtime web settings: fix punctuation and update CSS again

Update default CSS for Runtime WebSettings.

Runtime WebSetings for extensions are now served on individual URLs to prevent cluttering.

Runtime web settings: allow customization of version string by extensions

Merge

Tests: more OCR tuning

Tests: better font for OCR in svghmi_basic

Runtime: fix non-interleaved worker loop

Win32 rutime: fix PLC Stop freezing

Fix untested code in worker.py...

Addapt to Py3.11.5 in Stunnel.py
b2a_hqx is now deprecated, base64 should bring comparable results

IDE: connect local runtime with '127.0.0.1' instead of 'localhost'
Workaround localhost possibly resolving as ::1. leading to problems.

Runtime/MainWorker: fix blocking race condition

syntax error

Update version.py

Runtime/win32: no sys.stdout with pythonw.exe

Tests: revert Teseract to less perforant legacy mode, but more repeatable. Compensate with zoom in edit_project and filter noise out of OCR text.

Tests: align on requirements.txt

Tests: Add minimal SVGHMI test

Tests: use SID+KILL for sikuli subprocesses

Strip now useless file.

SVGHMI: add support of all IEC61131 interger types.

- add HMI_*INT types
- fix sprintf.js with big int (64b)
- extend svghmi_real test project

Add testing status badge

Use requirements.txt and update doc accordingly.

Tests: pytests: only one wxpython app per process lifetime... Strip test_application.py

IDE: fix py3/wxpy4 related deprecation warnings

Runtime: remove now useless typechecking/convertion

Github CI: do not save docker image if just restored from cache

Runtime: fix unpacking of variable trace data

Github CI: update matiec revision

Github CI: update open62541 version, try avoid useles doker image rebuild

Update run_tests_in_docker.yml

Update .gitignore

SVGHMI Py3 related fix in test project.

Tests: have to terminate language test with KILL, side effect of BEREMIZ_TEST_CYCLES

Runtime: py3 fix forcing of STRING

Tests: fix systematically rebuilding matiec

Runtime: spawn_subprocess: handle non-bytes args

OPC-UA client : python3 + AsyncUA fixes

update .gitignore

Py3 related fixes for SVGHMI UI.

Fix Py3 problems with basic SVGHMI build and run.

Py3 usual encoding, ints and exceptions fixes.

Tests: Fix dockerfile for python3

Examples: use print() function in "python" example

Runtime: Fix IEC/ctypes/python3 type mapping

CLI: simpler status polling, fixing pyro5 thread

Fix bytes/string confusion with Logging

Fix wrong default target being picked in CLI build

Fake_wx objects now support comparison and hashing

Use msgpack and remove serpent's bytes workaround

Updaye .gitignore

IDE: Fix py_ext build with python3.10

Pyro5: fix runtime typo + IDE exception handling

Runtime: Fix web settings file upload.

Runtime: drop Athena. Nevow now only for settings.

Fix template conflict in XSLT with lxml>=4.9.0. Thanks to GP Orcullo !

Update generated XSLT headers (updated YSLT defs)

WIP python3 support for runtime

Better LDFLAGS and CFLAGS for win32 an MACOS

Fix private n matplotib function import

Update version.py

update .gitignore

IDE: more fixes for wxPython 4.0.7 and pyhon 3.10

IDE: python-3.10: wxPython calls don't accept float anymore, continued

IDE: fixed/remove checks wxPython versions

IDE: python-3.10: wxPython calls don't accept float anymore when int is expected

Fixes for wxPython-4.0.7 (ubuntu22) compatible with wxPython-4.1.x

fake_wx: handle missing classname

fix wxPyDeprecationWarnings

show underscore as space

CLIController: use absolute project path

allow passing environment variables to ProcessLogger

Generate warning instead of Exception if CTNMaxCount is exceeded for a confnode

fix name clash

fix str encoding issue

OSX: use wall time instead of system clock

replaced depreciated functions

fix platform identification when running CLI under Win32

silence compile warnings

Preliminary OSX support

pythonw is used on OSX

switched to Pyro5

TODO: add ssl support, WAMP

Add PLC stop command

wx: replaced deprecated class

wx fixes

str encoding fixes

ctypes fixes

fixed missing import

set executionOrderId default value to 0

replaced depreciated function

cmp is not used for sorting

upgrade fake_wx

Update to wx.NewIdRef()

fix for gc errors on shutdown

wx fixes for controls

Fix: wx._core.wxAssertionError: C++ assertion "CanBeToggled()" failed

fix - TypeError: unhashable type: 'Colour'

xmlclass.py: fix AttributeError

AbsDir fix

convert sort and cmp functions to Python3

switch to pickle from cPickle

fix dynamic module loading

fix ctypes encoding

fix string encoding

updated click api

remove six.reraise

removed Python2 modules

fixed plcopen imports

automated conversion using 2to3-3.9 tool

cmd used: 2to3-3.9 -w <file>

Tests: Add preliminary IEC-61131 language test, to be continued.

Test sets BEREMIZ_TEST_CYCLES in order to speed-up TON duration test.

Tests: Add time emulation feature for tests with BEREMIZ_TEST_CYCLES CFLAG.

Adding BEREMIZ_TEST_CYCLES=1000 in a project's CFLAGS will:
- run 1000 cycles with no pause
- emulate time flowing normaly for PLC code
- exit PLC thread

This allows:
- testing standard library blocks that deal with time without having to wait
- unit testing and code coverage with POUs that uses time

IDE: fix exception when re-opening previously closed tab

Same as commit with same message, this time for tabs that are not POUs editors.

IDE: fix again ruberband with gtk3.

DC logical functions are now disabled when using GTK3.
Apparently using XOR was still having an effect.
Use regular black pen with no logical funciton instead.

Merged from default

merged

Modbus web configuration: add check for valid delay and period parameters

IDE: Fix missing highlighted element in diagrams when using GTK3

- wx's logical function does not work on gtk3, and highlighting relies on it
- skipping logical funciion at all "works" but this now makes highlight opaque
- no easy fix for highlight transparency since emulated with AND Wx logical function
+ added other highlight related cosmetic fix.

Merged default in wxPython4 branch

Linux runtime: overrun detection for real-time timers and for plc execution.

If real-time timer wakes-up PLC thread too late (10% over period), then
warning is logged.

If PLC code (IO retreive, execution, IO publish) takes longer than requested
PLC execution cycle, then warning is logged, and CPU hoogging is mitigated
by delaying next PLC execution a few cylces more until having at least
1ms minimal idle time.

Fix typo in toolchain_gcc.py : LDLAGS -> LDFLAGS

Merged from default

Merge.

SVGHMI: add two more simple widgets to default widget library

Cosmetic fix in plc_debug.c template

Merge.

Modbus plugin: add optional delay between two consecutive modbus requests sent by master/client

Runtime: Add RealTime checkbox in Linux target options to enable PREEMPT_RT scheduling.

Runtime: move LC_NUMERIC locale setting to Beremiz_service.py.

Test: Customize Fluxbox launch to get rid of toolbar in IDE tests.

Tests: Use TESSERACT_LSTM_COMBINED, LSTM + Legacy OCR mode in Sikuli, more stable results.

Merged default in wxPython4 branch

Runtime: Fix bugs in Linux target.

- next occurence absolute time computation failing on 32-bit because of casting
- PLC thread was started before period was set, potentially passing uninitialized timespec to clock_nanosleep()

runtime: Change Linux target to use clock_nanosleep instead of timer (better rt-preempt perf).

Linux runtime: fix thread waiting on wait_RT_to_nRT_signal not being waken-up when delete_RT_to_nRT_signal is invoked.

Tests: docker image needs tesseract4, but opencv lib since sikuli.jar already contains it.

More explicit default value for generic makefile target command. Assume Makfile is located in project_files

IDE: prevent IDE/CLI process surviving to sys.exit() by using deamon threads to monitor external processes output streams.

Tests: allow overriding local host's hostname with BEREIS_LOCAL_HOST env variable.

Tests: IDE: explicitely wait for build success rather than just stdout to become silent.

Tests: Fixed wrong path (relative to $HOME) in CLI tests.

Tests: OPCUA tests can now use OPCUA_DEFAULT_HOST environment variable to force host to something else than "127.0.0.1" or "localhost"

IDE: fix segfault when unselecting network discovery in URI editor

IDE: fix exception when showing project's context menu in case of empty clipboard (wxpython4).

Tests: Fix dockerfile not finding locales.

cosmetic fix

Tests: use expedited termination of IDE with SIGTERM instead of normal close

Work around test not finishing when IDE ask for confirmation on exit when
project is modified.

IDE: When receiving SIGTERM signal, kill runtime befor bailing out without saving.

Purpose is to allow expedited test termination.

Merged default in wxPython4 branch

tests: IDE: own text matching logic for OCR reliability, enhanced ihtml report

SVGHMI: update generated XSLT files

examples: add "csv_read" project to demo CSV access from PLC

py_ext: add CSV file reading POUs in python extension library

SVGHMI: fix input widget sometime messing with font style

Merged default in wxPython4 branch

ST code generator: when including PLCopen TC6 XML libraries (for example py_ext/pous.xml or NativeLib.xml), also includes libraries globals in result

Runtime: add arbitrary file upload to working dir in web interface

SVGHMI: fix double-dispatch happening when using low widget update frequency on variable already being updated with high frequency by other widgets.

Merge

Backed out changeset ddadbdf20e70, no effect on current problem.

GH CI: try reverting to previous version of ubuntu

IDE tests: ensure that file browser idled before entering path in new_project

tests/tools: move comment and remove dead code in Dockerfile

tests: add tesseract training data "tessdata", still trying to enhance OCR reliability in UI tests

tests: attemps to make OCR based hits more stable

Tests: fix path logic in Docker creation script, consequence of previous commit.

Tests: cleanup and tidy docker definitions and scripts

Merged changes from default in wxPython4 branch

SVGHMI: fix XY graph init (consequence of earlier change) + reindent

Earlier change did modify the variables attributes (options) are stored in widget objects. XY graph uses variables' min and max to determine range.

SVGHMI: move declaration of "xmlns" javascript const so that widgets can use it.

This was broken in earlier commit, when changing initial execution order because of implementing websocket reconnect.

SVGHMI: add Page assignment use case in svghmi test project.

Marged default in wxPython4

SVGHMI: update generated xslt

SVGHMI: avoid Widget's member name colision in between enable expressions and assignments.

SVGHMI: Add arbitrary variable assignment when entering Pages

Usage similar to Assign widget.
Required instanciating PageWidgets for each page, so that assigned variables can be subsribed.

SVGHMI: update generated XSLT

SVGHMI: fix periodic reconnect triggering watchdog

IDE: Optimization of modification events processing in text editors.

Too many modifications types where registered, and then too many events were fired.
Also, in case of uninterrupted sequence of events, updates to the model is deferred to the end of that sequence (wx.Callafter).

SVGHMI: cosmetic change

SVGHMI: do not try to reconnect websocket if closed properly by server.

Tests: force bigger fonts and flat theme in GTK to make OCR more reliable.

OPC-UA: tolerate better pre-encryption formated client configuration file.

OPC-UA: only support the encryption policy selected in config.

By default open62541 client accepts all supported policies, but in makes problem
when negociating with some servers while most clients seems to only support
one policy at a time.

Tests: add encrypted OPCUA browsing test.

Tests: IDE: add stdout monitoring capabilities to auxiliary process

OPC-UA: Update CTN "ChangesToSave" status when variable selection change.

- fixes changes not being saved when no other changes happening to configuration
- added CTNMarkModified to ConfigTreeNode in order to generalize

Tests: Add project for OPC-UA server browsing and variable picking UI test

Tests: Add OPC-UA server browsing and veriable picking UI test.

Tests: Add 'dragNdrop' for UI tests with slower begining than sikuli's dragDrop

Tests: UI tests now avoid polling stdout if process didn't start.

Tests: UI tests can now load projects from tests/projects

Tests: add command for UI tests to launch and close Auxiliary Process

OPC-UA: better handling and reporting of server browser's connection errors.

OPC-UA: Extend Drag'N'Drop target to whole input or output panel not only grid.

Merge default in wxPython4

SVGHMI: fix HMI freeze at load when no screen saver is defined

SVGHMI: update generated XSLT

SVGHMI: watchdog now calls OnStart and OnStop commands just after calling OnWatchdog. Therefore, OnWatchdog command should not restart browser by itself.

SVGHMI: server systematically resets session on connect, rather than waiting for client to ask for it

IDE: Fix DropTarget() methods that must return a bool with wxPython4.

IDE: Fix visibility of text in Debug panel when using dark theme.

IDE: Fix use of deprecated wx.NamedColour

Merged changes from default in wxPython4 branch

SVGHMI: update generated XSLT

SVGHMI: use messy test/projects/svghmi to give a try to ScreenSaver feature.

SVGHMI: cosmetic fix in Back widget

SVGHMI: add ScreenSaver feature. Automatically jumps to a page named "ScreenSaver" after timeout defined in page arguments.

Backed out changeset c6068b674b30

SVGHMI: update generated XSLT

SVGHMI: enable periodical reconnect when browser is QtWebengine, working around memory leak with websocket on Qt's embedded Chromium.

IDE: Added filtering in POU instance variables panel.

SVGHMI: add automatic reconnection of websocket with 1s reconnection delay after first attempt.

SVGHMI: prevent browser and watchdog commands to become zombie once finished.

SVGHMI: svghmi_references exemple: add missing PLC part to demonstrate assigning PLC/HMI variables when validating a modal dialog.

SVGHMI: cosmetic fixes

runtime: remove forgotten printf at starup when retain memory is restored.

OPC-UA client: add ApplicationUri parameter in case it differs from server's URI

Runtime: fix PLC not terminating when being Repaired (i.e purged).

IDE: fix exception when re-opening previously closed tab

IDE: fix SFC Action editor's text not visible on GTK3's dark themes.

IDE: fix action block editor's GridCellEditor. Consequence of wxPython4 bump.

Update README.md

removed undue blank lines

Update README.md

use back quote instead of simple quote for quoted strings.

IDE: fix exception when removing a file in Project Files manager.

Update README.md

Tests: fix OPC-UA test when run from repo.

project_files directory isn't commited because empty,
test fails if project_files is missing.

OPC-UA: better logging in case of failure at init

Tests: version bump open62541 v1.3.2 -> v1.3.3 for github CI workflow.

Tests: add opc-ua encrypted test

Merged changes from default

SVGHMI: update generated XSLT

SVGHMI: Update svghmi_references example to demonstrate use of Assign widget.

SVGHMI: Add Assign widget, doing multiple assignments on click.

SVGHMI: add visible feedback to Jump widget when clicked/touched

SVGHMI: add support for "reference" and "frame" rectangles to spread-out ovelapping elements.

When HMI become complicated, designer needs to spread-out ovelapping elements
in order to unclutter drawing and facilitate maintenance.

SVGHMI: remove intermediate "updates" Map and apply_updates()

It was used initially to decouple DOM updates from reception of data through
websocket, but now since all widget SHOULD use animate() to modify DOM, and
dispatch() only change internal state, apply_update is unnecessary.

SVGHMI: cosmetic fix in js

SVGHMI: do not discard out-of-page elements inside widgets that are ovelapping pages.

SVGHMI: update generated XSLT

OPCUA: cosmetic fixes

CLI: poll runtime log and output new entries to stdout.

CLI: when using --keep, do not disconnect before being interrupted

Runtime: work around 1s delay added when using twisted reactor's callLater.

Since wxPython4, using wxReactor from non-main thread was producing
exceptions in wxWidget's C++ code. Then reactor.run() was called from
main thread, and runtime's worker was delegating calls to reactor
with callLater(0, callable).

While this worked perfectly with wxReactor, it did introduce an unexplained
1 second delay to each worker call when using nomal linux reactors
(i.e. without wxPython). As a workaround reactor runs in a thread when using
twisted without wxPython

tests: opcua_client test project is not meant to be encrypted.

SVGHMI: update generated XSLT files

Merged changes from default

SVGHMI: ensures that PLC sends only fresh data to HMI, even right after variable being subscribed.

OPC-UA: add logging to help user to understang what went wrong when connecting.

OPC-UA: fix LDFLAG, missing OpenSSL's -lcrypto

open62541 is linked staticaly, therefore shared object dependencies have to be given explicitely.

tests: missing SSL support in open62541 build parameters

Merge changes from default branch

merge

Merge pull request #5 from vitw/wxPython4

update installation instructions

docs: add additional dependencies to installation instructions

update installation instructions

SVGHMI: fix svghmi_jumps example's SVG file (viewport was misplaced)

SVGHMI: rework the way cached values are applied to widgets when fresh data is missing.

SVGHMI: re-arrange Animate and data Dispath code paths.

SVGHMI: add an exemple that demonstrate use of Jump widget in different use cases.

SVGHMI: refactor an factorize widget dispatch() method calling

SVGHMI: fix ToggleButton not always reflecting current state

IDE: fix exception transfering or reconnecting after tracing variables

SVGHMI: Add predefined assignments to jump widget to notify PLC or other widgets about jump.

SVGHMI: continue rework of Jump widget to cope with Enable Expressions.

Questioning widget's activity and disability all together.
Now active/inactive/disable masquarade is all managed in widgets_common.
Propagated changes to widget already using activity (buttons)

SVGHMI: rework Jump widget to cope with Enable Expressions.

Relative jumps are not disabled implicitely anymore when pointed HMI_NODE is 0.
Also, "activable()" implementation was enhanced to make it optional.

SVGHMI: add support for "enable expressions" with arbitrary variable name assignment.

HMI tree paths can be prefixed with a variable name "@name=/MY/HMI/VAR"
Widget declarations can end with a "#" followed by a JS expression that refers to name given to variables.
Widget is disabled if expression's result is false.

Commit includes some more-or-less related generated code refactoring, that should simplify extending widget's variables attributes.

SVGHMI: preliminary implementation of a general enable bit for all widgets, using "#" at the end of widget declaration, and a "disabled" element that becomes visible instead of widget when disabled.

SVGHMI: rename veriables in parse_labels.ysl2 for better readability

OPC-US client: add support for x509 and user+password authentication.

Commit for backup not including tests since encrypted OPC-UA test are still not valid.

IDE: fix wxPython 3->4 API change leading to exception in type selection menu in CodeFileEditor

OPC-UA, IDE: add CTN parameters to support OPC-UA encryption and authentication.

xmlclass had to be enhanced to support elements with no content in xsd:choice

IDE: Fix tooltip not being shown anymore on any toolbars since switch to wxPython4.

Cleanup and update version.py

IDE: Fixed About dialog exception on Windows, and typo in about dialog's content.

runtime: fix bugs introduced in previous commit, and refactor some code

Runtime: wx.app.mainLoop and twisted reactor now share main thread with runtime.Worker.

This fixes exception when invoking python interactive shell from Runtime's tray
icon right-click menu.

Probably a consequence of wxPython upgrade, together with initial bad idea to
move wx.app.mainloop in non-main thread.

Remove useless assignment

SVGHMI: update generated XSLT

tests: fix load_and_build_tests.pytest

Leftover import from previously commented-out tests. Commented out as well.

Merge changes from default in wxPython4

SVGHMI: add support for multiline widget declaration using svg:desc.

Declaration started in inkscape:label and interupted by a '\' can be continued in the description field.
After an empty line, the rest of the description field is left for description text.

Runtime: Fix PLC python thread crash in case of exception in PostStart customization hook.

IDE+Runtime: fix exception when reconnecting with non-empty trace/force list.

Sometimes, remote call to SetTraceVariableList returned None just after reconnecting:
- changed caller to accept None (in case of connection problem)
- changer SetTraceVariable list to return 4 (DEBUG_SUSPENDED) if debug is suspended

Runtime: Retain: fix missuse of static classifier leading to ever increasing offset.

IDE: one more consequence of wxPython's 3 to 4 version bump

IDE+runtime: Fix .ico generation

IDE, SVGHMI: Workaround Snap package not launching Inskape, POEdit or Chromium directly, producing lot of output in Incskape CLI, and messing with TMPDIR

IDE: wxPython4 consequences : wx.OPEN -> wx.FD_OPEN

toolchain: GCC: use CFLAGS, LDFLAGS and SYSROOT given in environment

IDE: fix About dialog not showing (wxPython4 sequel), update copyright section.

IDE: fix image generation from svg script that was deleting to many files on cleanup

IDE: images: regenerate png according to latest changes in SVG

IDE: images/icons.svg: Update logo, icon, build, clean, transfer, connect and disconnect.

LocalRuntime: Allow overriding local runtime python binary path using BEREMIZPYTHONPATH environment variable.

tests: debug_project IDE test: give up with unreliable OCR for "Force value" menu entry.

IDE: fix primary buffer selection being reset on each write to console on X11.

This problem was making debug_project IDE test randomly failing

test: IDE: Fix non repeatable select-all-delete in debug_project.

tests: Change OCR options to be more reliable on small fonts.

tests: add Beremiz project used in opcua_test CLI test

GitHub CI: my bad. m( Was just wrong version

GitHub CI: actions/checkout@v3 submodules=recursive fails.

Merge from default branch + fix traffic light example SVG missing background + update generated XSLT

SVGHMI: update generated xslt file

SVGHMI: Warn at build time when SVG refers to non-existing widget types.

SVGHMI: add support for user JS script added in inkscape's document properties / scripting / embedded scripts.

SVGHMI: update generated XSLT file

SVGHMI: re-organize animate() to ensure that page fade-out is always visible, also make fade-out curve more aggressive to enhance visual feedback.

tests: recommanded build options for open62541 leads to infinite linking time when building PLC

tests: one more stability related fix for debug_project IDE test

tests: fix tests being systematically re-executed

CLI: fix fake_wx for OPC-UA in CLI, match with test and requirements

CLI: Explicitely wait for user interrupt (-k) and flush stdout each line.

tests: IDE: fix again debug_project, making it hopefully more stable

wxPython4 sequels: fix Wx exceptions ignored because no traceback

Some exception triggered on wxPython side have None as traceback,
and exception hanlder was discarding them.

tests: IDE: prevent edit_project to save modifed example so that it doesn't influence following tests

tests: IDE: force reporting screenshot even after failing command

tests: CLI: add simple test running python example

tests: docker: add dependencies for CLI testing

tests: add support for CLI tests

tests: fix debug_project.sikuli again.
- tooltip and context menu overlap
- text not being replaced in forcing dialog

CLI: prevent LOCAL:// runtime to use GUI (tray icon) when launch from CLI.

Merge latest changes from default

wxPython4 sequels: fix exception in connection dialog, force black text in FBD.

- wxPython4 does not have RemoveSizer in API anymore.
- On GTK3 with dark theme default text colour is white, making it unreadable.

SVGHMI: fix js exception because of trying to find already detached elements by id.

SVGHMI: better handling of page switch fade-out.

- In cases or relative jump to current page, page was keeping black after switch.
- Now keep track of undergoing page switch without comparing subscribed page to visible page.

tests: nore details, please

Github CI: upload artifact (reports) when failing

tests: add one more ignored pic to debug_project test

tests: add missing pic for debug_project sikuli test and remove depricated picture in edit_project

Github CI: use new name for test launching script

test: Fix context menu problems in debug view. This should fix debug_test as well.

- exception on right click on a wire
- tooltip hiding context menu in some case

tests: add (broken) debug_project test, fix edit_project

tests: rename build_in_docker.sh to do_test_in_docker.sh

Merge default in wxPython4 branch

SVGHMI: update generated XSLT files

SVGHMI: force initial state of Display widget to empty string.

SVGHMI: set initial displayed value of input widget to empty string.

SVGHMI: add warning_labels, same as optional_labels but emits warnings at build time if element is missing.

SVGHMI: update generated XSLT files

SVGHMI: generalize detach/re-attach of binary choices for ToggleButton, PushButton, Button and Keypad's Shit and CapsLock.

SVGHMI: also use order-preserving detach re-attach for hiding and showing active and inactive state.

SVGHMI: fix Switch widget so that order of choices elements is preserved across detaching and re-attaching.

SVGHMI: update generated xslt files

SVGHMI: nasty scope shadowing bug... was making funny recursion, leading to really slow interaction.

SVGHMI: fading page switch : to avoid blinking, page stays black once fading finished and next page is still not ready.

SVGHMI: fading page switch : defer update of classList to next animate() call when finishing transition.

classList update was happening in the same call as switch_page(), but this call is not meant to do any change in the DOM. This was triggering unwanted style and layout recomputation.

SVGHMI: rework Switch widget : detach/attach elements instead of hiding with style.display, detach all possible choices at init.

SVGHMI: add fading transition to make page switch feel more responsive on slow machines.

SVGHMI: add a way for widgets and other yslt2 files to add css definitions to resultng page.

SVGHMI: update generated XSLT filesw

SVGHMI: XY graph build produces error message if provided curve_N are not consistent.

SVHMI: Keyboard: Replace untouched value when typing directly after open. Make info string (HMI variable name) optional.

merged

SVGHMI: update generated xslt.

SVGHMI: Add support for fixed X range (duration) on XY garph.

SVGHMI: add widget update rate limit on variable change.

SVGHMI: fix parsing of floating point and negative min and max limits in widget label syntax.

Fix typos breaking IDE

Added preliminary CLI. Supports building a project, transfering and running on PLC.

IDE: fix exception happening in debug mode when logging process termination.

SVGHMI: Adapt to Inkscape 0.92 "-e" replaced by "-o" in 1.2, and workaround access right problem when generating thumbnails.

Various fixes to make svghmi_traffic_light example bahave on windows.

IDE: fix saveAs dialog

IDE: fix permission checking on windows for IDE project directory.

SVGHMI: fix active/inactive being swapped in ToggleButton

IDE/Windows: Find Inkscape binary even if Inkscape was installed for current user only.

IDE: Workaround exception caused by dead C/C++ swig-wrapped object when debug still try to update view after close.

IDE: better permission checking when opening a project.

Merge changes from default to wxPython4 branch

SVGHMI: more fixes for XY graph + add XY graph test.

SVGHMI: Seems inkscape doesn't necessarily use tspan inside of text anymore.

SVGHMI: multiple fixes in XY graph widget. WIP.

SVGHMI: fix dropdown widget in case it is used as language selection widget

global i18n definitions changed but widget wasn't updated accordingly.

SVGHMI: prevent exception with date/time formating in sprintf.js if lang wasn't already set.

SVGHMI: Add forEach to local copy of pythonic.js

SVGHMI: many fixes on xy trend graph. WIP.

IDE: fix exception happening in debug mode when logging process termination.

SVGHMI: Adapt to Inkscape 0.92 "-e" replaced by "-o" in 1.2, and workaround access right problem when generating thumbnails.

Various fixes to make svghmi_traffic_light example bahave on windows.

IDE: fix saveAs dialog

IDE: fix permission checking on windows for IDE project directory.

SVGHMI: fix active/inactive being swapped in ToggleButton

IDE/Windows: Find Inkscape binary even if Inkscape was installed for current user only.

IDE: Workaround exception caused by dead C/C++ swig-wrapped object when debug still try to update view after close.

IDE: better permission checking when opening a project.

SVGHMI: fix syntax problems in xygraph

SVGHMI: fix widget's update frequency forcing : syntax checking was enforcing unit and js code was using undefined variables

SVGHMI: fix syntax error in sprintf.js and force makefile to regen xslt files when sprintf.js changes

SVGHMI: fix test/projects/svghmi "unspecified" frequency that was actualy specified...

SVGHMI: Add premature implementation of XY chart.

SVGHMI: fix widget's update frequency forcing : syntax checking was enforcing unit and js code was using undefined variables

SVGHMI: fix syntax error in sprintf.js and force makefile to regen xslt files when sprintf.js changes

SVGHMI: fix test/projects/svghmi "unspecified" frequency that was actualy specified...

merge default

Tests: No need to archive test results before uploading them as action artifacts.

Tests: ...

Tests: re-enable running test in github action, now that docker image should be cached.

Tests: temporary disable problematic part, to force action to succeed so caching can happen.

Tests: give test directory when creating container, not when running test.

Tests: fix docker image export for GitHub Action caching.

Tests: More fixes amd enhancments to run tests on Github Actions

Tests: use script rather than alias so that bash doesn't need to be interactive shell with a TTY

Tests: remove -it from docker invocation

Workaround "The input device is not a TTY" error on Github Action.

Create run_tests_in_docker.yml

SVGHMI: Add support for forcing widget update frequency with period longer than a second. As an example, "HMI:Display|10s@/myvar" updates variable every 10 seconds.

SVGHMI: cosmetic fixes + removed dead code

SVGHMI: allow widgets to disable clipping on variables given with min and max. Setting this.clip = false disables clipping.

SVGHMI: allow designating widget's sub-elements as main element child rather than descendant. Names staring with "/" in yslt call to labels() only match direct widget childs.

SVGHMI: add localized Date and Time support to sprintf.js. Use with "%D" or "%2.1D" format style.

Minor changes to README.md

wxPython4 sequels: usual naming problem in grid cell change events, non kw-args to menu.Append and event not being skipped.

Tests: Fix missing <br/> in generated html report.

Tests: add HTML report generation and a workaround to bad exception handling in sikuli.

In case of exception in python code, and since a thread is running
to observe stdout, sikuli was never terminated after an exception.
Unfortunately sys.exepthook doesn't work in that version of jython/sikuli.
Test are now written inside functions witch are passed to run_test to deal
with exception.

Tests: refactored sikuli based test

IDE: Postpone execution of keyboard shortcut commands when given while previous command is still being executed, to prevent CTR/builder jamming.

IDE: in case of unhandled exception, write bug report to given log file, so that test report can have it.

Merged default's changes in wxPython4 branch

Tests: fix project edit test sikuli IDE test.

Background click based on bitmap matching doesn't work.
Grid dots are not good match candidates.
Rendering probably affected by virtual display's bpp or rasterizer approximations.

runtime, retain: remove forgotten debug code.

Runtime: removing dead code

IDE: removed one (last ?) wx.NewId() that was called on each opening of project tree popup menu

Tests: Re-introduced pytest based tests. Fixed them a bit, commented-out otherwise. Application tests only runs with logging test, and PLCOpenEditor tests seem broken.

Tests: Enhance robustness of stdout driven waiting state in Sikuli based tests.

Some tests were randomly passing, because from time to time waiting for idle was skiped. It was combination of multiple problems :
- buffering on stdout (now use readline + flush for each write to log)
- it is sometime required to wait for activity before waiting for timeout added "WaitForChangeAndIdle" to "stdoutIdleObserver"

Tests: add an IDE test that relies on image matching.

Tests: re-introduce xvfb+x11vnc target in Makefile : xvfb_sikuli

Fix sequel of wxPython 4 port : double click on tab wasn't maximizing and was showing exception.

Tests: Makefile's PIPESTATUS turned into small letters (wrong vim shortcut ?) leading to always passing tests.

Tests: Various enhancements in Makefile and sikuli common python code.

Tests: Added BEREMIZPYTHONPATH to point to Python interpreter to use for tests.

Documentation/comment fix.

IDE: Fix one more sequel of wxPython4 port : typo in editors/TextViewer.py

Tests: Add a Makefile variable to allow changing standalone headless X server command (Xvfb by default)

Merge default head that was only merged in wxPython4

merged default

Add Docker image definition as reference platform to run IDE tests.

Tests: added tests/Makefile and a first test in tests/ide_tests. Test requires sikuli and Xvfb or Xnest.

IDE: Add -l or --log command line parameter to give a file where all content witten to console window will be appended. File can be /dev/stdout.

Merge default

IDE: follow-up on change in 83ed4ea362db - added workaround when matiec generated files contain unexpected characters.

Runtime : force using monotonic time in Timer (threading). Prevent watchdog to trigger when changing system time.

SVGHMI: remove debug code

SVGHMI: update generated XSLT

SVGHMI: fix again appication of frequency value when given in label. Use it on PushButton instance in svghmi test.

TESTS: moved non-automated tests Beremiz projects stored as directories in /tests to new directory /tests/projects

Create README.md in tests

SVGHMI: update generated xslt, and svghmi test project files

SVGHMI: Add pushbutton widget, that can take reflect short press in variable, but has no garantee on consistency.

SVGHMI: Fixed support for frequency parsing in widget label

Merge

SVGHMI: update generated xslt

SVGHMI test: add special commandline to launch chromium as new intependent window, without GPU acceleration.

SVGHMI: add syntax for widget update frequency in widget label: HMI:WidgetType|freq:arg0:arg1@path

OPC-UA client: "static" class was forgotten for open62541 client structure preventing multiple client.

OPC-UA: cosmetic fix and armless typo

Merged default in wxPython4, include runtimeLists

Merge

SVGHMI: added ListSwitch widget

Merged RuntimeLists branch

Close RuntimeLists branch

Fix bug introduced in previous commit : dual link list wasn't append and remove wasn't implemented correctly. Removed debug code, enhanced variable names and comments.

SVGHMI: optimization of C part : stop traversing the whole HMI tree, use dual linked list for subscriptions and single linked list for changes from HMI. Intermediate commit, still crashing in some cases.

Xenomai runtime: ensure that __DEBUG global variable is set when resuming debug.

SVGHMI: Adapt svghmi.c to changes in UnpackVar

Runtime: Now retain uses a list based on data available in VARIABLES.csv instead of traversing the whole instance tree looking for RETAIN flag.

RUNTIME: Variable forcing now uses limited list and buffer instead of systematical instance tree traversal and in-tree "fvalue" to keep track of forced value for pointed variables (external, located). Pointer swapping is performed when forcing externals and located, with backup being restored when forcing is reset. Retain still uses tree traversal.

RUNTIME: Variable trace now uses limited list and buffer instead of flags in instance tree that was requiring systematical instance tree traversal, and worst size buffer. Forcing and retain still use tree traversal.

SVGHMI: more accurate filtering of elements to unlink or not

OPC-UA client: generated code now take UA_Variants on the stack directly, avoid useless allocation on write, and unalloc implicitely allocated data on read

OPC-UA client: generated code now take UA_Variants on the stack directly, avoid useless allocation on write, and unalloc implicitely allocated data on read

IDE: Tutorial/Example menu was broken : path of project being open was the same for all menu entries.

IDE: Tutorial/Example menu was broken, probably after a merge. Menu (and corresponding code) was duplicated. Also, path of project beeing open was the same for all menu entries.

Fix bug when updating data in variable panel.

Grid event naming CHANGE->CHANGING was wrong. CHANGE->CHANGED is the way to go.

SVGHMI: update tests/evghmi to reflect/test latest changes. update generated XSLT.

SVGHMI: multiple non significant changes: doc fixes, modern style access to attributes, enforce double quotes around member name in object literals.

SVGHMI: Changes /CURRENT_PAGE_* behaviour to prevent problem whith multiclient : all clients were switching page when one was jumping.
- now PLC have to prefix page name with "!" to order page switch.
- HMI do not prefix with "!" when jumping, this avoiding looping incidently
- In case of multiple client:
CURRENT_PAGE reflects current page of last client hwo did jump
Setting CURRENT_PAGE with "!" affects all clients simultaneously

SVGHMI: changes that should fix some corner cases about unlinking and discardable element that still didn't show until now.
- list that would have been declared in some groups could have been discarded.
- elements to be unlinked were comuted based on filtering $hmi_elements, whereas $hmi_widget already filtered list

SVGHMI: update generated XSLT

merged

SVGHMI: add CURRENT_PAGE_{location} global variable to reflect currently visible page. If PLC wites some valid page reference in that variable, it triggers page switch. Additionally, fixed /HEARTBEAT being subscribed systematically by JS code even when wtchdog is not enabled.

Follow-up on 83ed4ea362db 'IDE: prevent invoking matiec when IEC code did not change since last build' : build unconditionally after clean

merged

OPC-UA: fix types in model not being preserved after reload of CSV file, leading to exception when changing selection lists content.

OPC-UA: Removed more "LocalizedText()", this time in selected variable list

IDE: prevent invoking matiec when IEC code did not change since last build.

SVGHMI: prevent systematic rebuild when there are multiple instances of SVGHMI CTN.

SVGHMI: optimize HMI tree handling C code to lower CPU usage when traversing large trees

merged