Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding gas jet encoder Y and Z #17

Merged
merged 2 commits into from
Nov 25, 2024
Merged

adding gas jet encoder Y and Z #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7d3367
adding gas jet encoder Y and Z
tongju12 Aug 5, 2024
7d1f36d
adding encoders into gas jet but currenly X and Z still have issues
tongju12 Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lamp_motion_scope/VSSettings/.vsm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Node>
<Title>Scope YT NC Project</Title>
<Expanded>False</Expanded>
<FileName>C:\Users\jozamudi\Documents\TcXaeShell\lcls-plc-lamp-motion\lamp_motion_scope\Scope YT NC Project.tcscopex</FileName>
<FileName>C:\Users\tongju\github-repo\tmo\lcls-plc-lamp-motion\lamp_motion_scope\Scope YT NC Project.tcscopex</FileName>
<Children>
<Node>
<Title>DataPool</Title>
Expand Down
8 changes: 4 additions & 4 deletions lcls-plc-lamp-motion/_Config/IO/PLC Rail (EtherCAT).xti
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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="CDevEtherCATDef" SubType="111">
<Device Id="1" DevType="111" DevFlags="#x0003" AmsPort="28673" AmsNetId="0.0.0.0.2.1" RemoteName="PLC Rail (EtherCAT)" InfoImageId="2">
<?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">
<Device Id="1" DevType="111" DevFlags="#x0003" AmsPort="28673" AmsNetId="0.0.0.0.2.1" RemoteName="PLC Rail (EtherCAT)">
<Name>__FILENAME__</Name>
<AddressInfo>
<Ccat>
Expand All @@ -27,7 +27,7 @@
</Identification>
</Ccat>
</AddressInfo>
<Image Id="1" ImageFlags="#x00000030" AddrType="9" ImageType="3">
<Image Id="1" ImageFlags="#x30" AddrType="9" ImageType="3">
<Name>Image</Name>
</Image>
<Image Id="4" AddrType="10" ImageType="3">
Expand Down
10 changes: 5 additions & 5 deletions ...)/Power (EK1200)/PLC Junction 1 (EK1122)/X1 AtmosphereMotion (EK1100)/GasJetXY-EL5042.xti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
<SyncMan>001080002600010001000000400080008000001026010000</SyncMan>
<SyncMan>801080002200010002000000400080008000801022010000</SyncMan>
<SyncMan>001100000400000003000000000000000000001104000000</SyncMan>
<SyncMan>801114002000010004000000000000001400801120010000</SyncMan>
<SyncMan>80110c002000010004000000000000001400801120010000</SyncMan>
<Fmmu>0000000000000000801100010100000002000000000000000000000000000000</Fmmu>
<Fmmu>00000000000000000d0800010100000003000000000000000000000000000000</Fmmu>
<BootStrapData>0010f400f410f400</BootStrapData>
<DcMode>53796e6368726f6e00000000000000004672656552756e2f534d2d53796e6368726f6e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443494e00000000000000000000000044432d53796e6368726f6e2028696e7075742062617365642900000000000000000000000000000000000000000000030100000000000000000001000000000000000000000000000000000000000000</DcMode>
<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<Pdo Name="FB Inputs Channel 1" Index="#x1a00" Flags="#x0010" SyncMan="3">
<Pdo Name="FB Inputs Channel 1" Index="#x1a00" Flags="#x0010">
<ExcludePdo>#x1a02</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6000" Sub="#x01">
<Type>BIT</Type>
Expand Down Expand Up @@ -68,7 +68,7 @@
<Type>ULINT</Type>
</Entry>
</Pdo>
<Pdo Name="FB Inputs Channel 2" Index="#x1a01" Flags="#x0010" SyncMan="3">
<Pdo Name="FB Inputs Channel 2" Index="#x1a01" Flags="#x0010">
<ExcludePdo>#x1a03</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6010" Sub="#x01">
<Type>BIT</Type>
Expand Down Expand Up @@ -98,7 +98,7 @@
<Type>ULINT</Type>
</Entry>
</Pdo>
<Pdo Name="FB Inputs Channel 1 compact" Index="#x1a02" Flags="#x0010">
<Pdo Name="FB Inputs Channel 1 compact" Index="#x1a02" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a00</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6000" Sub="#x01">
<Type>BIT</Type>
Expand Down Expand Up @@ -128,7 +128,7 @@
<Type>UDINT</Type>
</Entry>
</Pdo>
<Pdo Name="FB Inputs Channel 2 compact" Index="#x1a03" Flags="#x0010">
<Pdo Name="FB Inputs Channel 2 compact" Index="#x1a03" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a01</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6010" Sub="#x01">
<Type>BIT</Type>
Expand Down
2 changes: 1 addition & 1 deletion ...O/PLC Rail (EtherCAT)/Power (EK1200)/PLC Junction 1 (EK1122)/X1 VacuumMotion (EK1100).xti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ImageDatas>
<ImageData Id="1000">424dd6020000000000003600000028000000100000000e0000000100180000000000a0020000c40e0000c40e00000000000000000000ff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080808080808080808080808080808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c000ffffc0c0c000ffff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0ff0000c0c0c0ff0000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c00000ffc0c0c00000ff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0008000c0c0c0008000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff</ImageData>
</ImageDatas>
<Box Id="18" BoxType="9099">
<Box Id="18" 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"/>
Expand Down
14 changes: 7 additions & 7 deletions lcls-plc-lamp-motion/_Config/NC/Axes/FlowCellTheta.xti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,7 @@ External Setpoint Generation:
</Relations>
</DataType>
</DataTypes>
<Axis Id="13" CreateSymbols="true" AxisType="1">
<Axis Id="13" Disabled="true" CreateSymbols="true" AxisType="1">
<Name>__FILENAME__</Name>
<AxisPara>
<General UnitName="Degree"/>
Expand All @@ -1337,7 +1337,7 @@ External Setpoint Generation:
<Var>
<Name>In</Name>
<Type GUID="{901C2423-655B-45CE-B7E3-21F174F0F99F}" Namespace="MC">NCENCODERSTRUCT_IN2B</Type>
<BitOffs>20992</BitOffs>
<BitOffs>16960</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataIn1</Name>
</SubVar>
Expand Down Expand Up @@ -1375,7 +1375,7 @@ External Setpoint Generation:
<Var>
<Name>Out</Name>
<Type GUID="{9CC50AB2-5D79-4869-A3C2-1FA7761BAFEA}" Namespace="MC">NCENCODERSTRUCT_OUT2</Type>
<BitOffs>34304</BitOffs>
<BitOffs>27200</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataOut1</Name>
</SubVar>
Expand Down Expand Up @@ -1407,7 +1407,7 @@ External Setpoint Generation:
<Var>
<Name>In</Name>
<Type GUID="{F95C7C69-0C87-46C4-9559-1285CCA5B23A}" Namespace="MC">NCDRIVESTRUCT_IN2</Type>
<BitOffs>21312</BitOffs>
<BitOffs>17280</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataIn1</Name>
</SubVar>
Expand Down Expand Up @@ -1445,7 +1445,7 @@ Drive Status 4 (manually linked):
<Var>
<Name>Out</Name>
<Type GUID="{644DC4BD-3D15-4DCB-94C7-24F3A5D579AA}" Namespace="MC">NCDRIVESTRUCT_OUT2</Type>
<BitOffs>34624</BitOffs>
<BitOffs>27520</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataOut1</Name>
</SubVar>
Expand Down Expand Up @@ -1498,15 +1498,15 @@ Drive Status 4 (manually linked):
<Var>
<Name>FromPlc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
<BitOffs>19968</BitOffs>
<BitOffs>15936</BitOffs>
</Var>
</Vars>
<Vars VarGrpType="2" InsertType="1">
<Name>Outputs</Name>
<Var>
<Name>ToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
<BitOffs>32256</BitOffs>
<BitOffs>25152</BitOffs>
<SubVar>
<Name>AxisState</Name>
<Comment>
Expand Down
14 changes: 7 additions & 7 deletions lcls-plc-lamp-motion/_Config/NC/Axes/FlowCellX.xti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,7 @@ External Setpoint Generation:
</Relations>
</DataType>
</DataTypes>
<Axis Id="10" CreateSymbols="true" AxisType="1">
<Axis Id="10" Disabled="true" CreateSymbols="true" AxisType="1">
<Name>__FILENAME__</Name>
<AxisPara>
<Dynamic Acceleration="2" Deceleration="2"/>
Expand All @@ -1337,7 +1337,7 @@ External Setpoint Generation:
<Var>
<Name>In</Name>
<Type GUID="{901C2423-655B-45CE-B7E3-21F174F0F99F}" Namespace="MC">NCENCODERSTRUCT_IN2B</Type>
<BitOffs>16000</BitOffs>
<BitOffs>16960</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataIn1</Name>
</SubVar>
Expand Down Expand Up @@ -1375,7 +1375,7 @@ External Setpoint Generation:
<Var>
<Name>Out</Name>
<Type GUID="{9CC50AB2-5D79-4869-A3C2-1FA7761BAFEA}" Namespace="MC">NCENCODERSTRUCT_OUT2</Type>
<BitOffs>26240</BitOffs>
<BitOffs>27200</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataOut1</Name>
</SubVar>
Expand Down Expand Up @@ -1407,7 +1407,7 @@ External Setpoint Generation:
<Var>
<Name>In</Name>
<Type GUID="{F95C7C69-0C87-46C4-9559-1285CCA5B23A}" Namespace="MC">NCDRIVESTRUCT_IN2</Type>
<BitOffs>16320</BitOffs>
<BitOffs>17280</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataIn1</Name>
</SubVar>
Expand Down Expand Up @@ -1445,7 +1445,7 @@ Drive Status 4 (manually linked):
<Var>
<Name>Out</Name>
<Type GUID="{644DC4BD-3D15-4DCB-94C7-24F3A5D579AA}" Namespace="MC">NCDRIVESTRUCT_OUT2</Type>
<BitOffs>26560</BitOffs>
<BitOffs>27520</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataOut1</Name>
</SubVar>
Expand Down Expand Up @@ -1498,15 +1498,15 @@ Drive Status 4 (manually linked):
<Var>
<Name>FromPlc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
<BitOffs>14976</BitOffs>
<BitOffs>15936</BitOffs>
</Var>
</Vars>
<Vars VarGrpType="2" InsertType="1">
<Name>Outputs</Name>
<Var>
<Name>ToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
<BitOffs>24192</BitOffs>
<BitOffs>25152</BitOffs>
<SubVar>
<Name>AxisState</Name>
<Comment>
Expand Down
14 changes: 7 additions & 7 deletions lcls-plc-lamp-motion/_Config/NC/Axes/FlowCellY.xti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,7 @@ External Setpoint Generation:
</Relations>
</DataType>
</DataTypes>
<Axis Id="11" CreateSymbols="true" AxisType="1">
<Axis Id="11" Disabled="true" CreateSymbols="true" AxisType="1">
<Name>__FILENAME__</Name>
<AxisPara>
<Dynamic Acceleration="2" Deceleration="2"/>
Expand All @@ -1337,7 +1337,7 @@ External Setpoint Generation:
<Var>
<Name>In</Name>
<Type GUID="{901C2423-655B-45CE-B7E3-21F174F0F99F}" Namespace="MC">NCENCODERSTRUCT_IN2B</Type>
<BitOffs>17664</BitOffs>
<BitOffs>16960</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataIn1</Name>
</SubVar>
Expand Down Expand Up @@ -1375,7 +1375,7 @@ External Setpoint Generation:
<Var>
<Name>Out</Name>
<Type GUID="{9CC50AB2-5D79-4869-A3C2-1FA7761BAFEA}" Namespace="MC">NCENCODERSTRUCT_OUT2</Type>
<BitOffs>28928</BitOffs>
<BitOffs>27200</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataOut1</Name>
</SubVar>
Expand Down Expand Up @@ -1407,7 +1407,7 @@ External Setpoint Generation:
<Var>
<Name>In</Name>
<Type GUID="{F95C7C69-0C87-46C4-9559-1285CCA5B23A}" Namespace="MC">NCDRIVESTRUCT_IN2</Type>
<BitOffs>17984</BitOffs>
<BitOffs>17280</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataIn1</Name>
</SubVar>
Expand Down Expand Up @@ -1445,7 +1445,7 @@ Drive Status 4 (manually linked):
<Var>
<Name>Out</Name>
<Type GUID="{644DC4BD-3D15-4DCB-94C7-24F3A5D579AA}" Namespace="MC">NCDRIVESTRUCT_OUT2</Type>
<BitOffs>29248</BitOffs>
<BitOffs>27520</BitOffs>
<SubVar TypeFormatIndex="2">
<Name>nDataOut1</Name>
</SubVar>
Expand Down Expand Up @@ -1498,15 +1498,15 @@ Drive Status 4 (manually linked):
<Var>
<Name>FromPlc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
<BitOffs>16640</BitOffs>
<BitOffs>15936</BitOffs>
</Var>
</Vars>
<Vars VarGrpType="2" InsertType="1">
<Name>Outputs</Name>
<Var>
<Name>ToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
<BitOffs>26880</BitOffs>
<BitOffs>25152</BitOffs>
<SubVar>
<Name>AxisState</Name>
<Comment>
Expand Down
Loading
Loading