Paul Beltyukov <beltyukov.p.a@gmail.com> [Mon, 12 Sep 2016 10:15:39 +0500] rev 1529
Merged skvorl/beremiz into default
alexander@macbook-pro-alexander.local [Sat, 10 Sep 2016 11:19:40 +0500] rev 1528
Fixed crash when starts on OS X with wxPython 3.0.x
Paul Beltyukov <beltyukov.p.a@gmail.com> [Fri, 09 Sep 2016 11:47:00 +0500] rev 1527
Merged skvorl/beremiz into default
alexander.shaykhrazeev@gmail.com <alexander.shaykhrazeev@gmail.com> [Fri, 26 Aug 2016 10:20:14 +0500] rev 1526
Added .idea dir to ignore.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 09 Sep 2016 17:57:36 +0300] rev 1525
cleanup logging example
add comments, rename variables, some rework for algorithm
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 09 Sep 2016 17:53:32 +0300] rev 1524
fix non-working logging at first connection to PLC after Beremiz launch
At the same time this helps to avoid exception described in 1484:d5efbb20927e.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 09 Sep 2016 13:39:24 +0300] rev 1523
Merged in Surkovsv/beremiz (pull request #2)
fix bug with non-editable names and types of FB local variables in POU's written in ST or IL
Sergey Surkov <surkovsv93@gmail.com> [Fri, 09 Sep 2016 13:33:49 +0300] rev 1522
fix bug with non-editable names and types of FB local variables in POU's written in ST or IL
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 05 Sep 2016 16:47:34 +0300] rev 1521
fix highlighting input/outputs in function call in ST, if comment section is placed
inside call.
For example:
PackOutputs(
W4 := OUT1,
W5 := OUT2,
W6 := OUT3,
W7 := OUT4,
W8 := OUT5 (* comment inside call *),
W9 := OUT6,
W10 := OUT7,
W11 := OUT8);
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 24 Aug 2016 13:08:13 +0300] rev 1520
add initialization tick time on Beremiz start
This fixes issue #6
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 24 Aug 2016 13:06:52 +0300] rev 1519
fix race condition in ProcessLogger
alexander@60.125.16.172.in-addr.arpa [Tue, 23 Aug 2016 10:24:47 +0500] rev 1518
- Fixed startup from ancestor code.
Paul Beltyukov [Thu, 18 Aug 2016 14:35:03 +0500] rev 1517
This fixes issue #5
andrey@new-nest [Fri, 06 May 2016 22:21:22 +0300] rev 1516
fix bug: Beremiz IDE hangs during launching Beremiz_service
this is regression introduced as side effect by d7f474d [fix issue
with sometimes wrong return code of ProcessLogger]
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 19:14:10 +0300] rev 1515
automatically detect flags supported by matiec and find correct path
for matiec C library files
This makes possible to use an old matiec and the new one.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 18:04:40 +0300] rev 1514
fix bug that appears if datatype in the project tree is renamed to wrong name (keyword, existend type,...)
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 16765, in <lambda>
lambda event: event.callable(*event.args, **event.kw) )
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/expando.py", line 126, in _adjustCtrl
numLines = self.GetNumberOfLines()
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 16710, in __getattr__
raise PyDeadObjectError(self.attrStr % self._name)
PyDeadObjectError: The C++ part of the TreeTextCtrl object has been deleted, attribute access no longer allowed.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 16:16:30 +0300] rev 1513
add distribution license notice to about dialog as GPL requires
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 14:45:06 +0300] rev 1512
add GPLv2 license
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 14:05:44 +0300] rev 1511
add copyright notices to python files where there were missing, that
is required by GPLv2
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 10:35:46 +0300] rev 1510
fix issue that was impossible to remove local instance of functional
block if pou is written in ST or IL
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 16:54:01 +0300] rev 1509
fix highlighting of multiline comments in ST and IL
close #2
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 15:21:02 +0300] rev 1508
fix error if non-latin character was entered in initial value in
data type element
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 575, in OnStructureElementsGridCellChange
value = self.StructureElementsTable.GetValue(row, col)
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 13:05:57 +0300] rev 1507
fix issue with sometimes wrong return code of ProcessLogger
As a result of wrong return code Beremiz gives folowing traceback:
Traceback (most recent call last):
File "./Beremiz.py", line 850, in OnMenu
getattr(self.CTR, method)()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 925, in _Build
IECGenRes = self._Generate_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 568, in _Generate_SoftPLC
return self._Compile_ST_to_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 661, in _Compile_ST_to_SoftPLC
C_files.remove("POUS.c")
ValueError: list.remove(x): x not in list
The problem is that both threads (for reading stdout and stderr) call self.Proc.poll(),
that updates internal returncode field. This call is done without any locking and the first thread gets correct result,
but other gets 0 as retval. If 0 gets thread, that afterwards calls callback finish, then wrong return code is returned
to the parent. Now only the thread with a callback polls for the return code, other thread just checked local value.
Additionally function spin() waits now until all threads finish reading their pipes, so the results are always correct.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 12:58:58 +0300] rev 1506
Fix error about missing attribute 'timeout' that happens sometimes during compilation
The fix [1476:49f1763a5613] of the problem with following trace was wrong.
Traceback (most recent call last):
File "./Beremiz.py", line 1229, in run_with_except_hook
run_old(*args, **kw)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 68, in run
self.endcallback(self.Proc.pid, err)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 169, in finish
if self.timeout: self.timeout.cancel()
AttributeError: ProcessLogger instance has no attribute 'timeout'
The problem was that compilation process was finished before the timeout attribute is set.
Now timeout is set before launcing of compilation process.