Merge pull request #22 from jsheppard95/revive-xrt-homs

MNT: Revive xrt homs
pcdshub · Mar 1, 2021 · fe7235a · fe7235a
2 parents e325575 + feb9d63
commit fe7235a
Show file tree

Hide file tree

Showing 42 changed files with 9,740 additions and 890 deletions.
diff --git a/HOMS_XRT/HOMS_XRT.sln b/HOMS_XRT/HOMS_XRT.sln
diff --git a/HOMS_XRT/HOMS_XRT.tsproj b/HOMS_XRT/HOMS_XRT.tsproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<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.4020.32">
+<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.4022.30">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{85DC3E7A-8ADA-435B-9479-25573909A7DB}" Namespace="AX5000" TcBaseType="true">E_AX5000_P_0275_ActiveFeedbackAndMemory</Name>
@@ -62,7 +62,7 @@
 			</Hides>
 		</DataType>
 	</DataTypes>
-	<Project ProjectGUID="{E0A85DAB-F54D-4547-A4D7-2FABE419473F}" TargetNetId="5.41.150.248.1.1" ShowHideConfigurations="#x106">
+	<Project ProjectGUID="{A62272F3-0A49-4FBD-8A1F-8714E915E364}" TargetNetId="172.21.88.136.1.1" RelativeTargetNetId="true" RelativeIpAddresses="true" ShowHideConfigurations="#x106">
 		<System>
 			<Licenses>
 				<Target BkhfOrder="VE2378134">
@@ -95,11 +95,12 @@
 		</Io>
 	</Project>
 	<Mappings>
-		<MappingInfo Identifier="{01010012-0020-0304-1000-010120000403}" Id="#x02030050" Watchdog="00000000000000000000000000000000"/>
-		<MappingInfo Identifier="{05000010-0012-0101-1000-040310000101}" Id="#x02030010" Watchdog="14000000040000000400000004000000"/>
-		<MappingInfo Identifier="{00000000-0050-0304-1000-040350000403}" Id="#x02030060"/>
-		<MappingInfo Identifier="{00000000-0020-0304-1000-040320000403}" Id="#x02030040"/>
-		<MappingInfo Identifier="{00000000-0011-0101-1000-010130000403}" Id="#x02030020"/>
-		<MappingInfo Identifier="{00000000-0012-0101-1000-010140000403}" Id="#x02030030"/>
+		<MappingInfo Identifier="{08502003-0050-0304-0020-500850000403}" Id="#x02030070" Watchdog="00000000000000000000000000000000"/>
+		<MappingInfo Identifier="{08502003-0020-0304-0020-500820000403}" Id="#x02030030" Watchdog="00000000000000000000000000000000"/>
+		<MappingInfo Identifier="{05000010-2003-0850-1000-040302205008}" Id="#x02030060" Watchdog="0a000000040000000400000004000000"/>
+		<MappingInfo Identifier="{00000000-0050-0304-1000-040353000403}" Id="#x02030050"/>
+		<MappingInfo Identifier="{00000000-0020-0304-1000-040321000403}" Id="#x02030020"/>
+		<MappingInfo Identifier="{00000000-2001-0850-0020-500830000403}" Id="#x02030010"/>
+		<MappingInfo Identifier="{00000000-2003-0850-0220-500842000403}" Id="#x02030040"/>
 	</Mappings>
 </TcSmProject>
diff --git a/HOMS_XRT/HOMS_XRT_PLC/Common/DUTs/ST_ElmoGDCBellCoEParams.TcDUT b/HOMS_XRT/HOMS_XRT_PLC/Common/DUTs/ST_ElmoGDCBellCoEParams.TcDUT
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4020.12">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
   <DUT Name="ST_ElmoGDCBellCoEParams" Id="{adc45910-3b48-4ab5-8e09-e1d3c97a2d8c}">
     <Declaration><![CDATA[TYPE ST_ElmoGDCBellCoEParams :
 STRUCT
@@ -16,6 +16,9 @@ STRUCT
 		ui5VSupply :	UINT;
 		//Drive temperature, C
 		uiDriveTemp	:	UINT;
+
+		// Checksum
+		testChecksum : DINT;
 END_STRUCT
 END_TYPE
 ]]></Declaration>

diff --git a/HOMS_XRT/HOMS_XRT_PLC/Common/DUTs/ST_HOMSStepper.TcDUT b/HOMS_XRT/HOMS_XRT_PLC/Common/DUTs/ST_HOMSStepper.TcDUT
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4020.12">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
   <DUT Name="ST_HOMSStepper" Id="{59acacf2-49b3-454e-979e-299117a50a5f}">
     <Declaration><![CDATA[TYPE ST_HOMSStepper :
 STRUCT
@@ -21,7 +21,7 @@ STRUCT
 	//Absolute Value Request
 	rReqAbsolute : REAL:= 0.0;
 	//Pitch stepper dmov range (urad)
-	rStepperDmovRange	:	REAL := 2;
+	rStepperDmovRange	:	REAL := 20;
 	(* Status *)
 	//Axis Status
 	stStatus : ST_StepperStatus;