| Fri, 07 Sep 2012 20:10:35 +0200 |
laurent |
Fix bug in canfestivel extension when Show Master Generated on Windows
|
changeset |
files
|
| Fri, 07 Sep 2012 18:28:45 +0200 |
laurent |
Adding support for extending internationalization to extensions
|
changeset |
files
|
| Fri, 07 Sep 2012 16:45:55 +0200 |
Laurent Bessard |
Integration of PLCOpenEditor into Beremiz
|
changeset |
files
|
| Wed, 05 Sep 2012 11:17:52 +0200 |
laurent |
Adding support for printing matiec warnings report in log console
|
changeset |
files
|
| Sat, 08 Sep 2012 02:12:10 +0200 |
Edouard Tisserant |
Added build for all supported language in doc/Makefile
|
changeset |
files
|
| Sat, 08 Sep 2012 01:24:36 +0200 |
Edouard Tisserant |
Added subdirectories in documentation, with more deoctree items to test. Enabled i18n in sphinx doc, tested with a small french translation
|
changeset |
files
|
| Thu, 06 Sep 2012 00:32:45 +0200 |
Edouard Tisserant |
Added sphinx doc root in /doc. To be continued
|
changeset |
files
|
| Sat, 01 Sep 2012 16:32:15 +0200 |
Edouard Tisserant |
Stripped out splash screen version information
|
changeset |
files
|
| Wed, 29 Aug 2012 21:14:23 +0200 |
Edouard Tisserant |
Added splash for 1.1
1.1 Korean release
|
changeset |
files
|
| Wed, 29 Aug 2012 19:26:40 +0200 |
laurent |
Fix import order in Beremiz.py to prevent wrong translations in internationalization
|
changeset |
files
|
| Mon, 27 Aug 2012 23:36:57 +0200 |
laurent |
Fix bug when closing IECCodeView and IECRawCodeView, reopening them was impossible
|
changeset |
files
|
| Mon, 27 Aug 2012 22:13:43 +0200 |
Laurent Bessard |
Merge Minyoung Sung and Reinhard Lee korean translations
|
changeset |
files
|
| Mon, 27 Aug 2012 22:05:02 +0200 |
reinhard |
Beremiz_ko_KR.po
|
changeset |
files
|
| Mon, 27 Aug 2012 22:03:25 +0200 |
minyoung |
Beremiz_ko_KR.po
|
changeset |
files
|
| Mon, 27 Aug 2012 17:24:42 +0200 |
laurent |
Fix bug when closing canfestival extension generated master view
|
changeset |
files
|
| Sat, 25 Aug 2012 14:50:48 +0200 |
laurent |
Update list of messages to be translated for internationalization and french translations
|
changeset |
files
|
| Sat, 25 Aug 2012 14:49:15 +0200 |
laurent |
Fix bug when modifying configuration global variable in ProjectNodeEditor
|
changeset |
files
|
| Tue, 21 Aug 2012 18:40:42 +0200 |
laurent |
Adding korean translation for interface texts
|
changeset |
files
|
| Thu, 09 Aug 2012 20:04:41 +0200 |
laurent |
Fix bug segmentation fault while cleanup extensions
|
changeset |
files
|
| Tue, 31 Jul 2012 17:46:01 +0200 |
laurent |
Adding support for checking that tab content is saved before closing it
|
changeset |
files
|
| Tue, 31 Jul 2012 17:38:18 +0200 |
laurent |
Fix bug when opening File Editor
|
changeset |
files
|
| Sun, 29 Jul 2012 19:33:52 +0200 |
laurent |
Fix bug debugger unable to restart after stopping PLC
|
changeset |
files
|
| Fri, 27 Jul 2012 00:38:45 +0200 |
laurent |
Fix bug while renaming project file in FileManagementPanel
|
changeset |
files
|
| Wed, 25 Jul 2012 17:37:29 +0200 |
laurent |
Fixing bug while loading recent projects open path with old configurations
|
changeset |
files
|
| Mon, 23 Jul 2012 02:53:02 +0200 |
laurent |
Fix bug while closing specific file editors
|
changeset |
files
|
| Wed, 18 Jul 2012 01:33:48 +0200 |
laurent |
Merged
|
changeset |
files
|
| Wed, 18 Jul 2012 01:05:06 +0200 |
laurent |
Adding secure extraction of last edited project path to avoid crash if path is not well formatted
|
changeset |
files
|
| Wed, 18 Jul 2012 00:44:29 +0200 |
laurent |
Adding support for saving editor choosen when editing project file for reloading project layout
|
changeset |
files
|
| Tue, 17 Jul 2012 21:25:28 +0200 |
laurent |
Fixing bug with filesystem encoding on Windows
|
changeset |
files
|
| Fri, 06 Jul 2012 21:00:43 +0200 |
Edouard Tisserant |
merge
|
changeset |
files
|
| Mon, 02 Jul 2012 16:02:38 +0200 |
laurent |
Fix bug while opening project panel
|
changeset |
files
|
| Mon, 02 Jul 2012 12:00:10 +0200 |
laurent |
Fix bug when opening deeper ConfTreeNode editors
|
changeset |
files
|
| Sun, 01 Jul 2012 23:20:19 +0200 |
laurent |
Adding support for beremiz extensions to define custom file editors for project files
|
changeset |
files
|
| Thu, 28 Jun 2012 16:42:07 +0200 |
laurent |
Fixing file explorer for Windows
|
changeset |
files
|
| Thu, 28 Jun 2012 12:07:21 +0200 |
laurent |
Adding support for file explorer for project files
|
changeset |
files
|
| Mon, 25 Jun 2012 20:05:29 +0200 |
laurent |
Adding support using plcopeneditor bitmap library for icon request
|
changeset |
files
|
| Mon, 25 Jun 2012 12:13:58 +0200 |
laurent |
Fix bug when deleting conf tree node and conf tree node editor opened for this same node
|
changeset |
files
|
| Tue, 19 Jun 2012 21:59:34 +0200 |
Edouard Tisserant |
Fixed typo
|
changeset |
files
|
| Tue, 19 Jun 2012 10:11:43 +0200 |
Edouard Tisserant |
Updated CF bootup strategy.
|
changeset |
files
|
| Mon, 18 Jun 2012 19:34:41 +0200 |
laurent |
Fix bug with Show Master functionality
|
changeset |
files
|
| Mon, 18 Jun 2012 02:35:21 +0200 |
Edouard Tisserant |
Fixed generated CF code to match latest changes
|
changeset |
files
|
| Sun, 17 Jun 2012 12:33:22 +0200 |
laurent |
Adding support for hiding node base params controls if needed
|
changeset |
files
|
| Fri, 15 Jun 2012 18:08:26 +0200 |
laurent |
Fix bug when opening and closing confnode extra viewers
|
changeset |
files
|
| Thu, 14 Jun 2012 18:50:28 +0200 |
Edouard Tisserant |
merge
|
changeset |
files
|
| Thu, 14 Jun 2012 18:50:10 +0200 |
Edouard Tisserant |
Fixed import dependency order for POUlibrary and PLCControler
|
changeset |
files
|
| Thu, 14 Jun 2012 18:25:04 +0200 |
laurent |
Moving ConfNode specific menu to end of EditMenu
|
changeset |
files
|
| Thu, 14 Jun 2012 15:50:57 +0200 |
Edouard Tisserant |
Fixed loading projects with no libraries at all
|
changeset |
files
|
| Thu, 14 Jun 2012 14:42:00 +0200 |
Edouard Tisserant |
Fixed crash when starting with no libraries at all
|
changeset |
files
|
| Mon, 11 Jun 2012 02:34:23 +0200 |
laurent |
Merged
|
changeset |
files
|
| Mon, 11 Jun 2012 01:24:18 +0200 |
laurent |
Adding support for push buttons (EVT_LEFT_DOWN is bind instead of EVT_BUTTON)
|
changeset |
files
|
| Mon, 11 Jun 2012 01:22:20 +0200 |
laurent |
Fix bug in reorganization of toolbars after refreshing them
|
changeset |
files
|
| Sun, 10 Jun 2012 20:20:09 +0200 |
laurent |
Add support for reorganizing toolbars when their size changed
|
changeset |
files
|
| Sun, 10 Jun 2012 20:18:34 +0200 |
laurent |
Fix bug project not marked as modified when changing URI_Location using discovery dialog
|
changeset |
files
|
| Sat, 09 Jun 2012 00:08:34 +0200 |
Edouard Tisserant |
Now, PYRO:// locations also accept MDNS service names
|
changeset |
files
|
| Fri, 08 Jun 2012 12:39:37 +0200 |
laurent |
Modifying canfestival plugin to following the new Beremiz confnode paradigm
|
changeset |
files
|
| Thu, 07 Jun 2012 01:14:58 +0200 |
Edouard Tisserant |
(none)
|
changeset |
files
|
| Wed, 06 Jun 2012 19:07:45 +0200 |
laurent |
Replacing dialog asking for a name when adding confnode to project by automatically generated name
|
changeset |
files
|
| Tue, 05 Jun 2012 22:11:13 +0200 |
laurent |
Fixed windows only bug caused by recent changes
|
changeset |
files
|
| Mon, 04 Jun 2012 18:50:08 +0200 |
Edouard Tisserant |
Fixed typo in library management
|
changeset |
files
|
| Mon, 04 Jun 2012 00:39:49 +0200 |
laurent |
Adding support for importing into project some files to be transfered with PLC
|
changeset |
files
|
| Sun, 03 Jun 2012 23:53:45 +0200 |
laurent |
Integrating project properties panel into project window
|
changeset |
files
|
| Sun, 03 Jun 2012 23:53:22 +0200 |
laurent |
Removing code related to Topology panel
|
changeset |
files
|
| Wed, 30 May 2012 13:05:18 +0200 |
laurent |
Fix bug in StatusToolBar items state when close and opening another project
|
changeset |
files
|
| Wed, 30 May 2012 12:20:54 +0200 |
laurent |
Fix bug with cut/copy/paste on PythonEditor
|
changeset |
files
|
| Wed, 23 May 2012 16:32:33 +0200 |
laurent |
Merged
|
changeset |
files
|
| Wed, 23 May 2012 16:28:50 +0200 |
laurent |
Fixing bug on ConfNodeEditors refresh
|
changeset |
files
|
| Wed, 23 May 2012 13:41:31 +0200 |
Edouard Tisserant |
merge
|
changeset |
files
|
| Wed, 23 May 2012 12:19:53 +0200 |
laurent |
Hiding Topology panel
|
changeset |
files
|
| Wed, 23 May 2012 13:20:00 +0200 |
Edouard Tisserant |
fix svgui toggle buttons output, now reflect pressed state
|
changeset |
files
|
| Wed, 23 May 2012 11:44:55 +0200 |
laurent |
Fix bug when begin editing item in project tree
|
changeset |
files
|
| Wed, 23 May 2012 10:37:43 +0200 |
laurent |
Fix refresh of ConfTreeNodeEditors content when values change
|
changeset |
files
|
| Tue, 22 May 2012 22:29:43 +0200 |
laurent |
Fixing Xenomai runtime specific parts to remove segmentation fault when stopping PLC
|
changeset |
files
|
| Tue, 22 May 2012 06:41:54 +0200 |
Edouard Tisserant |
merge
|
changeset |
files
|
| Mon, 21 May 2012 18:56:44 +0200 |
laurent |
Fix bugs with ConfigTreeNode
|
changeset |
files
|
| Tue, 22 May 2012 06:11:37 +0200 |
Edouard Tisserant |
Fixed runtime problems with python 2.6 without wx installed
|
changeset |
files
|
| Mon, 21 May 2012 17:53:50 +0200 |
Edouard Tisserant |
fixed uncaught exception dialog while displaying cought exception in log
|
changeset |
files
|
| Mon, 21 May 2012 16:40:57 +0200 |
Edouard Tisserant |
fixed exception when launching discovery dialog without network
|
changeset |
files
|
| Mon, 21 May 2012 11:00:57 +0200 |
laurent |
Fix bug with Properties menu entry
|
changeset |
files
|
| Mon, 21 May 2012 10:04:27 +0200 |
laurent |
refactoring
|
changeset |
files
|
| Mon, 21 May 2012 02:49:53 +0200 |
Edouard Tisserant |
fixed typos
|
changeset |
files
|
| Mon, 21 May 2012 02:01:51 +0200 |
Edouard Tisserant |
Fixed argument parsing error
|
changeset |
files
|
| Sun, 20 May 2012 22:44:09 +0200 |
Edouard Tisserant |
Fixed extension loading too late causing features to be ignored
|
changeset |
files
|
| Sun, 20 May 2012 19:07:09 +0200 |
Edouard Tisserant |
Moved LPC sources to a separate project
|
changeset |
files
|
| Sat, 19 May 2012 19:00:55 +0200 |
Edouard Tisserant |
targets and connectors are nor extensible
|
changeset |
files
|
| Sat, 19 May 2012 15:54:16 +0200 |
Edouard Tisserant |
Added reference to CTR in libraries
|
changeset |
files
|
| Sat, 19 May 2012 12:41:48 +0200 |
Edouard Tisserant |
refecored library extension machanism
|
changeset |
files
|
| Fri, 18 May 2012 18:50:49 +0200 |
laurent |
refactoring
|
changeset |
files
|
| Sat, 12 May 2012 12:11:42 +0200 |
Edouard Tisserant |
refactoring - c_ext stripped first stage
|
changeset |
files
|
| Sat, 12 May 2012 11:21:10 +0200 |
Edouard Tisserant |
refactoring - library support is not anymore attached to configtree nodes, but handles by project controller
|
changeset |
files
|
| Wed, 09 May 2012 00:39:54 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Wed, 09 May 2012 00:12:40 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Wed, 09 May 2012 00:00:50 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Tue, 08 May 2012 22:27:49 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Tue, 08 May 2012 17:48:47 +0200 |
Edouard Tisserant |
fixed non-terminating process problem
|
changeset |
files
|
| Tue, 08 May 2012 17:16:37 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Tue, 08 May 2012 17:08:45 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Tue, 08 May 2012 16:31:12 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Tue, 08 May 2012 12:18:57 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Mon, 07 May 2012 19:19:08 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Mon, 07 May 2012 18:47:29 +0200 |
Edouard Tisserant |
refactoring
|
changeset |
files
|
| Thu, 03 May 2012 19:02:34 +0200 |
laurent |
Adding search field for finding function or function block in library tree
|
changeset |
files
|
| Fri, 27 Apr 2012 02:07:47 +0200 |
laurent |
Adding support for automatically saving and restoring state of frame or project perspective
|
changeset |
files
|
| Thu, 05 Apr 2012 04:42:01 +0200 |
Edouard Tisserant |
branch merge
|
changeset |
files
|
| Thu, 05 Apr 2012 04:41:22 +0200 |
Edouard Tisserant |
Reflected recent changes in ProcessLogger changes in StartLocalRuntime
|
changeset |
files
|
| Mon, 02 Apr 2012 17:36:47 +0200 |
laurent |
Fix bug when creating new projects
|
changeset |
files
|
| Mon, 02 Apr 2012 01:15:37 +0200 |
Edouard Tisserant |
Version bump
|
changeset |
files
|
| Sat, 31 Mar 2012 15:20:04 +0200 |
laurent |
Merged
|
changeset |
files
|
| Sat, 31 Mar 2012 15:10:55 +0200 |
laurent |
Fixing bug in debugger sending wrong tick with values
|
changeset |
files
|
| Sat, 31 Mar 2012 15:09:48 +0200 |
laurent |
Fixing menu toolbar icons on Windows
|
changeset |
files
|
| Wed, 28 Mar 2012 00:05:35 +0200 |
laurent |
Fix bug in debugger when transfer without having build before and and opening debug view before running PLC
|
changeset |
files
|
| Wed, 28 Mar 2012 00:05:15 +0200 |
laurent |
Adding ToolBar containing basic menu items
|
changeset |
files
|
| Thu, 29 Mar 2012 00:14:35 +0200 |
Edouard Tisserant |
More gentle use of app.Yield in ProcessLogger
|
changeset |
files
|
| Wed, 28 Mar 2012 21:08:31 +0200 |
Edouard Tisserant |
More stable ProcessLogger.spin()
|
changeset |
files
|
| Sun, 18 Mar 2012 23:50:51 +0100 |
laurent |
Adding support for selecting plugin parameter value from a tree of available values
|
changeset |
files
|
| Sun, 18 Mar 2012 19:17:54 +0100 |
Edouard Tisserant |
Added a few shortcuts in menus
|
changeset |
files
|
| Sun, 18 Mar 2012 18:32:49 +0100 |
Edouard Tisserant |
Stripped dead code in bug report dialog.\nFixed error when log flooded while quitting
|
changeset |
files
|
| Sun, 11 Mar 2012 22:00:15 +0100 |
laurent |
merge
|
changeset |
files
|
| Sun, 11 Mar 2012 19:42:14 +0100 |
laurent |
Adding support for executing python scripts on remote runtime
|
changeset |
files
|
| Tue, 06 Mar 2012 22:42:56 +0100 |
Edouard Tisserant |
merge
|
changeset |
files
|
| Mon, 05 Mar 2012 12:02:20 +0100 |
laurent |
Adding support for not closing debug tabs and remove variable in variable debug panel if instance still exist in newly transfered program
|
changeset |
files
|
| Mon, 27 Feb 2012 16:51:43 +0100 |
laurent |
Fix bug in killing debug thread when closing Beremiz window
|
changeset |
files
|
| Thu, 23 Feb 2012 17:45:11 +0100 |
Edouard Tisserant |
Fixed stopping crash in some cases
|
changeset |
files
|
| Tue, 21 Feb 2012 22:36:35 +0100 |
laurent |
Inverting order of plugin calls in retrieve and publish
|
changeset |
files
|
| Sun, 19 Feb 2012 02:20:24 +0100 |
Edouard Tisserant |
Added support for object files as a result of PlugGenerate_C
|
changeset |
files
|
| Thu, 16 Feb 2012 22:54:44 +0100 |
laurent |
Adding support for not closing debug tabs and remove variable in variable debug panel if instance still exist in newly transfered program
|
changeset |
files
|
| Thu, 16 Feb 2012 22:52:28 +0100 |
smarteh-dev |
Fix bug with "Transfer" button
|
changeset |
files
|
| Thu, 16 Feb 2012 15:13:05 +0100 |
Edouard Tisserant |
Added a semaphore when starting runtime's python thread to make sure startPLC doesn't return before PLC is really initialized.
|
changeset |
files
|
| Thu, 16 Feb 2012 14:57:04 +0100 |
Edouard Tisserant |
Updated logger calls in debugthread.
|
changeset |
files
|
| Thu, 16 Feb 2012 00:19:27 +0100 |
Edouard Tisserant |
Even more robust logger, up to the really last line that comes after the rush
|
changeset |
files
|
| Wed, 15 Feb 2012 19:17:09 +0100 |
Edouard Tisserant |
Fixed Logger redraw problem on Windows created in previous commit
|
changeset |
files
|
| Wed, 15 Feb 2012 18:52:31 +0100 |
Edouard Tisserant |
More robust Logger, now resist to flooding.
|
changeset |
files
|
| Wed, 15 Feb 2012 16:39:56 +0100 |
Edouard Tisserant |
Fixed Win32 timer up to 1ms
|
changeset |
files
|
| Wed, 15 Feb 2012 00:44:24 +0100 |
laurent |
Merge with Edouard's Modifications
|
changeset |
files
|
| Wed, 15 Feb 2012 00:32:01 +0100 |
laurent |
Fix wrong panel size making strange background in topology plugin element
|
changeset |
files
|
| Sat, 11 Feb 2012 00:02:02 +0100 |
smarteh-dev |
Adding support for integrating CanFestival plugin panels in Beremiz main frame
|
changeset |
files
|
| Tue, 14 Feb 2012 12:20:19 +0100 |
Edouard Tisserant |
commented out noisy printf in Win32 target
|
changeset |
files
|
| Thu, 09 Feb 2012 21:23:11 +0100 |
smarteh-dev |
Adding support for integrating CanFestival plugin panels in Beremiz main frame
|
changeset |
files
|
| Tue, 07 Feb 2012 19:14:10 +0100 |
laurent |
Fix recent projects list not updated when creating new project
|
changeset |
files
|
| Fri, 03 Feb 2012 16:12:49 +0100 |
laurent |
Fix bug list of recent projects opened not updated when open project with command line
|
changeset |
files
|
| Thu, 02 Feb 2012 16:09:27 +0100 |
laurent |
Fix 'Transfer" button state according to last build result
|
changeset |
files
|
| Thu, 02 Feb 2012 00:28:27 +0100 |
laurent |
Disable 'Transfer' button when build failed
|
changeset |
files
|
| Tue, 31 Jan 2012 23:28:03 +0100 |
laurent |
Adding support for quickly open recent projects in file menu
|
changeset |
files
|
| Tue, 31 Jan 2012 00:41:46 +0100 |
Edouard Tisserant |
Changed GetTraceVariables results unpack to something more robust in debug thread proc.
|
changeset |
files
|
| Tue, 31 Jan 2012 00:37:59 +0100 |
edouard |
reverted temporary fix, fixed in PLCopenEditor now.
|
changeset |
files
|
| Mon, 30 Jan 2012 02:19:03 +0100 |
Edouard Tisserant |
temporary fix for debugger crash in case of high sampling rates
|
changeset |
files
|
| Wed, 12 Aug 2009 15:21:00 +0200 |
beremiz |
forgoten branch now closed
cherry-pick
|
changeset |
files
|
| Wed, 25 Jan 2012 01:23:44 +0100 |
laurent |
Adding support for extracting Common_Ticktime from VARIABLES.csv
|
changeset |
files
|
| Tue, 24 Jan 2012 21:39:26 +0100 |
laurent |
Adding support for loading datatypes defined in plugins to allow to use them in PLC program
|
changeset |
files
|
| Mon, 23 Jan 2012 15:11:49 +0100 |
Edouard Tisserant |
Better name for python plugin
|
changeset |
files
|
| Tue, 17 Jan 2012 22:52:27 +0100 |
laurent |
Merging with modifications from Edouard
|
changeset |
files
|
| Tue, 17 Jan 2012 22:50:23 +0100 |
laurent |
Fixing bug on Windows with expanding hidden root item in location tree ctrl
|
changeset |
files
|
| Tue, 17 Jan 2012 22:49:30 +0100 |
laurent |
Fixing bug in c_ext plugin variable grid cells not editable
|
changeset |
files
|
| Thu, 12 Jan 2012 17:45:58 +0100 |
Edouard Tisserant |
Version bump, 1.03, splah image
|
changeset |
files
|
| Thu, 12 Jan 2012 17:44:11 +0100 |
Edouard Tisserant |
Version bump, 1.03
|
changeset |
files
|
| Mon, 09 Jan 2012 18:18:43 +0100 |
laurent |
Fixing bug in scrollbars and content position in Topology panel when expand and collapse elements in treectrls
|
changeset |
files
|
| Sun, 08 Jan 2012 19:10:12 +0100 |
laurent |
Fixing bug in displaying lines of code at the origin of matiec errors
|
changeset |
files
|
| Sun, 08 Jan 2012 19:07:59 +0100 |
laurent |
Fixing inverted icons for button to Minimize/Maximize plugin parameters panel
|
changeset |
files
|
| Sun, 08 Jan 2012 19:04:41 +0100 |
laurent |
Adding support for drag'n dropping located variables from topology panel to configurations and resources variable panel for declaring global located variables
|
changeset |
files
|
| Wed, 21 Dec 2011 19:43:40 +0100 |
laurent |
Fixing some issues in c_ext plugin
|
changeset |
files
|
| Wed, 21 Dec 2011 19:42:49 +0100 |
laurent |
Adding support for integrating Python code Editor into Beremiz frame.
|
changeset |
files
|
| Tue, 20 Dec 2011 23:37:06 +0100 |
laurent |
Fixing bug integrated plugin editors not closed when removing corresponding plugin
|
changeset |
files
|
| Mon, 19 Dec 2011 01:56:13 +0100 |
laurent |
Fixing bug when loading icons for plugin's editor tabs
|
changeset |
files
|
| Fri, 16 Dec 2011 22:55:13 +0100 |
laurent |
Removing multiple definition of UndoBuffer
|
changeset |
files
|
| Fri, 16 Dec 2011 22:54:24 +0100 |
laurent |
Moving definition of grids fonts and colours into CustomGrid
|
changeset |
files
|
| Wed, 14 Dec 2011 15:17:47 +0100 |
laurent |
Adding support for loading specific POUs library in LPCBeremiz
|
changeset |
files
|
| Wed, 14 Dec 2011 15:17:36 +0100 |
laurent |
Adding support for unifying grid table control elements
|
changeset |
files
|
| Fri, 09 Dec 2011 10:32:06 +0100 |
laurent |
Replacing sizers structure for locations tree by a treectrl in Topology panel in order to make refreshing of this panel faster
|
changeset |
files
|
| Fri, 09 Dec 2011 10:26:56 +0100 |
laurent |
Fixing bug in forcing variables in runtime debug thread
|
changeset |
files
|
| Mon, 28 Nov 2011 13:46:48 +0100 |
Edouard Tisserant |
Avoid starting Zeroconf if ip unspecified or set to localhost. Pick one interface address when given IP is 0.0.0.0
|
changeset |
files
|
| Tue, 22 Nov 2011 02:07:00 +0100 |
Edouard Tisserant |
converted ServicePublisher.py to unix line ending
|
changeset |
files
|
| Tue, 22 Nov 2011 02:06:15 +0100 |
Edouard Tisserant |
added periodic retry for zeroconf, in case network interface is not ready
|
changeset |
files
|
| Mon, 21 Nov 2011 15:18:51 +0100 |
Edouard Tisserant |
ServicePublisher.py was missing in previous commit
|
changeset |
files
|
| Mon, 21 Nov 2011 11:40:29 +0100 |
Edouard Tisserant |
Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf
|
changeset |
files
|
| Sun, 20 Nov 2011 18:14:04 +0100 |
Edouard Tisserant |
Fixed typo in /runtime/ServicePublisher
|
changeset |
files
|
| Sat, 19 Nov 2011 21:52:34 +0100 |
Edouard Tisserant |
various cleanups in /targets
|
changeset |
files
|
| Fri, 18 Nov 2011 23:54:03 +0100 |
Edouard Tisserant |
Fixed encoding of Beremiz_service.py
|
changeset |
files
|
| Fri, 18 Nov 2011 18:40:19 +0100 |
Edouard Tisserant |
Fixed file attributes on Beremiz.py and Beremiz_service.py
|
changeset |
files
|
| Fri, 18 Nov 2011 17:33:19 +0100 |
laurent |
Fixing bug that prevent to use global variables in configuration
|
changeset |
files
|
| Fri, 18 Nov 2011 17:32:57 +0100 |
laurent |
Fixing python plugin function block code to follow new macros defined in matiec accessor.h for setting variables
|
changeset |
files
|
| Wed, 16 Nov 2011 23:30:17 +0100 |
laurent |
Fixing bug preventing copy/cut/paste using shortcuts on CFileEditor text editors
|
changeset |
files
|
| Wed, 16 Nov 2011 23:28:42 +0100 |
laurent |
Fixing refresh of notebook tab titles after project save
|
changeset |
files
|
| Wed, 16 Nov 2011 17:47:13 +0100 |
Edouard Tisserant |
added -fPIC to satisfy X86_64 build
|
changeset |
files
|
| Wed, 16 Nov 2011 17:12:16 +0100 |
Edouard Tisserant |
fixed redondant ldflag and a typo in xenomai build
|
changeset |
files
|
| Wed, 16 Nov 2011 12:50:16 +0100 |
Edouard Tisserant |
Xenomai build now ignores xeno-config if not set
|
changeset |
files
|
| Tue, 08 Nov 2011 22:39:44 +0100 |
laurent |
Merging with Edouard's modifications
|
changeset |
files
|
| Tue, 08 Nov 2011 22:04:07 +0100 |
laurent |
Fixing bug in project modified state not well reported when modifications made in plugins informations
|
changeset |
files
|
| Tue, 08 Nov 2011 22:01:39 +0100 |
laurent |
Including external tools for editing plugin informations into Beremiz window
|
changeset |
files
|
| Mon, 17 Oct 2011 21:43:20 +0200 |
Edouard Tisserant |
fix unnecessary CanFestival plugin load in lpcberemiz
|
changeset |
files
|
| Mon, 17 Oct 2011 09:04:13 +0200 |
laurent |
Merging with Edouard's modifications
|
changeset |
files
|
| Fri, 14 Oct 2011 23:54:00 +0200 |
laurent |
Fix bug frame title not refreshed when the plugin attributes are modified
|
changeset |
files
|
| Fri, 14 Oct 2011 19:27:22 +0200 |
laurent |
Adding support for using keyboard to edit cfile interface variables displayed in Grid
|
changeset |
files
|
| Thu, 13 Oct 2011 13:49:40 +0200 |
Edouard Tisserant |
Fixed LPCBeremiz to refect recent root plugin build method name to change
|
changeset |
files
|
| Mon, 10 Oct 2011 00:19:40 +0200 |
Edouard Tisserant |
Updated console messages for build and stop
|
changeset |
files
|
| Sun, 09 Oct 2011 23:30:18 +0200 |
Edouard Tisserant |
A few new keyboard shortcuts : F4=stop, F5=run, F5=transfer, F7=connect
|
changeset |
files
|
| Thu, 06 Oct 2011 22:39:05 +0200 |
Edouard Tisserant |
runtime's process cwd should now be the same as provided working dir, fixin permission problem on W7
|
changeset |
files
|
| Fri, 30 Sep 2011 23:41:46 +0200 |
Edouard Tisserant |
Default gcc toolchain config now use 'gcc' for linking. Was left accidentally to g++ since old times of wxSVG based SVGUI. Cleaned up gcc parameters when linking
|
changeset |
files
|
| Fri, 30 Sep 2011 23:06:56 +0200 |
Edouard Tisserant |
Reverted win32 target default configuration to default gcc toolchain congig
|
changeset |
files
|
| Fri, 30 Sep 2011 17:12:27 +0200 |
laurent |
Fixes after moving xmlclass and docutils into plcopeneditor
|
changeset |
files
|
| Tue, 27 Sep 2011 18:27:14 +0200 |
Edouard Tisserant |
Fixed wrong bug report email
|
changeset |
files
|
| Mon, 26 Sep 2011 00:24:04 +0200 |
Edouard Tisserant |
fixed debug with xenomai, fixed unprotected access to ___debug_tick
|
changeset |
files
|
| Sun, 25 Sep 2011 22:51:51 +0200 |
Edouard Tisserant |
Xenomai Fix : runs, but still fail in debug
|
changeset |
files
|
| Thu, 22 Sep 2011 17:35:29 +0200 |
Edouard Tisserant |
Xenomai Fix : build
|
changeset |
files
|
| Thu, 22 Sep 2011 17:33:34 +0200 |
Edouard Tisserant |
added return type to suspendDebug
|
changeset |
files
|
| Thu, 22 Sep 2011 17:00:56 +0200 |
Edouard Tisserant |
fixed warnings in plc_python.c
|
changeset |
files
|
| Thu, 22 Sep 2011 16:59:59 +0200 |
Edouard Tisserant |
silence warnings while importing twisted
|
changeset |
files
|
| Thu, 08 Sep 2011 20:25:44 +0200 |
laurent |
Fix debugger bug after merging matiec repositories
|
changeset |
files
|
| Wed, 07 Sep 2011 16:01:13 +0200 |
laurent |
Disabling definition of enumerated and structure variables for interfacing with PLC in c_ext plug-in
|
changeset |
files
|
| Fri, 24 Jun 2011 01:17:07 +0200 |
Edouard Tisserant |
changed bugreport address
|
changeset |
files
|
| Thu, 23 Jun 2011 17:51:28 +0200 |
Edouard Tisserant |
Updated release : Summer 2011 - 1.02 bugfix release
|
changeset |
files
|
| Tue, 24 May 2011 11:27:00 +0200 |
laurent |
Bug when changing parameters in TargetType section in Beremiz project configuration fixed
|
changeset |
files
|
| Tue, 24 May 2011 00:36:08 +0200 |
Edouard Tisserant |
Fixed runtime with twisted but without Wx (-x 0 -t 1), made non-Zeroconf a default option, i.e when -n not specified
|
changeset |
files
|
| Wed, 18 May 2011 14:46:27 +0200 |
Edouard Tisserant |
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
|
changeset |
files
|
| Wed, 18 May 2011 11:22:48 +0200 |
Edouard Tisserant |
memory located variables no behave like outputs, when forced
|
changeset |
files
|
| Wed, 18 May 2011 11:21:10 +0200 |
Edouard Tisserant |
added memory location support to C file pluguin
|
changeset |
files
|
| Mon, 16 May 2011 12:41:23 +0200 |
laurent |
Merged with Edouard's modifications
|
changeset |
files
|
| Mon, 16 May 2011 11:58:06 +0200 |
laurent |
Fix bug when debugging located variables of type memory (%M)
|
changeset |
files
|
| Tue, 26 Apr 2011 16:27:54 +0200 |
Edouard Tisserant |
Print binary size only in LPCBeremiz
|
changeset |
files
|
| Thu, 21 Apr 2011 12:35:27 +0200 |
laurent |
Adding save project before building on LPCBeremiz
|
changeset |
files
|
| Thu, 21 Apr 2011 11:06:43 +0200 |
laurent |
Adding support for saving frame size while closing and restore it at next launch
|
changeset |
files
|
| Tue, 19 Apr 2011 15:28:35 +0200 |
laurent |
Fix bug in LPCBeremiz marking any newly opened project as modified
|
changeset |
files
|
| Tue, 19 Apr 2011 11:52:49 +0200 |
laurent |
Adding warning message on LPCBeremiz when closing frame and program not saved
|
changeset |
files
|
| Mon, 04 Apr 2011 11:07:53 +0200 |
Edouard Tisserant |
Added support for handling ANY_DATE types in debugger type translation
|
changeset |
files
|
| Fri, 01 Apr 2011 17:23:04 +0200 |
laurent |
Bug in translation from timedelta to timespec fixed
|
changeset |
files
|
| Fri, 01 Apr 2011 16:17:38 +0200 |
edouard |
fixed typo in latest debugger changes
|
changeset |
files
|
| Thu, 31 Mar 2011 19:09:49 +0200 |
Edouard Tisserant |
Initial TIME support in debugger
|
changeset |
files
|
| Thu, 31 Mar 2011 19:04:03 +0200 |
Edouard Tisserant |
old typo
|
changeset |
files
|
| Thu, 31 Mar 2011 18:43:41 +0200 |
Edouard Tisserant |
Added build shortcut
|
changeset |
files
|
| Thu, 31 Mar 2011 12:09:38 +0200 |
laurent |
Adding support for disable language translation when default language not available in locale
|
changeset |
files
|
| Mon, 28 Mar 2011 11:42:06 +0200 |
Edouard Tisserant |
spring 2011 - 1.01 bugfix release
|
changeset |
files
|
| Mon, 28 Mar 2011 11:42:00 +0200 |
Edouard Tisserant |
Restore RefreshFileMenu in CFileEditor
|
changeset |
files
|
| Sun, 27 Mar 2011 16:16:55 +0200 |
laurent |
Merged with Edouard's modifications
|
changeset |
files
|
| Sun, 27 Mar 2011 15:57:05 +0200 |
laurent |
Bug in CFileEditor calling refresh of not used FileMenu fixed
|
changeset |
files
|
| Sat, 26 Mar 2011 22:53:10 +0100 |
Edouard Tisserant |
file menu with Save implementation in c_ext plugin
|
changeset |
files
|
| Sat, 26 Mar 2011 18:50:51 +0100 |
Edouqrd Tisserant |
Fixed exception when adding variables in C_ext plugin
|
changeset |
files
|
| Fri, 25 Mar 2011 17:43:40 +0100 |
Edouqrd Tisserant |
Fix typo in plc_debug.c
|
changeset |
files
|
| Wed, 16 Mar 2011 18:01:07 +0100 |
edouard |
Also retain when debugger is stalled
|
changeset |
files
|
| Wed, 16 Mar 2011 17:26:54 +0100 |
edouard |
More robust retain buffer validity management
|
changeset |
files
|
| Thu, 24 Feb 2011 15:54:45 +0100 |
edouard |
Retain variable for LPC
|
changeset |
files
|
| Wed, 23 Feb 2011 16:54:29 +0100 |
edouard |
Making debugger more stable with LPC
|
changeset |
files
|
| Tue, 22 Feb 2011 14:11:50 +0100 |
edouard |
LPC : Completed initial debug support
|
changeset |
files
|
| Fri, 18 Feb 2011 12:29:48 +0100 |
edouard |
Some typo fixes to make debug related methods in LPCAppOject stop throwing exceptions, less agressive error message when unplugging LPC
|
changeset |
files
|
| Thu, 17 Feb 2011 17:34:29 +0100 |
edouard |
Removed status polling for LPC, as status cannot change by itself, fixed MD5 comparison in app mode
|
changeset |
files
|
| Thu, 17 Feb 2011 17:04:10 +0100 |
edouard |
Prevent status polling to generate an error while PLC is being reset to bootloader mode
|
changeset |
files
|
| Thu, 17 Feb 2011 16:38:42 +0100 |
edouard |
Fixed MD5 computation for makefile based toolchain, helps avoiding unnecessary builds - continued
|
changeset |
files
|
| Thu, 17 Feb 2011 15:59:56 +0100 |
edouard |
Fixed MD5 computation for makefile based toolchain, helps avoiding unnecessary builds
|
changeset |
files
|
| Thu, 17 Feb 2011 10:11:04 +0100 |
edouard |
Debug switch (file in CWD). LPC : better MD5 handling, Run button in boot mode, handling data feedback in boot protocol
|
changeset |
files
|
| Thu, 03 Feb 2011 18:23:24 +0100 |
Edouqrd Tisserant |
LPC application mode IDLE comamnd is now the same as PLCID (0x07)
|
changeset |
files
|
| Thu, 03 Feb 2011 18:20:47 +0100 |
Edouqrd Tisserant |
LPC program transfer more verbose, test code added in __main__ of LPCBootProto
|
changeset |
files
|
| Tue, 01 Feb 2011 17:28:41 +0100 |
edouard |
Moved locales out of platform agnostic C template
|
changeset |
files
|
| Tue, 01 Feb 2011 11:05:07 +0100 |
edouard |
keep LPC in boot mode to give a chance to ask for a transfer
|
changeset |
files
|
| Wed, 17 Nov 2010 08:30:35 +0100 |
laurent |
Fix bug in LPCBeremiz that use input retrieve and publish code for ouput with the same location
|
changeset |
files
|
| Thu, 19 Aug 2010 16:08:12 +0200 |
laurent |
Adding german translations (thanks to anonymous contributor)
|
changeset |
files
|
| Fri, 04 Jun 2010 17:36:11 +0200 |
ed |
merge
|
changeset |
files
|
| Fri, 04 Jun 2010 16:11:19 +0200 |
Lolitech |
Better serial comm handling in LPC connector
|
changeset |
files
|
| Fri, 04 Jun 2010 17:04:25 +0200 |
laurent |
Fix MatchMD5 result if no serial connection available
|
changeset |
files
|
| Fri, 04 Jun 2010 15:39:14 +0200 |
laurent |
Fix bug on LPCConnector initial value
|
changeset |
files
|
| Fri, 04 Jun 2010 15:35:28 +0200 |
laurent |
Fix transfer button enable state and build button state
|
changeset |
files
|
| Fri, 04 Jun 2010 15:17:48 +0200 |
laurent |
Fix buttons state according to online mode
|
changeset |
files
|
| Fri, 04 Jun 2010 15:16:23 +0200 |
Lolitech |
(no commit message)
|
changeset |
files
|
| Fri, 04 Jun 2010 15:11:27 +0200 |
Lolitech |
Removed PLCprint, not existing in LPC connector context.
|
changeset |
files
|
| Fri, 04 Jun 2010 14:59:11 +0200 |
Lolitech |
LPC Composer don't send comma at the end of serial port name.
|
changeset |
files
|
| Fri, 04 Jun 2010 14:58:24 +0200 |
Lolitech |
Disabled logging commands into files
|
changeset |
files
|
| Fri, 04 Jun 2010 14:58:03 +0200 |
Lolitech |
Fixed PLC status bytes values
|
changeset |
files
|
| Fri, 04 Jun 2010 13:47:02 +0200 |
laurent |
Move init code from variable to module
|
changeset |
files
|
| Fri, 04 Jun 2010 13:09:35 +0200 |
laurent |
Bug with recv from socket fixed
|
changeset |
files
|
| Fri, 04 Jun 2010 11:27:00 +0200 |
laurent |
Adding support for command line communication by socket instead of stdin/stdout
|
changeset |
files
|
| Fri, 04 Jun 2010 09:02:22 +0200 |
laurent |
Adding support for initialize all LPC module variables even if not used
|
changeset |
files
|
| Thu, 03 Jun 2010 17:26:47 +0200 |
Lolitech |
Fixed bug on frame close.
|
changeset |
files
|
| Thu, 03 Jun 2010 17:23:11 +0200 |
Lolitech |
Some fixes in LPCApp{Obj,Proto}, to be continued.
|
changeset |
files
|
| Thu, 03 Jun 2010 17:21:40 +0200 |
Lolitech |
Reorganization of threading for command line and wx main loops. Commands are now cleanly serialized through calls to wx.CallAfter. wx mainloop now runs on main thread.
|
changeset |
files
|
| Thu, 03 Jun 2010 17:17:51 +0200 |
Lolitech |
Safer passing of PLC ID to make command line.
|
changeset |
files
|
| Thu, 03 Jun 2010 12:57:28 +0200 |
Lolitech |
Refactored LPC connector for new bootloader and application modes
|
changeset |
files
|
| Thu, 03 Jun 2010 12:56:21 +0200 |
Lolitech |
Removed boring PLC/build compare messages.
|
changeset |
files
|
| Thu, 03 Jun 2010 12:54:45 +0200 |
Lolitech |
Disabled boring standard conformance checks, fixed possible race condition with StatusTimer, fixed warning message in AbortTransfer
|
changeset |
files
|
| Wed, 02 Jun 2010 16:53:38 +0200 |
laurent |
changes merged
|
changeset |
files
|
| Wed, 02 Jun 2010 16:52:58 +0200 |
laurent |
Adding compile button when unconnected
|
changeset |
files
|
| Wed, 02 Jun 2010 16:40:06 +0200 |
Lolitech |
Overloaded GetBinaryCode in LPC connector returns ready to send over serial binary
|
changeset |
files
|
| Wed, 02 Jun 2010 16:35:00 +0200 |
laurent |
Modifying LPCBeremiz to launch silently a frame and show or hide it on demand.
|
changeset |
files
|
| Wed, 02 Jun 2010 10:08:58 +0200 |
edouard |
Moved LPC specific code from toolchain_makefile into LPC target, added FROM_BEREMIZ variable to tell LPC's makefile it is invoked from here.
|
changeset |
files
|
| Tue, 01 Jun 2010 13:08:13 +0200 |
Lolitech |
merge
|
changeset |
files
|
| Tue, 01 Jun 2010 11:24:09 +0200 |
Lolitech |
Cosmetix fixes for LPC tests/build
|
changeset |
files
|
| Tue, 01 Jun 2010 10:03:58 +0200 |
lolitech |
merge with forgoten rev
|
changeset |
files
|
| Wed, 16 Dec 2009 15:21:17 +0100 |
laurent |
Bug on FileMenu not refreshed when modifications fixed
|
changeset |
files
|
| Fri, 25 Dec 2009 13:08:20 +0100 |
Edouard TISSERANT |
Christmas 2009 release
|
changeset |
files
|
| Wed, 23 Dec 2009 22:23:02 +0100 |
Edouard TISSERANT |
Fixed startin debugger with non empty debug variable list
|
changeset |
files
|
| Wed, 16 Dec 2009 15:09:12 +0100 |
laurent |
Changes merged
|
changeset |
files
|
| Wed, 16 Dec 2009 15:08:38 +0100 |
laurent |
Bug when trying to generate LPCBus code fixed
|
changeset |
files
|
| Wed, 16 Dec 2009 15:07:47 +0100 |
laurent |
Bug when try to SaveAs on Windows fixed
|
changeset |
files
|
| Wed, 16 Dec 2009 14:53:36 +0100 |
Edouard TISSERANT |
merge
|
changeset |
files
|
| Wed, 16 Dec 2009 14:13:55 +0100 |
tkragelj |
Changes merged
|
changeset |
files
|
| Wed, 16 Dec 2009 14:12:47 +0100 |
tkragelj |
Added flush when printing to standard output.
|
changeset |
files
|
| Wed, 16 Dec 2009 14:51:28 +0100 |
Edouard TISSERANT |
LPCobject writes PLC info string to stdout, for LPC composer to update
|
changeset |
files
|
| Wed, 16 Dec 2009 13:37:50 +0100 |
laurent |
Update french translation after modifications
|
changeset |
files
|
| Wed, 16 Dec 2009 13:26:59 +0100 |
laurent |
Bug when pyserial not available fixed
|
changeset |
files
|
| Tue, 15 Dec 2009 20:51:51 +0100 |
laurent |
Adding CheckRetainBuffer into plc_Linux_main.c
|
changeset |
files
|
| Tue, 15 Dec 2009 18:24:50 +0100 |
edouard |
LPC transfer tested, added PLCInfo along MD5 checksum while invoking makefile
|
changeset |
files
|
| Tue, 15 Dec 2009 16:04:28 +0100 |
edouard |
Fixed typos in LPC connector
|
changeset |
files
|
| Tue, 15 Dec 2009 15:39:39 +0100 |
laurent |
Adding message to standard output to signal when LPCBeremiz is closed
|
changeset |
files
|
| Tue, 15 Dec 2009 15:35:02 +0100 |
edouard |
Fixed confusion about __common_ticktime type, redesigned LPC PLC timer support
|
changeset |
files
|
| Tue, 15 Dec 2009 14:40:45 +0100 |
laurent |
Bug when changing LPCBeremiz OnlineMode fixed
|
changeset |
files
|
| Tue, 15 Dec 2009 14:40:18 +0100 |
laurent |
Reset connector when disconnected
|
changeset |
files
|
| Tue, 15 Dec 2009 10:06:01 +0100 |
laurent |
Changes merged
|
changeset |
files
|
| Tue, 15 Dec 2009 10:04:33 +0100 |
laurent |
Bug on LPCBeremiz when wxPopen asking for Yield after reopening of a Beremiz window fixed
|
changeset |
files
|
| Tue, 15 Dec 2009 10:01:26 +0100 |
laurent |
Split BottomNoteBook to make LogConsole always visible
|
changeset |
files
|
| Mon, 14 Dec 2009 21:05:10 +0100 |
edouard |
Improved CanFEstival support for LPC - now build and link plugin generated files
|
changeset |
files
|
| Mon, 14 Dec 2009 11:03:59 +0100 |
laurent |
Adding support for hard forcing located output
|
changeset |
files
|
| Sat, 12 Dec 2009 20:51:56 +0100 |
laurent |
Getting default target when no target defined fixed
|
changeset |
files
|
| Sat, 12 Dec 2009 20:49:07 +0100 |
laurent |
Bug not refreshing FileMenu when saving fixed
|
changeset |
files
|
| Fri, 11 Dec 2009 16:39:20 +0100 |
edouard |
Revamped LPC connector and toolchain
|
changeset |
files
|
| Fri, 11 Dec 2009 13:04:22 +0100 |
laurent |
Bug on testing Retain and Force flags fixed
|
changeset |
files
|
| Fri, 11 Dec 2009 13:03:44 +0100 |
laurent |
Adding support for making distinction between external variables and located variables for forcing
|
changeset |
files
|
| Fri, 11 Dec 2009 13:02:30 +0100 |
laurent |
Adding support for refreshing FileMenu after plugin tree modification
|
changeset |
files
|
| Fri, 11 Dec 2009 08:49:32 +0100 |
edouard |
Fixed debug again, did some code tidying
|
changeset |
files
|
| Thu, 10 Dec 2009 17:36:37 +0100 |
edouard |
LPC build and protocol tweaks
|
changeset |
files
|
| Thu, 10 Dec 2009 14:57:27 +0100 |
edouard |
LPC connector - one step further
|
changeset |
files
|
| Thu, 10 Dec 2009 12:31:42 +0100 |
laurent |
Changes merged
|
changeset |
files
|
| Thu, 10 Dec 2009 12:30:49 +0100 |
laurent |
Adding support for defining mandatory parameters and creating blank xml file when there is nothing in the folder in LPCBeremiz
|
changeset |
files
|
| Thu, 10 Dec 2009 12:29:27 +0100 |
laurent |
Enable Save Menu item according to project modification state
|
changeset |
files
|
| Thu, 10 Dec 2009 10:13:37 +0100 |
edouard |
LPC src directory copy fix
|
changeset |
files
|
| Thu, 10 Dec 2009 10:12:28 +0100 |
edouard |
Typo in LPC
|
changeset |
files
|
| Thu, 10 Dec 2009 09:39:05 +0100 |
laurent |
Bug when creating new project after opening Beremiz without project defined fixed
|
changeset |
files
|
| Thu, 10 Dec 2009 09:35:39 +0100 |
laurent |
Bug when closing Beremiz without a project opened fixed
|
changeset |
files
|
| Thu, 10 Dec 2009 09:34:55 +0100 |
laurent |
Bug when opening with not empty buildpath parameter fixed
|
changeset |
files
|
| Wed, 09 Dec 2009 16:53:59 +0100 |
laurent |
Catch ProtocolError exception when connection failed
|
changeset |
files
|
| Wed, 09 Dec 2009 16:53:27 +0100 |
laurent |
Adding support for simulation in LPCBeremiz
|
changeset |
files
|
| Wed, 09 Dec 2009 16:52:46 +0100 |
laurent |
Error in value send when debugging forced external or located variable fixed
|
changeset |
files
|
| Wed, 09 Dec 2009 16:51:22 +0100 |
laurent |
One issue on SetDataProducer not handled fixed
|
changeset |
files
|
| Wed, 09 Dec 2009 16:46:59 +0100 |
laurent |
Name error in LPC target fixed
|
changeset |
files
|
| Wed, 09 Dec 2009 09:46:37 +0100 |
laurent |
Changes merged
|
changeset |
files
|
| Wed, 09 Dec 2009 09:46:13 +0100 |
laurent |
Adding support for receiving PLC state from LPCComposer
|
changeset |
files
|
| Wed, 09 Dec 2009 09:44:17 +0100 |
laurent |
Catch Pyro exception when connection closed and print message
|
changeset |
files
|
| Wed, 09 Dec 2009 09:43:21 +0100 |
laurent |
Bug that block SetVariableList on Linux fixed
|
changeset |
files
|
| Wed, 09 Dec 2009 09:41:00 +0100 |
Lolitech |
Fixed freeze on debug suspend.
|
changeset |
files
|
| Wed, 09 Dec 2009 01:11:48 +0100 |
edouard |
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
|
changeset |
files
|
| Wed, 09 Dec 2009 00:56:18 +0100 |
edouard |
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
|
changeset |
files
|
| Tue, 08 Dec 2009 17:09:25 +0100 |
laurent |
Bug on SFC debugging fixed
|
changeset |
files
|
| Tue, 08 Dec 2009 16:28:10 +0100 |
laurent |
Bug on SFC debugging fixed
|
changeset |
files
|
| Tue, 08 Dec 2009 16:27:27 +0100 |
laurent |
Bug on RegisterDebugVariable when no PLC running fixed
|
changeset |
files
|
| Tue, 08 Dec 2009 12:54:28 +0100 |
laurent |
Replacing target_Makefile by target_LPC
|
changeset |
files
|
| Mon, 07 Dec 2009 22:04:43 +0100 |
Edouard TISSERANT |
Arbitrary variable forcing
|
changeset |
files
|
| Mon, 07 Dec 2009 21:27:23 +0100 |
laurent |
Bug on passing forced values to DataConsumer fixed
|
changeset |
files
|
| Mon, 07 Dec 2009 21:15:30 +0100 |
laurent |
Bug on forcing variable value fixed
|
changeset |
files
|
| Mon, 07 Dec 2009 20:41:42 +0100 |
laurent |
Adding command to PLC for forcing PLC variable
|
changeset |
files
|
| Mon, 07 Dec 2009 14:44:58 +0100 |
laurent |
Changes merged
|
changeset |
files
|
| Mon, 07 Dec 2009 14:43:27 +0100 |
laurent |
Adding support for defining input and output with the same location in LPCBeremiz
|
changeset |
files
|
| Mon, 07 Dec 2009 14:00:33 +0100 |
edouard |
merge
|
changeset |
files
|
| Mon, 07 Dec 2009 13:55:52 +0100 |
edouard |
Reverted back python test accidentally modified...
|
changeset |
files
|
| Mon, 07 Dec 2009 13:55:13 +0100 |
edouard |
Propagated new runtime changes to win32 target
|
changeset |
files
|
| Mon, 07 Dec 2009 10:25:33 +0100 |
laurent |
Bug when updating Variable locations fixed
|
changeset |
files
|
| Mon, 07 Dec 2009 10:08:12 +0100 |
Edouard TISSERANT |
Fixed typo PLCobject C fallback interface
|
changeset |
files
|
| Sun, 06 Dec 2009 23:05:47 +0100 |
Edouard TISSERANT |
Fixed remaining thread on close frame
|
changeset |
files
|
| Sun, 06 Dec 2009 22:52:51 +0100 |
Edouard TISSERANT |
Fixes in debug + reconnect to running PLC
|
changeset |
files
|
| Sun, 06 Dec 2009 21:43:34 +0100 |
Edouard TISSERANT |
Fixes in run : messages and refresh
|
changeset |
files
|
| Sun, 06 Dec 2009 21:20:21 +0100 |
laurent |
Adding support for forcing PLC variable (still command to PLC to implement)
|
changeset |
files
|
| Sun, 06 Dec 2009 21:03:10 +0100 |
Edouard TISSERANT |
Now debug is not a button anymore
|
changeset |
files
|
| Sun, 06 Dec 2009 19:39:24 +0100 |
Edouard TISSERANT |
Safer debug
|
changeset |
files
|
| Sun, 06 Dec 2009 19:06:36 +0100 |
Edouard TISSERANT |
Safer debug unpack result checking, more verbose error message, slower retry when waiting PLC startup
|
changeset |
files
|
| Sun, 06 Dec 2009 18:52:50 +0100 |
Edouard TISSERANT |
Fix debug crash
|
changeset |
files
|
| Sun, 06 Dec 2009 17:45:36 +0100 |
Edouard TISSERANT |
Debugger still doesn't work crash less...
|
changeset |
files
|
| Sun, 06 Dec 2009 15:58:33 +0100 |
ed |
Fixes
|
changeset |
files
|
| Sun, 06 Dec 2009 15:56:44 +0100 |
ed |
Typo about autorise console
|
changeset |
files
|
| Sun, 06 Dec 2009 15:55:56 +0100 |
ed |
Refactoring in PLCobject, for PLC that do not use python plugin
|
changeset |
files
|
| Sun, 06 Dec 2009 15:54:22 +0100 |
ed |
Made python plugin comaptible with accessors
|
changeset |
files
|
| Fri, 04 Dec 2009 15:16:37 +0100 |
edouard |
LPC connector enhancements
|
changeset |
files
|
| Fri, 04 Dec 2009 15:15:57 +0100 |
edouard |
Reflect changes in iec type definitions in matiec/lib
|
changeset |
files
|
| Fri, 04 Dec 2009 15:14:32 +0100 |
edouard |
Fixed automatic console rising on w32
|
changeset |
files
|
| Wed, 02 Dec 2009 20:22:28 +0100 |
Edouard TISSERANT |
Preliminary accessor support for debug
|
changeset |
files
|
| Wed, 02 Dec 2009 13:07:57 +0100 |
Edouard TISSERANT |
merge
|
changeset |
files
|
| Tue, 01 Dec 2009 13:48:47 +0100 |
ed |
Some rough copy'n'paste to pave path for an LPC connector
|
changeset |
files
|
| Tue, 01 Dec 2009 13:45:49 +0100 |
Edouard TISSERANT |
Merge
|
changeset |
files
|
| Tue, 01 Dec 2009 13:41:29 +0100 |
ed |
Some cleanup in PLC status - removed that \"Starting\" state ...
|
changeset |
files
|
| Wed, 02 Dec 2009 10:24:09 +0100 |
berem |
Bug when asking two consecutive times 'Show' fixed
|
changeset |
files
|
| Tue, 01 Dec 2009 11:00:02 +0100 |
laurent |
Adding support for updating or removing located variables by their address or leading address numbers when changing or removing VariableTree element
|
changeset |
files
|
| Tue, 01 Dec 2009 10:59:17 +0100 |
laurent |
Adding support for updating located variables when changing plugin IEC_Channel
|
changeset |
files
|
| Mon, 30 Nov 2009 10:13:36 +0100 |
laurent |
Adding Beremiz LPCComposer specific file
|
changeset |
files
|
| Sun, 29 Nov 2009 18:57:49 +0100 |
Edouard TISSERANT |
added files to ignore in hgignore
|
changeset |
files
|
| Sun, 29 Nov 2009 18:06:38 +0100 |
ed |
Some misc cleanup
|
changeset |
files
|
| Sun, 29 Nov 2009 16:34:02 +0100 |
laurent |
Adding support for defining user icons on VariableLocationTree
|
changeset |
files
|
| Sun, 29 Nov 2009 16:32:52 +0100 |
laurent |
Bug when trying to hide SVG elements fixed
|
changeset |
files
|
| Sun, 29 Nov 2009 16:31:14 +0100 |
laurent |
Redesign test SVGUI interface
|
changeset |
files
|
| Mon, 02 Nov 2009 17:41:12 +0100 |
edouard |
Wiped out references to Lolitech
|
changeset |
files
|
| Mon, 02 Nov 2009 15:38:49 +0100 |
edouard |
Merge with 092060fd8afb1d950fe467724ce0209bddc48716
|
changeset |
files
|
| Mon, 02 Nov 2009 11:57:29 +0100 |
greg |
Replace \"lolitech\" contact by \"edouard\" contact
|
changeset |
files
|
| Wed, 28 Oct 2009 11:42:47 +0100 |
greg |
Merge with 5981ad8547f5bcfe2e9c93b7973fbca79178487f
|
changeset |
files
|
| Wed, 28 Oct 2009 11:38:23 +0100 |
greg |
Add Beremiz shortcuts in menu on linux platform
|
changeset |
files
|
| Tue, 27 Oct 2009 16:32:54 +0100 |
edouard |
Updated ShowVar icon
|
changeset |
files
|
| Tue, 27 Oct 2009 16:24:15 +0100 |
laurent |
Allowing unicode characters to be used in comments
|
changeset |
files
|
| Mon, 26 Oct 2009 11:20:16 +0100 |
laurent |
Adding support for asking for saving while trying to close a modified project in any case
|
changeset |
files
|
| Fri, 23 Oct 2009 18:45:24 +0200 |
laurent |
Update internationalization for new functionalities.
|
changeset |
files
|
| Fri, 23 Oct 2009 15:41:48 +0200 |
greg |
Check ProjectPath write permission
|
changeset |
files
|
| Thu, 22 Oct 2009 17:20:24 +0200 |
laurent |
Bugs with TextCtrlAutoComplete on Windows fixed
|
changeset |
files
|
| Thu, 22 Oct 2009 11:28:11 +0200 |
greg |
Add new target (Makefile)
|
changeset |
files
|
| Thu, 22 Oct 2009 11:27:30 +0200 |
greg |
support for passing list command to ProcessLogger
|
changeset |
files
|
| Thu, 22 Oct 2009 11:26:45 +0200 |
greg |
Fix some warnings during compilation
|
changeset |
files
|
| Mon, 19 Oct 2009 16:26:15 +0200 |
laurent |
Bug when importing Beremiz without wx.App declared fixed
|
changeset |
files
|
| Mon, 19 Oct 2009 16:03:46 +0200 |
laurent |
Bugs with logger and stand-alone PluginRoot fixed
|
changeset |
files
|
| Fri, 16 Oct 2009 10:50:16 +0200 |
'Laurent Bessard |
Greg changes merged
|
changeset |
files
|
| Fri, 16 Oct 2009 10:37:53 +0200 |
laurent |
Warning in c_ext compiling fixed
|
changeset |
files
|
| Thu, 15 Oct 2009 17:39:26 +0200 |
greg |
Fix relative matiec path problem
|
changeset |
files
|
| Thu, 15 Oct 2009 10:11:07 +0200 |
laurent |
Adding support for declaring PluginRoot outside of Beremiz
|
changeset |
files
|
| Fri, 09 Oct 2009 17:52:00 +0200 |
laurent |
Orthographic mistake in french internationalization fixed
|
changeset |
files
|
| Fri, 09 Oct 2009 17:38:17 +0200 |
laurent |
improved english spelling and grammar and internationalization updated
|
changeset |
files
|
| Thu, 08 Oct 2009 16:37:58 +0200 |
laurent |
Move Debug message disabled message at the right place
|
changeset |
files
|
| Thu, 08 Oct 2009 16:37:06 +0200 |
laurent |
Removing superfluous event.Skip() in MenuEvent callback functions
|
changeset |
files
|
| Thu, 08 Oct 2009 12:36:55 +0200 |
laurent |
Bug on canopen tests (not being multi-platform) fixed
|
changeset |
files
|
| Thu, 08 Oct 2009 11:26:40 +0200 |
laurent |
Bug on Debug trying to start (and stop) before PLC started fixed.
|
changeset |
files
|
| Thu, 08 Oct 2009 11:09:01 +0200 |
laurent |
Remove testing printings in svgui module of python plugin
|
changeset |
files
|
| Thu, 08 Oct 2009 11:04:06 +0200 |
laurent |
Allowing multiple Beremiz_service instances to run on same target.
|
changeset |
files
|
| Thu, 08 Oct 2009 11:01:19 +0200 |
laurent |
Bug on DebugVariablePanel when opening project at start fixed
|
changeset |
files
|
| Wed, 07 Oct 2009 09:03:15 +0200 |
laurent |
Bug while trying to import SVG file fixed
|
changeset |
files
|
| Tue, 06 Oct 2009 12:10:46 +0200 |
laurent |
Bug when expanded and collapsing plugin tree fixed
|
changeset |
files
|
| Tue, 06 Oct 2009 11:55:32 +0200 |
laurent |
Bugs when expanded and collapsing plugin tree and location tree fixed
|
changeset |
files
|
| Tue, 06 Oct 2009 11:13:13 +0200 |
laurent |
Bugs when expanded and collapsing location tree fixed
|
changeset |
files
|
| Fri, 02 Oct 2009 11:25:35 +0200 |
laurent |
Removing memory leak while closing PluginsRoot
|
changeset |
files
|
| Sat, 26 Sep 2009 18:44:25 +0200 |
laurent |
Bugs on displaying plugin available variables in PluginTree fixed
|
changeset |
files
|
| Thu, 24 Sep 2009 18:27:45 +0200 |
laurent |
Adding support for displaying plugins available variable into Beremiz plugin tree
|
changeset |
files
|
| Thu, 24 Sep 2009 18:26:11 +0200 |
laurent |
Bug on return debug tick test fixed
|
changeset |
files
|
| Thu, 24 Sep 2009 18:22:31 +0200 |
laurent |
Merging some improvements from BCT
|
changeset |
files
|
| Mon, 21 Sep 2009 12:12:08 +0200 |
'Laurent Bessard |
Changes merged
|
changeset |
files
|
| Mon, 21 Sep 2009 12:00:52 +0200 |
laurent |
Adding support for forcing tick count to return to zero as the same time than all tasks firing are synchronized
|
changeset |
files
|
| Mon, 21 Sep 2009 11:56:55 +0200 |
laurent |
Many bugs on PLCOpenEditor integration fixed
|
changeset |
files
|
| Wed, 16 Sep 2009 14:06:50 +0200 |
laurent |
Integrate PLCOpenEditor into Beremiz frame
|
changeset |
files
|
| Wed, 16 Sep 2009 14:00:56 +0200 |
laurent |
Bug on debug buffer test resulting in not transmitting debug data under specific conditions fixed
|
changeset |
files
|
| Wed, 16 Sep 2009 13:54:57 +0200 |
laurent |
Remove dirtylibs test while freeing plc libs in PLCObject.py
|
changeset |
files
|
| Fri, 04 Sep 2009 17:33:51 +0200 |
laurent |
Redesign DiscoveryDialog class to conform to others dialogs
|
changeset |
files
|
| Fri, 18 Sep 2009 14:58:22 +0200 |
greg |
fix runtime.py filename case to avoid problem on multi-platform
|
changeset |
files
|
| Fri, 18 Sep 2009 14:30:57 +0200 |
greg |
Fix defaults compiler and linker names for win32
|
changeset |
files
|
| Fri, 04 Sep 2009 11:24:25 +0200 |
laurent |
Bug wrong control state while refreshing interface fixed
|
changeset |
files
|
| Thu, 03 Sep 2009 12:09:39 +0200 |
laurent |
Bug with creating or opening a project not closing windows of current opened project fixed
|
changeset |
files
|
| Thu, 03 Sep 2009 11:28:46 +0200 |
laurent |
Clean test_svgui removing useless buttons and drawing and choosing universal fonts
|
changeset |
files
|
| Wed, 02 Sep 2009 13:38:47 +0200 |
laurent |
Applying patch from Iztok for old gcc versions
|
changeset |
files
|
| Tue, 01 Sep 2009 10:45:07 +0200 |
laurent |
Updating windows test for new python plugin and svgui module
|
changeset |
files
|
| Tue, 01 Sep 2009 10:41:50 +0200 |
laurent |
Bug on windows when trying to open wxglade generated 'hmi.py' file fixed
|
changeset |
files
|
| Tue, 01 Sep 2009 10:40:11 +0200 |
laurent |
Fix non-destroyed dialog in 'OnOpenProject' if 'Cancel' selected
|
changeset |
files
|
| Thu, 27 Aug 2009 12:47:40 +0200 |
laurent |
Close PLC editing and PLC debugging frames while closing project
|
changeset |
files
|
| Fri, 14 Aug 2009 16:26:19 +0200 |
laurent |
Improving support for svgui, separating setting end getting attributes functions from creating function.
|
changeset |
files
|
| Thu, 13 Aug 2009 11:48:55 +0200 |
edouard |
Merge with 35cc4c6a29363d0a89f3e1096832cf14bb79f3de
|
changeset |
files
|
| Thu, 13 Aug 2009 11:37:38 +0200 |
edouard |
Merge with 75ae46b66315975b49ec48574befa094be583fdd
|
changeset |
files
|
| Wed, 12 Aug 2009 16:23:59 -0600 |
b taylor |
merged greg's recent commits
|
changeset |
files
|
| Wed, 12 Aug 2009 16:18:57 -0600 |
b taylor |
remove code that i was using for testing.
|
changeset |
files
|
| Wed, 12 Aug 2009 16:09:00 -0600 |
b taylor |
merged in cherry-picked service discovery changes
|
changeset |
files
|
| Wed, 12 Aug 2009 15:20:51 -0600 |
b taylor |
fix discovery dialog sorting, remove services from the discovery dialog when they go offline
cherry-pick
|
changeset |
files
|
| Wed, 12 Aug 2009 13:43:58 -0600 |
b taylor |
bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered.
cherry-pick
|
changeset |
files
|
| Wed, 12 Aug 2009 13:40:20 -0600 |
b taylor |
fix pyZeroconf bug where getServiceInfo returns None.
cherry-pick
|
changeset |
files
|
| Mon, 10 Aug 2009 11:35:14 +0200 |
edouard |
Added ShowMaster button icon for Canfestival plugin
|
changeset |
files
|
| Wed, 12 Aug 2009 11:46:22 +0200 |
laurent |
Adding new svgui support using twisted website HMI
|
changeset |
files
|
| Wed, 12 Aug 2009 11:43:40 +0200 |
laurent |
Removing old svgui support using wxsvg
|
changeset |
files
|
| Wed, 12 Aug 2009 11:40:26 +0200 |
laurent |
Adding support for twisted website HMI
|
changeset |
files
|
| Mon, 10 Aug 2009 14:42:54 +0200 |
laurent |
Adding support for twisted website HMI
|
changeset |
files
|
| Fri, 07 Aug 2009 18:27:50 +0200 |
laurent |
Adding support for python plugin wxglade_hmi allowing creation of PLC HMI using wxglade
|
changeset |
files
|
| Wed, 29 Jul 2009 15:17:10 +0200 |
laurent |
Move python evaluator to create a python plugin containing any related python module
|
changeset |
files
|
| Wed, 29 Jul 2009 10:49:31 +0200 |
laurent |
Bug extra_files deletion in working directory fixed
|
changeset |
files
|
| Wed, 29 Jul 2009 10:48:02 +0200 |
laurent |
Bug extra_files deletion in working directory fixed
|
changeset |
files
|
| Wed, 29 Jul 2009 10:30:19 +0200 |
laurent |
Adding support for recursively generate STLibrary and BlockLibrary according to plugin tree
|
changeset |
files
|
| Wed, 29 Jul 2009 10:27:23 +0200 |
laurent |
Adding support for internationalization
|
changeset |
files
|
| Tue, 28 Jul 2009 17:43:19 +0200 |
laurent |
Adding support for internationalization
|
changeset |
files
|
| Mon, 20 Jul 2009 16:28:56 +0200 |
greg |
update cf_runtime.c (now call TimerInit and TimerCleanup on win32 platform)
|
changeset |
files
|
| Fri, 10 Jul 2009 11:39:43 +0200 |
'Gr?gory Tr?lat |
prevent eclipse to push .project with .hgignore
|
changeset |
files
|
| Fri, 10 Jul 2009 11:06:30 +0200 |
'Gr?gory Tr?lat |
removed dead hidden files
|
changeset |
files
|
| Mon, 06 Jul 2009 11:27:06 -0600 |
btaylor |
close ZeroConf object when exiting the Service Discovery window.
|
changeset |
files
|
| Tue, 09 Jun 2009 10:10:34 +0200 |
lbessard |
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
|
changeset |
files
|
| Sat, 30 May 2009 17:09:07 +0200 |
greg |
Fix refresh of Beremiz button when connection lost
|
changeset |
files
|
| Sat, 30 May 2009 16:45:31 +0200 |
greg |
Fix refresh of Beremiz button when connection lost
|
changeset |
files
|
| Sat, 30 May 2009 16:44:07 +0200 |
greg |
Adding Lock around C code called by Debug thread
|
changeset |
files
|
| Thu, 28 May 2009 17:29:19 +0200 |
greg |
fixed bug : Lock _FreePLC until _stopPLC finish
|
changeset |
files
|
| Thu, 28 May 2009 14:06:23 +0200 |
lbessard |
Adding support for matiec new command line syntax
|
changeset |
files
|
| Thu, 28 May 2009 13:40:29 +0200 |
greg |
- now call load, start, free PLC from the python Thread
|
changeset |
files
|
| Thu, 28 May 2009 13:29:23 +0200 |
greg |
add "\n" to logger when pyro fall in error
|
changeset |
files
|
| Thu, 28 May 2009 07:47:38 +0200 |
lbessard |
Bug while parsing long located variables in GetLocations fixed
|
changeset |
files
|
| Fri, 22 May 2009 10:27:55 +0200 |
greg |
remove french comment in python_gear block
|
changeset |
files
|
| Tue, 19 May 2009 09:18:50 +0200 |
greg |
add python_gear block (to execute python command each given cycle interval)
|
changeset |
files
|
| Mon, 18 May 2009 07:58:41 +0200 |
greg |
get the WaitPythonCommands return (semaphore error code) to quit python_iterator loop when semaphore is destroyed
|
changeset |
files
|
| Mon, 18 May 2009 07:47:24 +0200 |
greg |
Wait the debug thread has terminated before freeing PLC to avoid random segmentation fault.
|
changeset |
files
|
| Mon, 18 May 2009 07:43:03 +0200 |
greg |
Add try/except in wx_evaluator to get and print exception when command failed and unlock in all cases to not block the python thread
|
changeset |
files
|
| Mon, 04 May 2009 10:12:35 +0200 |
greg |
Replacing Debug rt_sem by rt_pipe
|
changeset |
files
|
| Mon, 04 May 2009 09:31:59 +0200 |
greg |
Get PDOmapping exception from canfestival plugin
|
changeset |
files
|
| Mon, 04 May 2009 09:31:16 +0200 |
greg |
Adding support for using only PDO define in EDS file and not configured for adding mapping in node
|
changeset |
files
|
| Mon, 04 May 2009 09:29:24 +0200 |
greg |
Adding support for updating PLC status when stopping
|
changeset |
files
|
| Mon, 04 May 2009 09:27:33 +0200 |
greg |
Adding support for enable/Disable plugins
|
changeset |
files
|
| Wed, 29 Apr 2009 12:29:12 +0200 |
greg |
Add LoliTech phone number in bug report
|
changeset |
files
|