Merge branch 'feature/2.1.8-dev' into 'main'

PiXtend V2 CODESYS package version 2.1.8 for CODESYS V3.5 SP17 See merge request !2

Merge branch 'feature/2.1.8-dev' into 'main'
PiXtend V2 CODESYS package version 2.1.8 for CODESYS V3.5 SP17 See merge request !2
9aa08cda · Robin Turner · b4aaf43a · 240dda7e · 9aa08cda · 9aa08cda
Commit 9aa08cda authored Feb 18, 2022 by Robin Turner
--- a/LICENSE.md
+++ b/LICENSE.md
+MIT License
+
+Copyright (C) 2021 Kontron Electronics GmbH <support@pixtend.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The source for the demo projects can be obtained from:
+- PiXtend homepage: https://www.pixtend.de/downloads/
+- From the install folder of the PiXtend V2 Professional for CODESYS package on the users system.
+
+The MIT license does not apply to the PiXtend V2 IO-Drivers only to the examples which are provides in source code form. The PiXend V2 IO-Drivers only use components from CODESYS in binary form.
\ No newline at end of file
--- a/PiXtend_V2_Professional_for_CODESYS_V2_1_7.package
+++ b/PiXtend_V2_Professional_for_CODESYS_V2_1_7.package
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ This project contains the release versions of the PiXtend V2 CODESYS drivers and



-| Programming System              | CODESYS  Development System Version **3.5.15.10** or higher  |
+| Programming System              | CODESYS  Development System Version **3.5.17.0** or higher   |
 | ------------------------------- | ------------------------------------------------------------ |
-| Runtime System                  | CODESYS  Control Version **3.5.15.10**                       |
+| Runtime System                  | CODESYS  Control Version **4.1.0.0**                         |
 | Supported Platforms and Devices | • PiXtend  V2 -S- Hardware Rev. 2.1  micro-controller Firmware 4, Raspberry Pi Model  B+ / 2B / 3B / 3 B+ / 4B <br />•  PiXtend  V2 -L- Hardware Rev. 2.1 with micro-controller Firmware 1, Raspberry Pi Model  B+ / 2B / 3B / 3 B+ / 4 B <br /> • Not compatible with PiXtend V1.x<br />Note:  Use the project “Device Reader” to find out which function are supported by the plc. „Device Reader“ is available for fre in the CODESYS Store. |
-| Additional Requirements         | CODESYS  Control for Raspberry Pi – Version **3.5.15.10** or later |
+| Additional Requirements         | CODESYS  Control for Raspberry Pi – Version **4.1.0.0** or later |
 | Restrictions                    | -                                                            |
\ No newline at end of file
--- a/doc/LICENSE.txt
+++ b/doc/LICENSE.txt
+MIT License
+
+Copyright (C) 2021 Kontron Electronics GmbH <support@pixtend.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The source for the demo projects can be obtained from:
+- PiXtend homepage: https://www.pixtend.de/downloads/
+- From the install folder of the PiXtend V2 Professional for CODESYS package on the users system.
+
+The MIT license does not apply to the PiXtend V2 IO-Drivers only to the examples which are provides in source code form. The PiXend V2 IO-Drivers only use components from CODESYS in binary form.
\ No newline at end of file
--- a/doc/License_agreement_de.html
+++ b/doc/License_agreement_de.html
@@ -24,18 +24,15 @@
 /* Style Definitions */
 p.MsoNormal, li.MsoNormal, div.MsoNormal
 	{margin:0cm;
-	margin-bottom:.0001pt;
 	font-size:10.0pt;
 	font-family:"Times New Roman",serif;}
 p.MsoFooter, li.MsoFooter, div.MsoFooter
 	{margin:0cm;
-	margin-bottom:.0001pt;
 	font-size:10.0pt;
 	font-family:"Times New Roman",serif;}
 p.Formulartext, li.Formulartext, div.Formulartext
 	{mso-style-name:Formulartext;
 	margin:0cm;
-	margin-bottom:.0001pt;
 	text-align:justify;
 	punctuation-wrap:simple;
 	font-size:9.0pt;
@@ -58,7 +55,7 @@ ul

 </head>

-<body lang=DE>
+<body lang=DE style='word-wrap:break-word'>

 <div class=WordSection1>

@@ -189,10 +186,10 @@ font-family:"Arial",sans-serif'>&nbsp;</span></p>
 <p class=MsoNormal style='punctuation-wrap:simple'><span style='font-size:11.0pt;
 font-family:"Arial",sans-serif'>Die im Software Package enthaltenen Beispiele
 und die RC-Plug Bibliothek, die im Source-Code vorliegen, sind kostenfrei und
-unter der GNU Public Licence  GPL V3 lizensiert. Bei den Beispielprogrammen
-sowie der RC-Plug Bibliothek ist es gestattet diese bei Bedarf zu bearbeiten,
-zu verndern und an Ihre eigenen Bedrfnisse anzupassen, sofern dies im Rahmen
-der GPL V3 Lizenz erfolgt.</span></p>
+unter der MIT License lizensiert. Bei den Beispielprogrammen sowie der RC-Plug
+Bibliothek ist es gestattet diese bei Bedarf zu bearbeiten, zu verndern und an
+Ihre eigenen Bedrfnisse anzupassen, sofern dies im Rahmen der MIT Lizenz
+erfolgt.</span></p>

 <p class=MsoNormal style='punctuation-wrap:simple'><span style='font-size:11.0pt;
 font-family:"Arial",sans-serif'>&nbsp;</span></p>
@@ -343,7 +340,7 @@ color:red'>&nbsp;</span></p>
 Haftung ist im Falle leichter Fahrlssigkeit summenmig beschrnkt auf die
 Hhe des vorhersehbaren Schadens, mit dessen Entstehung typischerweise
 gerechnet werden muss; maximal ist diese Haftung jedoch beschrnkt auf
-insgesamt EUR&nbsp;10.000, aus dem Vertragsverhltnis.</span></p>
+insgesamt EUR 10.000, aus dem Vertragsverhltnis.</span></p>

 <p class=Formulartext><span style='font-size:11.0pt'>&nbsp;</span></p>


--- a/doc/License_agreement_en.html
+++ b/doc/License_agreement_en.html
@@ -24,12 +24,10 @@
 /* Style Definitions */
 p.MsoNormal, li.MsoNormal, div.MsoNormal
 	{margin:0cm;
-	margin-bottom:.0001pt;
 	font-size:10.0pt;
 	font-family:"Times New Roman",serif;}
 p.MsoFooter, li.MsoFooter, div.MsoFooter
 	{margin:0cm;
-	margin-bottom:.0001pt;
 	font-size:10.0pt;
 	font-family:"Times New Roman",serif;}
 span.Betont
@@ -38,7 +36,6 @@ span.Betont
 p.Formulartext, li.Formulartext, div.Formulartext
 	{mso-style-name:Formulartext;
 	margin:0cm;
-	margin-bottom:.0001pt;
 	text-align:justify;
 	punctuation-wrap:simple;
 	font-size:9.0pt;
@@ -61,7 +58,7 @@ ul

 </head>

-<body lang=DE>
+<body lang=DE style='word-wrap:break-word'>

 <div class=WordSection1>

@@ -158,9 +155,9 @@ dongle (CODESYS Security Key) is not needed to use the Software Package. </span>

 <p class=MsoNormal><span lang=EN-AU style='font-size:11.0pt;font-family:"Arial",sans-serif'>&quot;PiXtend
 V2 Professional for CODESYS&quot; makes use of examples, source code, and software-libraries
-provided by the company 3S Smart Software Solutions GmbH, GERMANY whose terms
-and conditions including all rights, liabilities and licence agreements between
-the user and 3S stay unaffected from this agreement.</span></p>
+provided by the company CODESYS GmbH, GERMANY whose terms and conditions
+including all rights, liabilities and licence agreements between the user and CODESYS
+stay unaffected from this agreement.</span></p>

 <p class=MsoNormal><span lang=EN-AU style='font-size:11.0pt;font-family:"Arial",sans-serif'><br>
 </span><span lang=EN-US style='font-size:11.0pt;font-family:"Arial",sans-serif'>The
@@ -188,12 +185,12 @@ class=Betont>&nbsp;</span></p>
 <p class=MsoNormal style='punctuation-wrap:simple'><span lang=EN-US
 style='font-size:11.0pt;font-family:"Arial",sans-serif'>The examples and the
 RC-Plug library included in the software package, placed at your disposal, are
-provided free of charge and licensed under the GNU Public License  GPL V3.</span></p>
+provided free of charge and licensed under the MIT license.</span></p>

 <p class=MsoNormal style='punctuation-wrap:simple'><span lang=EN-US
 style='font-size:11.0pt;font-family:"Arial",sans-serif'>It is permitted to
 edit, modify, and adapt these examples and the RC-Plug library to suit the
-users purposes as long as this is done in accordance to the GPL V3 license.</span></p>
+users purposes as long as this is done in accordance to the MIT license.</span></p>

 <p class=MsoNormal style='punctuation-wrap:simple'><span lang=EN-US
 style='font-size:11.0pt;font-family:"Arial",sans-serif'>&nbsp;</span></p>

--- a/doc/pixtend_v2_l_connection_planner.pdf
+++ b/doc/pixtend_v2_l_connection_planner.pdf
--- a/doc/pixtend_v2_l_hardware_manual_DE.pdf
+++ b/doc/pixtend_v2_l_hardware_manual_DE.pdf
--- a/doc/pixtend_v2_l_hardware_manual_EN.pdf
+++ b/doc/pixtend_v2_l_hardware_manual_EN.pdf
--- a/doc/pixtend_v2_s_hardware_manual_DE.pdf
+++ b/doc/pixtend_v2_s_hardware_manual_DE.pdf
--- a/doc/pixtend_v2_s_hardware_manual_EN.pdf
+++ b/doc/pixtend_v2_s_hardware_manual_EN.pdf
--- a/doc/pixtend_v2_software_manual_DE.pdf
+++ b/doc/pixtend_v2_software_manual_DE.pdf
--- a/doc/pixtend_v2_software_manual_EN.pdf
+++ b/doc/pixtend_v2_software_manual_EN.pdf
--- a/libraries/PiXtend_V2-L-/IoDrvPiXtendV2L.compiled-library
+++ b/libraries/PiXtend_V2-L-/IoDrvPiXtendV2L.compiled-library
--- a/libraries/PiXtend_V2-L-/PiXtendV2L.devdesc.xml
+++ b/libraries/PiXtend_V2-L-/PiXtendV2L.devdesc.xml
@@ -330,31 +330,27 @@
            <File fileref="local" identifier="ImageFile">
                <LocalFile>pv20.png</LocalFile>
            </File>
-            <File fileref="local" identifier="IconFile">
-                <LocalFile>pv20s.ico</LocalFile>
-            </File>
        </Language>
    </Files>
    <Device hideInCatalogue="false" showParamsInDevDescOrder="true">
        <DeviceIdentification>
            <Type>501</Type>
            <Id>FFFF 0015</Id>
-            <Version>2.1.0.9</Version>
+            <Version>2.1.0.11</Version>
        </DeviceIdentification>
        <DeviceInfo>
            <Name name="local:ModelName">PiXtend V2 -L-</Name>
            <Description name="local:DeviceDescription">PiXtend V2 -L-</Description>
-            <Vendor name="local:VendorName">Qube Solutions GmbH</Vendor>
+            <Vendor name="local:VendorName">Kontron Electronics GmbH</Vendor>
            <OrderNumber>-</OrderNumber>
            <Image name="local:ImageFile">pv20.png</Image>
-            <Icon name="local:IconFile">pv20s.ico</Icon>
        </DeviceInfo>
        <Connector moduleType="501" interface="Raspberry.SPI" role="child" explicit="false" connectorId="1" hostpath="-1" alwaysmapping="true">
            <InterfaceName name="local:PCI">SPI devices</InterfaceName>
            <Slot count="1" allowEmpty="false"></Slot> 
            <DriverInfo needsBusCycle="true" defaultBusCycleTask="PiXtend_TASK">
                <RequiredCyclicTask taskname="PiXtend_TASK" priority="0" cycletime="T#30ms"></RequiredCyclicTask>
-                <RequiredLib libname="IoDrvPixtendV2L" vendor="Qube Solutions GmbH" version="2.1.0.9" identifier="IoDrvPixtendV2L">
+                <RequiredLib libname="IoDrvPixtendV2L" vendor="Kontron Electronics GmbH" version="2.1.0.11" identifier="IoDrvPixtendV2L">
                    <FBInstance basename="$(DeviceName)Instance" fbname="IoDrvPiXtendV2L">
                        <Initialize methodName="Initialize" />
                    </FBInstance>

--- a/libraries/PiXtend_V2-L-/pv20.png
+++ b/libraries/PiXtend_V2-L-/pv20.png
--- a/libraries/PiXtend_V2-L-DAC/IoDrvPiXtendV2LDAC.compiled-library
+++ b/libraries/PiXtend_V2-L-DAC/IoDrvPiXtendV2LDAC.compiled-library
--- a/libraries/PiXtend_V2-L-DAC/PiXtendV2LDAC.devdesc.xml
+++ b/libraries/PiXtend_V2-L-DAC/PiXtendV2LDAC.devdesc.xml
@@ -12,24 +12,20 @@
            <File fileref="local" identifier="ImageFile">
                <LocalFile>pv20.png</LocalFile>
            </File>
-            <File fileref="local" identifier="IconFile">
-                <LocalFile>pv20.ico</LocalFile>
-            </File>
        </Language>
    </Files>
    <Device hideInCatalogue="false" showParamsInDevDescOrder="true">
        <DeviceIdentification>
            <Type>501</Type>
            <Id>FFFF 0016</Id>
-            <Version>2.1.0.9</Version>
+            <Version>2.1.0.11</Version>
        </DeviceIdentification>
        <DeviceInfo>
            <Name name="local:ModelName">PiXtend V2 -L- DAC</Name>
            <Description name="local:DeviceDescription">PiXtend V2 -L- DAC - Digital to Analog Converter</Description>
-            <Vendor name="local:VendorName">Qube Solutions GmbH</Vendor>
+            <Vendor name="local:VendorName">Kontron Electronics GmbH</Vendor>
            <OrderNumber>-</OrderNumber>
            <Image name="local:ImageFile">pv20.png</Image>
-            <Icon name="local:IconFile">pv20.ico</Icon>
        </DeviceInfo>
        <Connector moduleType="500" interface="Raspberry.SPI" role="child" explicit="false" connectorId="1" hostpath="-1" alwaysmapping="true">
            <InterfaceName name="local:PCI">SPI devices</InterfaceName>
@@ -37,7 +33,7 @@
            </Slot> 
            <DriverInfo needsBusCycle="true" defaultBusCycleTask="PiXtend_TASK">
                <RequiredCyclicTask taskname="PiXtend_TASK" priority="0" cycletime="T#30ms"></RequiredCyclicTask>
-                <RequiredLib libname="IoDrvPiXtendV2LDAC" vendor="Qube Solutions GmbH" version="2.1.0.9" identifier="deviceLib">
+                <RequiredLib libname="IoDrvPiXtendV2LDAC" vendor="Kontron Electronics GmbH" version="2.1.0.11" identifier="deviceLib">
                    <FBInstance basename="$(DeviceName)_Instance" fbname="IoDrvPiXtendV2LDAC">
                        <Initialize methodName="Initialize" />
                    </FBInstance>

--- a/libraries/PiXtend_V2-L-DAC/pv20.png
+++ b/libraries/PiXtend_V2-L-DAC/pv20.png
--- a/libraries/PiXtend_V2-S-/IoDrvPiXtendV2S.compiled-library
+++ b/libraries/PiXtend_V2-S-/IoDrvPiXtendV2S.compiled-library