Bugfix Taskindex

PeterZerlauth · Mar 9, 2024 · 19d9859 · 19d9859
1 parent 2d4dad3
commit 19d9859
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/Tc3_UnitTest/Tc3_UnitTest/Base/FB_Base.TcPOU b/Tc3_UnitTest/Tc3_UnitTest/Base/FB_Base.TcPOU
@@ -22,8 +22,8 @@ END_VAR
 ]]></Declaration>
     <Implementation>
       <ST><![CDATA[// Prevent double calls
-IF nCycleCount <> TwinCAT_SystemInfoVarList._TaskInfo[1].CycleCount THEN
-	nCycleCount:= TwinCAT_SystemInfoVarList._TaskInfo[1].CycleCount;
+IF nCycleCount <> TwinCAT_SystemInfoVarList._TaskInfo[GETCURTASKINDEXEX()].CycleCount THEN
+	nCycleCount:= TwinCAT_SystemInfoVarList._TaskInfo[GETCURTASKINDEXEX()].CycleCount;
 	
 	fbGetTime();
 	

diff --git a/Tc3_UnitTest/Tc3_UnitTest/Tc3_UnitTest.plcproj b/Tc3_UnitTest/Tc3_UnitTest/Tc3_UnitTest.plcproj
@@ -18,7 +18,7 @@
     <Company>Zerlauth</Company>
     <Released>false</Released>
     <Title>Tc3_UnitTest</Title>
-    <ProjectVersion>0.0.3.4</ProjectVersion>
+    <ProjectVersion>1.0.0.0</ProjectVersion>
     <DefaultNamespace>Tc3_UnitTest</DefaultNamespace>
     <Placeholder>Tc3_UnitTest</Placeholder>
     <Author>Peter Zerlauth</Author>

diff --git a/UnitTest.sln b/UnitTest.sln
@@ -33,6 +33,22 @@ Global
 		{7CAAC051-3A3C-4F8D-9039-D7B6F336303B}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
 		{7CAAC051-3A3C-4F8D-9039-D7B6F336303B}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
 		{7CAAC051-3A3C-4F8D-9039-D7B6F336303B}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
+		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
 		{B3EB4A32-4BD3-4997-92F6-694EC306D617}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
 		{B3EB4A32-4BD3-4997-92F6-694EC306D617}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
 		{B3EB4A32-4BD3-4997-92F6-694EC306D617}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
@@ -65,22 +81,6 @@ Global
 		{17F8C168-FDAA-47D9-AB36-F3A3E36D86D0}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
 		{17F8C168-FDAA-47D9-AB36-F3A3E36D86D0}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
 		{17F8C168-FDAA-47D9-AB36-F3A3E36D86D0}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
-		{24D36C1C-673B-4B9B-BE9D-7F888F34DEC9}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE