Bugfix in StringBuilder Interface name

bengeisler · Sep 16, 2023 · 0ab25ea · 0ab25ea
1 parent 3591818
commit 0ab25ea
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 58 deletions.
diff --git a/TcLog.sln b/TcLog.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.28010.2050
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "TcLogProj", "TcLogProj\TcLogProj.tsproj", "{84E2C694-C6B7-48C0-A46A-93E9E79E1E4B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TcLogTest.NET", "TcLogTest.NET\TcLogTest.NET.csproj", "{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,26 +39,24 @@ Global
 		{84E2C694-C6B7-48C0-A46A-93E9E79E1E4B}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
 		{84E2C694-C6B7-48C0-A46A-93E9E79E1E4B}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
 		{84E2C694-C6B7-48C0-A46A-93E9E79E1E4B}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|TwinCAT RT (x64).Build.0 = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Debug|TwinCAT RT (x86).Build.0 = Debug|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|TwinCAT OS (ARMT2).Build.0 = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|TwinCAT RT (x64).ActiveCfg = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|TwinCAT RT (x64).Build.0 = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|TwinCAT RT (x86).ActiveCfg = Release|Any CPU
-		{41F52577-96F4-46B7-BDEF-F5A9C5753EA6}.Release|TwinCAT RT (x86).Build.0 = Release|Any CPU
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|Any CPU.ActiveCfg = Debug|TwinCAT OS (ARMT2)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|Any CPU.ActiveCfg = Release|TwinCAT OS (ARMT2)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
+		{4D70D393-C90D-46C3-86AE-BDC75C79053F}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
 		{534B7BB3-9B49-4F2B-86CC-2317930EA23D}.Debug|Any CPU.ActiveCfg = Debug|TwinCAT RT (x64)
 		{534B7BB3-9B49-4F2B-86CC-2317930EA23D}.Debug|Any CPU.Build.0 = Debug|TwinCAT RT (x64)
 		{534B7BB3-9B49-4F2B-86CC-2317930EA23D}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
@@ -81,26 +77,6 @@ Global
 		{534B7BB3-9B49-4F2B-86CC-2317930EA23D}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
 		{534B7BB3-9B49-4F2B-86CC-2317930EA23D}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
 		{534B7BB3-9B49-4F2B-86CC-2317930EA23D}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|Any CPU.ActiveCfg = Debug|TwinCAT RT (x64)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|Any CPU.Build.0 = Debug|TwinCAT RT (x64)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|Any CPU.ActiveCfg = Release|TwinCAT RT (x64)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|Any CPU.Build.0 = Release|TwinCAT RT (x64)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
-		{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/TcLogProj/TcLog/Logger/POUs/TcLogCore.TcPOU b/TcLogProj/TcLog/Logger/POUs/TcLogCore.TcPOU
@@ -282,10 +282,10 @@ RollingIntervalReached := 	(hourRolled 	AND RollingInterval = RollingIntervals.H
 // all internal methods that have to be executed cyclically.
 METHOD RunLogger : BOOL
 VAR_INST
-	newDay : Tc2_Standard.R_TRIG;
+	newDay : Tc2_Standard.R_TRIG; 
 	dateTime : DateTime;
 	deleteExpiredLogFiles : DeleteOldFiles;
-	stringBuilder : StringBuilder;
+	fileNameStringBuilder : StringBuilder;
 	timeStamp : STRING; // Timestamp used for filename
 END_VAR
 ]]></Declaration>
@@ -318,7 +318,7 @@ END_IF
 		
 // Persist logging messages to file
 _logCache.PersistToFile(
-	stringBuilder
+	fileNameStringBuilder
 		.Reset()
 		.Append(_config.FilePath)
 		.AppendIf(Tc2_Standard.RIGHT(_config.FilePath, 1) <> '\', '\')
@@ -482,7 +482,7 @@ WriteToFile REF= This^;]]></ST>
       <LineId Id="2" Count="0" />
     </LineIds>
     <LineIds Name="TcLogCore.RunLogger">
-      <LineId Id="221" Count="52" />
+      <LineId Id="296" Count="52" />
       <LineId Id="2" Count="0" />
     </LineIds>
     <LineIds Name="TcLogCore.SetDelimiter">

diff --git a/TcLogProj/TcLog/StringBuilder/ILimitedStringBuilder.TcIO b/TcLogProj/TcLog/StringBuilder/ILimitedStringBuilder.TcIO
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TcPlcObject Version="1.1.0.1">
   <Itf Name="ILimitedStringBuilder" Id="{194bb722-4e19-4a72-9bf7-057dc58bb68e}">
-    <Declaration><![CDATA[INTERFACE INTERNAL
-]]></Declaration>
+    <Declaration><![CDATA[INTERFACE INTERNAL ILimitedStringBuilder]]></Declaration>
     <Method Name="Append" Id="{c1fd36d6-9aa3-4352-9719-226e4a16c216}">
       <Declaration><![CDATA[METHOD Append : IStringBuilder // Append text TO t current build STRING.
 VAR_INPUT

diff --git a/TcLogProj/TcLog/StringBuilder/IStringBuilder.TcIO b/TcLogProj/TcLog/StringBuilder/IStringBuilder.TcIO
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TcPlcObject Version="1.1.0.1">
   <Itf Name="IStringBuilder" Id="{cc6d396c-ab11-4512-b217-fcaa420ac27e}">
-    <Declaration><![CDATA[INTERFACE INTERNAL
-]]></Declaration>
+    <Declaration><![CDATA[INTERFACE INTERNAL IStringBuilder]]></Declaration>
     <Method Name="Append" Id="{39f6182f-ddaa-4a04-88e3-b41671a4f64d}">
       <Declaration><![CDATA[METHOD Append : IStringBuilder // Append text TO t current build STRING.
 VAR_INPUT

diff --git a/TcLogProj/TcLogProj.tsproj b/TcLogProj/TcLogProj.tsproj
@@ -12,7 +12,7 @@
 			</Tasks>
 		</System>
 		<Plc>
-			<Project GUID="{67A5CD22-D1E6-4601-AC63-4CEBE4A64230}" Name="TcLogTest" PrjFilePath="TcLogTest\TcLogTest.plcproj" TmcFilePath="TcLogTest\TcLogTest.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
+			<Project GUID="{4D70D393-C90D-46C3-86AE-BDC75C79053F}" Name="TcLogTest" PrjFilePath="TcLogTest\TcLogTest.plcproj" TmcFilePath="TcLogTest\TcLogTest.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
 				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="TcLogTest\TcLogTest.tmc">
 					<Name>TcLogTest Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>

diff --git a/TcLogProj/TcLogTest/TcLogTest.plcproj b/TcLogProj/TcLogTest/TcLogTest.plcproj
@@ -3,19 +3,19 @@
   <PropertyGroup>
     <FileVersion>1.0.0.0</FileVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{67a5cd22-d1e6-4601-ac63-4cebe4a64230}</ProjectGuid>
+    <ProjectGuid>{4d70d393-c90d-46c3-86ae-bdc75c79053f}</ProjectGuid>
     <SubObjectsSortedByName>True</SubObjectsSortedByName>
     <DownloadApplicationInfo>true</DownloadApplicationInfo>
     <WriteProductVersion>false</WriteProductVersion>
     <GenerateTpy>false</GenerateTpy>
     <Name>TcLogTest</Name>
     <ProgramVersion>3.1.4023.0</ProgramVersion>
-    <Application>{52251088-d347-4476-bbc7-23fde6e8d23d}</Application>
-    <TypeSystem>{1c7f7d07-287f-4a51-b3cf-59c3170ec015}</TypeSystem>
-    <Implicit_Task_Info>{5ea0a77b-9d3a-43a7-baf8-d3dd93164ec5}</Implicit_Task_Info>
-    <Implicit_KindOfTask>{e1bd9ded-0a02-4a11-be2c-80377a5672da}</Implicit_KindOfTask>
-    <Implicit_Jitter_Distribution>{13ddf777-9176-46a7-9f0b-b060f7161474}</Implicit_Jitter_Distribution>
-    <LibraryReferences>{bd225dc8-4884-4294-9c3c-d3a849af676d}</LibraryReferences>
+    <Application>{0cbede17-3f7f-4622-9cfd-62e3bf399640}</Application>
+    <TypeSystem>{b0c972a6-08d3-46e9-98b7-a4ef4e8d9b31}</TypeSystem>
+    <Implicit_Task_Info>{9b71c67e-f119-4640-ba0b-98e46c60e097}</Implicit_Task_Info>
+    <Implicit_KindOfTask>{f7393b00-9f97-44d7-89c9-7038336b8b0d}</Implicit_KindOfTask>
+    <Implicit_Jitter_Distribution>{a4da123a-4ea3-4422-b5d4-7ae1d2501723}</Implicit_Jitter_Distribution>
+    <LibraryReferences>{d9ddb8a1-a1e0-4318-9382-2fb0cbf99920}</LibraryReferences>
     <Released>false</Released>
   </PropertyGroup>
   <ItemGroup>