# HG changeset patch # User Edouard Tisserant # Date 1361864237 -32400 # Node ID 52a17be9c4d17671016d24f1f3533fe217fac584 # Parent da7f80e04a544a2cb744320b07be90b040163f46 Introduce Beremiz Native POU library. Now LOGGER POU is part of Beremiz' native POU library diff -r da7f80e04a54 -r 52a17be9c4d1 .hgignore --- a/.hgignore Tue Feb 26 01:17:53 2013 +0100 +++ b/.hgignore Tue Feb 26 16:37:17 2013 +0900 @@ -1,14 +1,6 @@ .project syntax: regexp -^tests/canopen_slave/build$ -syntax: regexp -^tests/canopen_master/build$ -syntax: regexp -^tests/python/build$ -syntax: regexp -^tests/svgui/build$ -syntax: regexp -^tests/wxGlade/build$ +^tests/.*/build$ syntax: regexp ^.*\.pyc$ diff -r da7f80e04a54 -r 52a17be9c4d1 NativeLib.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/NativeLib.py Tue Feb 26 16:37:17 2013 +0900 @@ -0,0 +1,7 @@ +import os +from POULibrary import POULibrary + +class NativeLibrary(POULibrary): + def GetLibraryPath(self): + return os.path.join(os.path.split(__file__)[0], "NativeLib.xml") + diff -r da7f80e04a54 -r 52a17be9c4d1 NativeLib.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/NativeLib.xml Tue Feb 26 16:37:17 2013 +0900 @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r da7f80e04a54 -r 52a17be9c4d1 features.py --- a/features.py Tue Feb 26 01:17:53 2013 +0100 +++ b/features.py Tue Feb 26 16:37:17 2013 +0900 @@ -1,4 +1,5 @@ libraries = [ + ('Native', 'NativeLib.NativeLibrary'), ('Python', 'py_ext.PythonLibrary'), ('SVGUI', 'svgui.SVGUILibrary')] diff -r da7f80e04a54 -r 52a17be9c4d1 images/icons.svg --- a/images/icons.svg Tue Feb 26 01:17:53 2013 +0100 +++ b/images/icons.svg Tue Feb 26 16:37:17 2013 +0900 @@ -16,7 +16,7 @@ id="svg2" sodipodi:version="0.32" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="icons.svg" + sodipodi:docname="icons.svg.2013_02_08_17_20_04.0.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> @@ -26,7 +26,7 @@ image/svg+xml - + @@ -34,21 +34,21 @@ inkscape:window-height="1056" inkscape:window-width="1920" inkscape:pageshadow="2" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" guidetolerance="10.0" gridtolerance="10000" objecttolerance="10.0" borderopacity="1.0" bordercolor="#666666" - pagecolor="#ffffff" + pagecolor="#f2f1f0" id="base" showgrid="false" - inkscape:zoom="2.4861166" - inkscape:cx="360.7847" - inkscape:cy="154.51711" - inkscape:window-x="0" + inkscape:zoom="1" + inkscape:cx="590.30324" + inkscape:cy="563.15477" + inkscape:window-x="1920" inkscape:window-y="24" - inkscape:current-layer="g18993" + inkscape:current-layer="svg2" showguides="true" inkscape:guide-bbox="true" inkscape:window-maximized="1"> @@ -59,10 +59,6 @@ visible="true" enabled="true" snapvisiblegridlinesonly="true" /> - @@ -136,30 +132,6 @@ id="stop20080" /> - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Icons + + + - - - - + style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.10000000000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:8.59499931000000039;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 562,141.40625 -4,-0.0441 -2.5625,3.01282 -5.4375,0 0,1 5.4375,0 2.5625,2.98718 4,-0.0184 0,-3.46875 z m 1,0 0,3.46875 0,3.46875 4,0.0184 2.5625,-2.98718 4.4375,0 0,-1 -4.4375,0 L 567,141.36218 z" + id="path16742" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccccccc" /> + + + + + + + + + + + + + + + + + + + diff -r da7f80e04a54 -r 52a17be9c4d1 targets/plc_debug.c --- a/targets/plc_debug.c Tue Feb 26 01:17:53 2013 +0100 +++ b/targets/plc_debug.c Tue Feb 26 16:37:17 2013 +0900 @@ -312,7 +312,9 @@ #define LOG_INFO 2 #define LOG_DEBUG 3 +#ifndef LOG_BUFFER_SIZE #define LOG_BUFFER_SIZE (1<<14) /*16Ko*/ +#endif #define LOG_BUFFER_MASK (LOG_BUFFER_SIZE-1) static char LogBuff[LOG_LEVELS][LOG_BUFFER_SIZE]; void inline copy_to_log(uint8_t level, uint32_t buffpos, void* buf, uint32_t size){ diff -r da7f80e04a54 -r 52a17be9c4d1 tests/logging/beremiz.xml --- a/tests/logging/beremiz.xml Tue Feb 26 01:17:53 2013 +0100 +++ b/tests/logging/beremiz.xml Tue Feb 26 16:37:17 2013 +0900 @@ -1,4 +1,4 @@ - + diff -r da7f80e04a54 -r 52a17be9c4d1 tests/logging/plc.xml --- a/tests/logging/plc.xml Tue Feb 26 01:17:53 2013 +0100 +++ b/tests/logging/plc.xml Tue Feb 26 16:37:17 2013 +0900 @@ -8,7 +8,7 @@ productVersion="1" creationDateTime="2013-01-29T14:01:00"/> + modificationDateTime="2013-02-26T16:22:11"> @@ -22,66 +22,8 @@ - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -100,6 +42,14 @@ + + + + + + + + @@ -288,13 +238,15 @@ - + - + + + @@ -303,9 +255,9 @@ - - - + + + @@ -313,12 +265,25 @@ + + + + + + + + + + + + WARNING + @@ -328,7 +293,7 @@ - + diff -r da7f80e04a54 -r 52a17be9c4d1 tests/logging/py_ext_0@py_ext/py_ext.xml --- a/tests/logging/py_ext_0@py_ext/py_ext.xml Tue Feb 26 01:17:53 2013 +0100 +++ b/tests/logging/py_ext_0@py_ext/py_ext.xml Tue Feb 26 16:37:17 2013 +0900 @@ -7,7 +7,7 @@ def DoLog(): global MyT,Stop - MyT=threading.Timer(0.03, DoLog) + MyT=threading.Timer(0.3, DoLog) if not Stop : MyT.start() Stop = False PLCObject.LogMessage("Python side Logging")