Merge pull request #7 from rcjwoods/motor_tuning

Motor tuning
pcdshub · Nov 15, 2024 · 563ac9d · 563ac9d
2 parents e41cb58 + 643a649
commit 563ac9d
Show file tree

Hide file tree

Showing 13 changed files with 6,795 additions and 8,886 deletions.
diff --git a/TwinCAT Measurement Project1/VSSettings/.vsm b/TwinCAT Measurement Project1/VSSettings/.vsm
@@ -6,7 +6,7 @@
     <Node>
       <Title>Scope Project1</Title>
       <Expanded>False</Expanded>
-      <FileName>C:\Users\rcjwoods\Documents\repos\lcls-plc-mfx-motion\TwinCAT Measurement Project1\Scope Project1.tcscopex</FileName>
+      <FileName>C:\Users\rcjwoods\Documents\github_repos\lcls-plc-mfx-motion\TwinCAT Measurement Project1\Scope Project1.tcscopex</FileName>
       <Children>
         <Node>
           <Title>DataPool</Title>

diff --git a/plc-mfx-motion/_Config/IO/Device 1 (EtherCAT).xti b/plc-mfx-motion/_Config/IO/Device 1 (EtherCAT).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.30" ClassName="CDevEtherCATDef" SubType="111">
+<?xml version="1.0"?>
+<TcSmItem 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.4024.12" ClassName="CDevEtherCATDef" SubType="111">
 	<Device Id="1" DevType="111" DevFlags="#x0003" AmsPort="28673" AmsNetId="0.0.0.0.2.1" RemoteName="Device 1 (EtherCAT)">
 		<Name>__FILENAME__</Name>
 		<AddressInfo>

diff --git a/...Config/IO/Device 1 (EtherCAT)/Power (EK1200)/PLC Junction 1 (EK1122)/plc_LIB (EK1100).xti b/...Config/IO/Device 1 (EtherCAT)/Power (EK1200)/PLC Junction 1 (EK1122)/plc_LIB (EK1100).xti
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<TcSmItem 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.4024.35" ClassName="CFlbTermDef" SubType="9099">
+<TcSmItem 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.4024.12" ClassName="CFlbTermDef" SubType="9099">
 	<ImageDatas>
 		<ImageData Id="1000">424dd6020000000000003600000028000000100000000e0000000100180000000000a0020000c40e0000c40e00000000000000000000ff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080808080808080808080808080808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c000ffffc0c0c000ffff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0ff0000c0c0c0ff0000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c00000ffc0c0c00000ff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0008000c0c0c0008000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff</ImageData>
 	</ImageDatas>
-	<Box Id="22" BoxType="9099">
+	<Box Id="22" Disabled="true" BoxType="9099">
 		<Name>__FILENAME__</Name>
 		<ImageId>1000</ImageId>
 		<EtherCAT SlaveType="1" PdiType="#x0d00" CycleMBoxPollingTime="0" VendorId="#x00000002" ProductCode="#x044c2c52" RevisionNo="#x00120000" PortPhys="305" MaxSlotCount="256" MaxSlotGroupCount="1" SlotPdoIncrement="1" SlotIndexIncrement="16" Type="EK1100 EtherCAT Coupler (2A E-Bus)" Desc="EK1100"/>

diff --git a/..._Config/IO/Device 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100).xti b/..._Config/IO/Device 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100).xti
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<TcSmItem 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.4024.35" ClassName="CFlbTermDef" SubType="9099">
+<?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.30" ClassName="CFlbTermDef" SubType="9099">
 	<ImageDatas>
 		<ImageData Id="1000">424dd6020000000000003600000028000000100000000e0000000100180000000000a0020000c40e0000c40e00000000000000000000ff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080808080808080808080808080808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c000ffffc0c0c000ffff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0ff0000c0c0c0ff0000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c00000ffc0c0c00000ff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0008000c0c0c0008000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff</ImageData>
 	</ImageDatas>

diff --git a/... 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100)/MFX-LJ-EL7031-E1.xti b/... 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100)/MFX-LJ-EL7031-E1.xti
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcSmItem 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.4024.35" ClassName="CFlbTermDef" SubType="9099">
+<TcSmItem 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.4024.12" ClassName="CFlbTermDef" SubType="9099">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{18071995-0000-0000-0000-002000000001}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..0] OF BIT</Name>
@@ -85,6 +85,12 @@
 			<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
 			<MBoxUserCmdData>004003000c0000000000000003000000000000000000000000000000000000002081f0010400000000001a0000</MBoxUserCmdData>
 			<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800102000000dc054d6178696d616c2063757272656e7400</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f000000030000000000000000000000000000000000000020108002020000006400526564756365642063757272656e7400</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800302000000c05d4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000001500000003000000000000000000000000000000000000002010800402000000cd004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800602000000c8004d6f746f722066756c6c737465707300</MBoxUserCmdData>
+			<MBoxUserCmdData>02000300090000000b000000030000000000000000000000000000000000000020128005010000000053706565642072616e676500</MBoxUserCmdData>
 			<Pdo Name="ENC Status compact" Index="#x1a00" Flags="#x0010" SyncMan="3">
 				<ExcludePdo>#x1a01</ExcludePdo>
 				<Entry Name="Status__">

diff --git a/... 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100)/MFX-LJ-EL7031-E4.xti b/... 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100)/MFX-LJ-EL7031-E4.xti
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcSmItem 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.4024.35" ClassName="CFlbTermDef" SubType="9099">
+<TcSmItem 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.4024.12" ClassName="CFlbTermDef" SubType="9099">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{18071995-0000-0000-0000-002000000001}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..0] OF BIT</Name>
@@ -85,6 +85,13 @@
 			<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
 			<MBoxUserCmdData>004003000c0000000000000003000000000000000000000000000000000000002081f0010400000000001a0000</MBoxUserCmdData>
 			<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f0000000300000000000000000000000000000000000000201080010200000058024d6178696d616c2063757272656e7400</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f000000030000000000000000000000000000000000000020108002020000006400526564756365642063757272656e7400</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800302000000c05d4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a00000015000000030000000000000000000000000000000000000020108004020000008a024d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800602000000c8004d6f746f722066756c6c737465707300</MBoxUserCmdData>
+			<MBoxUserCmdData>02000300090000000b000000030000000000000000000000000000000000000020128005010000000053706565642072616e676500</MBoxUserCmdData>
+			<MBoxUserCmdData>0200030009000000150000000300000000000000000000000000000000000000201280090100000000496e76657274206d6f746f7220706f6c617269747900</MBoxUserCmdData>
 			<Pdo Name="ENC Status compact" Index="#x1a00" Flags="#x0010" SyncMan="3">
 				<ExcludePdo>#x1a01</ExcludePdo>
 				<Entry Name="Status__">

diff --git a/... 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100)/MFX-LJ-EL7031-E6.xti b/... 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100)/MFX-LJ-EL7031-E6.xti
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcSmItem 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.4024.35" ClassName="CFlbTermDef" SubType="9099">
+<TcSmItem 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.4024.12" ClassName="CFlbTermDef" SubType="9099">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{18071995-0000-0000-0000-002000000001}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..0] OF BIT</Name>
@@ -85,6 +85,13 @@
 			<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
 			<MBoxUserCmdData>004003000c0000000000000003000000000000000000000000000000000000002081f0010400000000001a0000</MBoxUserCmdData>
 			<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800102000000dc054d6178696d616c2063757272656e7400</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f000000030000000000000000000000000000000000000020108002020000006400526564756365642063757272656e7400</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800302000000c05d4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000001500000003000000000000000000000000000000000000002010800402000000cd004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800602000000c8004d6f746f722066756c6c737465707300</MBoxUserCmdData>
+			<MBoxUserCmdData>02000300090000000b000000030000000000000000000000000000000000000020128005010000000053706565642072616e676500</MBoxUserCmdData>
+			<MBoxUserCmdData>0200030009000000150000000300000000000000000000000000000000000000201280090100000000496e76657274206d6f746f7220706f6c617269747900</MBoxUserCmdData>
 			<Pdo Name="ENC Status compact" Index="#x1a00" Flags="#x0010" SyncMan="3">
 				<ExcludePdo>#x1a01</ExcludePdo>
 				<Entry Name="Status__">

diff --git a/... 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100)/MFX-LJ-EL7031-E9.xti b/... 1 (EtherCAT)/Power (EK1200)/PLC Junction 2 (EK1122)/plc_LJ (EK1100)/MFX-LJ-EL7031-E9.xti
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcSmItem 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.4024.35" ClassName="CFlbTermDef" SubType="9099">
+<TcSmItem 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.4024.12" ClassName="CFlbTermDef" SubType="9099">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{18071995-0000-0000-0000-002000000001}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..0] OF BIT</Name>
@@ -85,6 +85,13 @@
 			<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
 			<MBoxUserCmdData>004003000c0000000000000003000000000000000000000000000000000000002081f0010400000000001a0000</MBoxUserCmdData>
 			<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f000000030000000000000000000000000000000000000020108001020000003a024d6178696d616c2063757272656e7400</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f000000030000000000000000000000000000000000000020108002020000006400526564756365642063757272656e7400</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800302000000c05d4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a000000150000000300000000000000000000000000000000000000201080040200000070034d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
+			<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800602000000c8004d6f746f722066756c6c737465707300</MBoxUserCmdData>
+			<MBoxUserCmdData>02000300090000000b000000030000000000000000000000000000000000000020128005010000000053706565642072616e676500</MBoxUserCmdData>
+			<MBoxUserCmdData>0200030009000000150000000300000000000000000000000000000000000000201280090100000000496e76657274206d6f746f7220706f6c617269747900</MBoxUserCmdData>
 			<Pdo Name="ENC Status compact" Index="#x1a00" Flags="#x0010" SyncMan="3">
 				<ExcludePdo>#x1a01</ExcludePdo>
 				<Entry Name="Status__">