Merge pull request #5 from Mbosum/x454

Integrating x471 changes into LAMP master repo
pcdshub · Nov 3, 2021 · 0be1cb9 · 0be1cb9
2 parents 1b916af + 9f8f958
commit 0be1cb9
Show file tree

Hide file tree

Showing 20 changed files with 10,158 additions and 164 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,5 @@
 # lcls-plc-lamp-motion
+#There were 2 main configurations of LAMP motion that came before this:
+# 1) LAMP commissioning
+# 2) LAMP MBES configuration
+
diff --git a/...C Rail (EtherCAT)/Power (EK1200)/PLC Junction 1 (EK1122)/X1 AtmosphereMotion (EK1100).xti b/...C Rail (EtherCAT)/Power (EK1200)/PLC Junction 1 (EK1122)/X1 AtmosphereMotion (EK1100).xti
@@ -25,7 +25,7 @@
 		<Box File="GasNeedleZ-EL7041.xti" Id="12">
 			<EtherCAT PortABoxInfo="#x0100000b"/>
 		</Box>
-		<Box File="M10-EL7041.xti" Id="40">
+		<Box File="FlowCellTheta-EL7041.xti" Id="40">
 			<EtherCAT PortABoxInfo="#x0100000c"/>
 		</Box>
 		<Box File="Microscope-EL7342.xti" Id="13">

diff --git a/... AtmosphereMotion (EK1100)/M10-EL7041.xti → ...eMotion (EK1100)/FlowCellTheta-EL7041.xti b/... AtmosphereMotion (EK1100)/M10-EL7041.xti → ...eMotion (EK1100)/FlowCellTheta-EL7041.xti
@@ -97,7 +97,7 @@
 			<MBoxUserCmdData>020003000a0000000f000000030000000000000000000000000000000000000020108002020000006400526564756365642063757272656e7400</MBoxUserCmdData>
 			<MBoxUserCmdData>020003000a0000000f0000000300000000000000000000000000000000000000201080030200000080bb4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
 			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800602000000c8004d6f746f722066756c6c737465707300</MBoxUserCmdData>
-			<MBoxUserCmdData>020003000a000000150000000300000000000000000000000000000000000000201080040200000078004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a00000015000000030000000000000000000000000000000000000020108004020000005f004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
 			<Pdo Name="ENC Status compact" Index="#x1a00" Flags="#x0010" SyncMan="3">
 				<ExcludePdo>#x1a01</ExcludePdo>
 				<Entry Name="Status__Latch C valid" Index="#x6000" Sub="#x01">

diff --git a/...Power (EK1200)/PLC Junction 1 (EK1122)/X1 AtmosphereMotion (EK1100)/GasNeedleY-EL7041.xti b/...Power (EK1200)/PLC Junction 1 (EK1122)/X1 AtmosphereMotion (EK1100)/GasNeedleY-EL7041.xti
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmItem" TcSmVersion="1.0" TcVersion="3.1.4022.32" ClassName="CFlbTermDef" SubType="9099">
+<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmItem" TcSmVersion="1.0" TcVersion="3.1.4022.30" ClassName="CFlbTermDef" SubType="9099">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{18071995-0000-0000-0000-002000000002}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..1] OF BIT</Name>
@@ -97,7 +97,7 @@
 			<MBoxUserCmdData>020003000a0000000f0000000000000000000000000000000000000000000000201080010200000060094d6178696d616c2063757272656e7400</MBoxUserCmdData>
 			<MBoxUserCmdData>020003000a0000000f000000000000000000000000000000000000000000000020108002020000006400526564756365642063757272656e7400</MBoxUserCmdData>
 			<MBoxUserCmdData>020003000a0000000f0000000000000000000000000000000000000000000000201080030200000080bb4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
-			<MBoxUserCmdData>020003000a000000150000000000000000000000000000000000000000000000201080040200000096004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a00000015000000030000000000000000000000000000000000000020108004020000005f004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
 			<Pdo Name="ENC Status compact" Index="#x1a00" Flags="#x0010" SyncMan="3">
 				<ExcludePdo>#x1a01</ExcludePdo>
 				<Entry Name="Status__Latch C valid" Index="#x6000" Sub="#x01">

diff --git a/...Power (EK1200)/PLC Junction 1 (EK1122)/X1 AtmosphereMotion (EK1100)/GasNeedleZ-EL7041.xti b/...Power (EK1200)/PLC Junction 1 (EK1122)/X1 AtmosphereMotion (EK1100)/GasNeedleZ-EL7041.xti
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmItem" TcSmVersion="1.0" TcVersion="3.1.4022.32" ClassName="CFlbTermDef" SubType="9099">
+<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmItem" TcSmVersion="1.0" TcVersion="3.1.4022.30" ClassName="CFlbTermDef" SubType="9099">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{18071995-0000-0000-0000-002000000002}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..1] OF BIT</Name>
@@ -97,7 +97,7 @@
 			<MBoxUserCmdData>020003000a0000000f0000000000000000000000000000000000000000000000201080010200000060094d6178696d616c2063757272656e7400</MBoxUserCmdData>
 			<MBoxUserCmdData>020003000a0000000f000000000000000000000000000000000000000000000020108002020000006400526564756365642063757272656e7400</MBoxUserCmdData>
 			<MBoxUserCmdData>020003000a0000000f0000000000000000000000000000000000000000000000201080030200000080bb4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
-			<MBoxUserCmdData>020003000a00000015000000000000000000000000000000000000000000000020108004020000005f004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a000000150000000300000000000000000000000000000000000000201080040200000096004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
 			<Pdo Name="ENC Status compact" Index="#x1a00" Flags="#x0010" SyncMan="3">
 				<ExcludePdo>#x1a01</ExcludePdo>
 				<Entry Name="Status__Latch C valid" Index="#x6000" Sub="#x01">