Merge pull request #31 from ghalym/eV32Bits

FIX: M2 to MEC W Coating Bit Mask.
pcdshub · May 1, 2021 · 878c7f8 · 878c7f8
2 parents 980bff6 + 3938abe
commit 878c7f8
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 41 deletions.
diff --git a/HOMS_XRT/HOMS_XRT.sln b/HOMS_XRT/HOMS_XRT.sln
@@ -0,0 +1,59 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# TcXaeShell Solution File, Format Version 11.00
+VisualStudioVersion = 15.0.28010.2050
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "HOMS_XRT", "HOMS_XRT.tsproj", "{905B3800-F307-4A9C-A441-3C15C0FC9867}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|TwinCAT CE7 (ARMV7) = Debug|TwinCAT CE7 (ARMV7)
+		Debug|TwinCAT OS (ARMT2) = Debug|TwinCAT OS (ARMT2)
+		Debug|TwinCAT RT (x64) = Debug|TwinCAT RT (x64)
+		Debug|TwinCAT RT (x86) = Debug|TwinCAT RT (x86)
+		Release|TwinCAT CE7 (ARMV7) = Release|TwinCAT CE7 (ARMV7)
+		Release|TwinCAT OS (ARMT2) = Release|TwinCAT OS (ARMT2)
+		Release|TwinCAT RT (x64) = Release|TwinCAT RT (x64)
+		Release|TwinCAT RT (x86) = Release|TwinCAT RT (x86)
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
+		{905B3800-F307-4A9C-A441-3C15C0FC9867}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
+		{D389F784-3772-48EA-848E-1D7F6EFE4E9B}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {181EAD1F-7876-444D-9BDF-79CD1E9155FC}
+	EndGlobalSection
+EndGlobal
diff --git a/HOMS_XRT/HOMS_XRT_PLC/HOMS_XRT_PLC.tmc b/HOMS_XRT/HOMS_XRT_PLC/HOMS_XRT_PLC.tmc
diff --git a/HOMS_XRT/HOMS_XRT_PLC/POUs/PRG_CoatingProtection.TcPOU b/HOMS_XRT/HOMS_XRT_PLC/POUs/PRG_CoatingProtection.TcPOU
@@ -68,7 +68,7 @@ IF (HOMS2_Pitch.diEncCnt < 9616668 ) THEN//(HOMS2_Pitch.Stepper.stStatus.rActPos
 	fbM2.nSecondCoatingBitmask:= F_eVExcludeRange(0, 13000) AND F_eVExcludeRange(30000, 90000);
 ELSIF (HOMS2_Pitch.diEncCnt > 10129409 ) THEN// (HOMS2_Pitch.Stepper.stStatus.rActPosition > 600) THEN //MEC
 	fbM2.nFirstCoatingBitmask:= F_eVExcludeRange(0, 1000) AND F_eVExcludeRange(25000, 90000);  
-	fbM2.nSecondCoatingBitmask:= F_eVExcludeRange(0, 13000) AND F_eVExcludeRange(13500, 90000);
+	fbM2.nSecondCoatingBitmask:= F_eVExcludeRange(0, 13000) AND F_eVExcludeRange(30000, 90000);
 ELSE // Anything else in the middle of the range
 	fbM2.nFirstCoatingBitmask:= 0;
 	fbM2.nSecondCoatingBitmask:= 0;

diff --git a/HOMS_XRT/_Config/PLC/HOMS_XRT_PLC.xti b/HOMS_XRT/_Config/PLC/HOMS_XRT_PLC.xti
@@ -775,15 +775,15 @@ External Setpoint Generation:
 			</Relations>
 		</DataType>
 		<DataType>
-			<Name GUID="{87440095-DC14-4D30-94CA-7E1553B9539C}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
+			<Name GUID="{E9904FC3-EB4E-4601-8D33-910FD1554A54}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
 			<BitSize>0</BitSize>
 			<BaseType GUID="{FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF}"/>
 			<Hides>
-				<Hide GUID="{126D004B-0395-49BD-ADBC-54BC5318972E}"/>
+				<Hide GUID="{87440095-DC14-4D30-94CA-7E1553B9539C}"/>
 			</Hides>
 		</DataType>
 		<DataType>
-			<Name GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
+			<Name GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
 			<Comment>
 				<![CDATA[ Renishaw BiSS-C absolute encoder used with an EL5042]]>
 			</Comment>
@@ -805,7 +805,7 @@ External Setpoint Generation:
 			</SubItem>
 			<SubItem>
 				<Name>Status</Name>
-				<Type GUID="{87440095-DC14-4D30-94CA-7E1553B9539C}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
+				<Type GUID="{E9904FC3-EB4E-4601-8D33-910FD1554A54}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
 				<Comment>
 					<![CDATA[ Status struct placeholder]]>
 				</Comment>
@@ -822,7 +822,7 @@ External Setpoint Generation:
 				<BitOffs>64</BitOffs>
 			</SubItem>
 			<Hides>
-				<Hide GUID="{D417D95E-ACDB-4253-9DEA-53C6C730CC2E}"/>
+				<Hide GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}"/>
 			</Hides>
 		</DataType>
 		<DataType>
@@ -2269,7 +2269,7 @@ External Setpoint Generation:
 					<Comment>
 						<![CDATA[ Encoders]]>
 					</Comment>
-					<Type GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2291,7 +2291,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR1L3.fbRunHOMS.stYdwnEnc</Name>
-					<Type GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2313,7 +2313,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR1L3.fbRunHOMS.stXupEnc</Name>
-					<Type GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -2335,7 +2335,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR1L3.fbRunHOMS.stXdwnEnc</Name>
-					<Type GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -3330,7 +3330,7 @@ External Setpoint Generation:
 					<Comment>
 						<![CDATA[ Encoders]]>
 					</Comment>
-					<Type GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -3352,7 +3352,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR2L3.fbRunHOMS.stYdwnEnc</Name>
-					<Type GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -3374,7 +3374,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR2L3.fbRunHOMS.stXupEnc</Name>
-					<Type GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>
@@ -3396,7 +3396,7 @@ External Setpoint Generation:
 				</Var>
 				<Var>
 					<Name>Main.MR2L3.fbRunHOMS.stXdwnEnc</Name>
-					<Type GUID="{6C6645C9-0783-4868-99D7-E55C2D2FE1B7}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
+					<Type GUID="{DC37E03A-3073-44A2-899E-AFBA92552F81}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
 					<SubVar>
 						<Name>Count</Name>
 						<Comment>