Merge pull request #5 from Mobject-Dev-Team/pre-v1.1.0

updated to support 4026
Mobject-Dev-Team-Archive · Jun 13, 2024 · 92b1c87 · 92b1c87
2 parents b98061a + a793c9f
commit 92b1c87
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.1.0-beta
+
+- Changed to make compatible with TwinCAT 4026 as the line \_\_DELETE(THIS) is no longer supported.
+
 ## v1.0.0-beta
 
 - Changed status from alpha to beta.

diff --git a/mobject-disposable.library b/mobject-disposable.library
diff --git a/src/mobject-disposable-library/mobject-disposable-test-project/Main/Main.plcproj b/src/mobject-disposable-library/mobject-disposable-test-project/Main/Main.plcproj
@@ -60,7 +60,7 @@
  </None>
  </ItemGroup>
  <ItemGroup>
- <LibraryReference Include="mobject-disposable,1.0.0,mobject">
+ <LibraryReference Include="mobject-disposable,1.1.0,mobject">
  <Namespace>mobject_disposable</Namespace>
  </LibraryReference>
  </ItemGroup>

diff --git a/...disposable-library/mobject-disposable-test-project/mobject-disposable-test-project.tsproj b/...disposable-library/mobject-disposable-test-project/mobject-disposable-test-project.tsproj
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.53">
+<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.55">
  <Project ProjectGUID="{EE80D651-C063-4DDB-A2E6-0E65F76477EB}" Target64Bit="true" ShowHideConfigurations="#x3c7">
  <System>
  <Tasks>
@@ -10,7 +10,7 @@
  </System>
  <Plc>
  <Project GUID="{99410A04-EDBC-4BE9-8215-58B13429C019}" Name="Main" PrjFilePath="Main\Main.plcproj" TmcFilePath="Main\Main.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
- <Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Main\Main.tmc" TmcHash="{EF57C141-D593-A74D-70EE-39B6E06BD7BC}">
+ <Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Main\Main.tmc" TmcHash="{F9546CB4-2D3A-408F-024D-79CDD19B0A66}">
  <Name>Main Instance</Name>
  <CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
  <Contexts>

diff --git a/src/mobject-disposable-library/mobject-disposable/mobject-disposable.tspproj b/src/mobject-disposable-library/mobject-disposable/mobject-disposable.tspproj
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.53">
+<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.55">
  <Project ProjectGUID="{44AA935C-E39F-444D-B130-BC42AEBD1D3F}" Target64Bit="true" ShowHideConfigurations="#x106">
  <Plc>
  <Project GUID="{0956A836-6734-4D64-B94D-FF82E657250F}" Name="mobject-disposable" PrjFilePath="mobject-disposable\mobject-disposable.plcproj" TmcFilePath="mobject-disposable\mobject-disposable.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e"/>

diff --git a/...ject-disposable-library/mobject-disposable/mobject-disposable/Disposable/Disposable.TcPOU b/...ject-disposable-library/mobject-disposable/mobject-disposable/Disposable/Disposable.TcPOU
@@ -14,9 +14,11 @@ END_VAR]]></Declaration>
  <Method Name="Dispose" Id="{6c98f403-5dd6-4f9d-bc0a-e406c48a07a8}">
  <Declaration><![CDATA[METHOD Dispose
 VAR
+ pDisposable : POINTER TO Disposable;
 END_VAR]]></Declaration>
  <Implementation>
- <ST><![CDATA[__DELETE(THIS);]]></ST>
+ <ST><![CDATA[pDisposable := THIS;
+__DELETE(pDisposable);]]></ST>
  </Implementation>
  </Method>
  <Method Name="FB_exit" Id="{0d1dd945-173c-0626-2abd-474b81e0db04}" FolderPath="Destructor\">

diff --git a/...bject-disposable-library/mobject-disposable/mobject-disposable/mobject-disposable.plcproj b/...bject-disposable-library/mobject-disposable/mobject-disposable/mobject-disposable.plcproj
@@ -18,7 +18,7 @@
  <Company>mobject</Company>
  <Released>false</Released>
  <Title>mobject-disposable</Title>
- <ProjectVersion>1.0.0</ProjectVersion>
+ <ProjectVersion>1.1.0</ProjectVersion>
  <DefaultNamespace>mobject-disposable</DefaultNamespace>
  <Author>mobject dev team</Author>
  <LibraryCategories>