# HG changeset patch
# User Edouard Tisserant
# Date 1434746195 -7200
# Node ID 68ba08b3a152ffe7233b69ec49c12de806df31e0
# Parent 805826ba48c5cf08018ab3ad704b361fc5ff6134# Parent de311ffe3961dbda2248f9785fd06e37ad1976ff
Merged
diff -r de311ffe3961 -r 68ba08b3a152 targets/Win32/plc_Win32_main.c
--- a/targets/Win32/plc_Win32_main.c Fri Jun 19 09:34:18 2015 +0200
+++ b/targets/Win32/plc_Win32_main.c Fri Jun 19 22:36:35 2015 +0200
@@ -76,8 +76,6 @@
BOOL tmp;
setlocale(LC_NUMERIC, "C");
- InitializeCriticalSection(&Atomic64CS);
-
debug_sem = CreateSemaphore(
NULL, // default security attributes
1, // initial count
@@ -170,7 +168,6 @@
CloseHandle(PLC_timer);
WaitForSingleObject(PLC_thread, INFINITE);
__cleanup();
- DeleteCriticalSection(&Atomic64CS);
CloseHandle(debug_wait_sem);
CloseHandle(debug_sem);
CloseHandle(python_wait_sem);
@@ -279,3 +276,16 @@
{
}
+static void __attribute__((constructor))
+beremiz_dll_init(void)
+{
+ InitializeCriticalSection(&Atomic64CS);
+
+}
+
+static void __attribute__((destructor))
+beremiz_dll_destroy(void)
+{
+ DeleteCriticalSection(&Atomic64CS);
+}
+
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/HMI@wxglade_hmi/baseconfnode.xml
--- a/tests/wxHMI/HMI@wxglade_hmi/baseconfnode.xml Fri Jun 19 09:34:18 2015 +0200
+++ b/tests/wxHMI/HMI@wxglade_hmi/baseconfnode.xml Fri Jun 19 22:36:35 2015 +0200
@@ -1,2 +1,2 @@
-
-
+
+
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/HMI@wxglade_hmi/pyfile.xml
--- a/tests/wxHMI/HMI@wxglade_hmi/pyfile.xml Fri Jun 19 09:34:18 2015 +0200
+++ b/tests/wxHMI/HMI@wxglade_hmi/pyfile.xml Fri Jun 19 22:36:35 2015 +0200
@@ -1,135 +1,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/beremiz.xml
--- a/tests/wxHMI/beremiz.xml Fri Jun 19 09:34:18 2015 +0200
+++ b/tests/wxHMI/beremiz.xml Fri Jun 19 22:36:35 2015 +0200
@@ -1,5 +1,5 @@
-
-
-
-
-
+
+
+
+
+
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/plc.xml
--- a/tests/wxHMI/plc.xml Fri Jun 19 09:34:18 2015 +0200
+++ b/tests/wxHMI/plc.xml Fri Jun 19 22:36:35 2015 +0200
@@ -1,592 +1,592 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Power_ON
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Power_OFF
-
-
-
-
-
-
-
-
-
-
-
-
- power
-
-
-
-
-
-
- DrawTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ZaxisPos
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- XaxisPos
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- tmp
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- tmp
-
-
-
-
-
-
-
-
-
-
-
-
- YaxisPos
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
-
-
-
-
-
-
- power
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BOOL#TRUE
-
-
-
-
-
-
- 'wxglade_hmi.UpdPos()'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- LocalVar0
-
-
-
-
-
-
-
-
-
-
-
-
- LocalVar1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Power_ON
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Power_OFF
+
+
+
+
+
+
+
+
+
+
+
+
+ power
+
+
+
+
+
+
+ DrawTest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ZaxisPos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ XaxisPos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ tmp
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ tmp
+
+
+
+
+
+
+
+
+
+
+
+
+ YaxisPos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+ power
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BOOL#TRUE
+
+
+
+
+
+
+ 'wxglade_hmi.UpdPos()'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ LocalVar0
+
+
+
+
+
+
+
+
+
+
+
+
+ LocalVar1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/Detect_Circle.png
Binary file tests/wxHMI/project_files/Detect_Circle.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/DrawEscher.png
Binary file tests/wxHMI/project_files/DrawEscher.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/DrawLogo.png
Binary file tests/wxHMI/project_files/DrawLogo.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/DrawTest.png
Binary file tests/wxHMI/project_files/DrawTest.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/Power_OFF.png
Binary file tests/wxHMI/project_files/Power_OFF.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/Power_ON.png
Binary file tests/wxHMI/project_files/Power_ON.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/TaxisMinus.png
Binary file tests/wxHMI/project_files/TaxisMinus.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/TaxisPlus.png
Binary file tests/wxHMI/project_files/TaxisPlus.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/XaxisMinus.png
Binary file tests/wxHMI/project_files/XaxisMinus.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/XaxisPlus.png
Binary file tests/wxHMI/project_files/XaxisPlus.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/YaxisMinus.png
Binary file tests/wxHMI/project_files/YaxisMinus.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/YaxisPlus.png
Binary file tests/wxHMI/project_files/YaxisPlus.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/ZaxisMinus.png
Binary file tests/wxHMI/project_files/ZaxisMinus.png has changed
diff -r de311ffe3961 -r 68ba08b3a152 tests/wxHMI/project_files/ZaxisPlus.png
Binary file tests/wxHMI/project_files/ZaxisPlus.png has changed