Skip to content

Commit

Permalink
Merge pull request pcdshub#87 from tongju12/SP1K4-ATT
Browse files Browse the repository at this point in the history 
adding two new LIN Engineering motors for FOIL Y and Y
  • Loading branch information
@tongju12
tongju12 authored Aug 7, 2023
2 parents 82f9bd6 + 5c126fe commit a1b06dd
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ...LC Coupler 2 (EK1100)/PLC Junction 9 (EK1122)/SP1K4 Bottom Rail (EK1100)/FoilX-EL7041.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<MBoxUserCmdData>004003000a00000000000000000000000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>020003000c0000000c000000000000000000000000000000000000000000000020111001040000006c6f6164537562496e6465782030303100</MBoxUserCmdData>
<MBoxUserCmdData>020003000a0000000f000000000000000000000000000000000000000000000020108002020000006400526564756365642063757272656e7400</MBoxUserCmdData>
<MBoxUserCmdData>020003000a0000000f0000000000000000000000000000000000000000000000201080030200000080bb4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800302000000c05d4e6f6d696e616c20766f6c7461676500</MBoxUserCmdData>
<MBoxUserCmdData>020003000a00000015000000000000000000000000000000000000000000000020108004020000005f004d6f746f7220636f696c20726573697374616e636500</MBoxUserCmdData>
<MBoxUserCmdData>020003000a0000000f00000003000000000000000000000000000000000000002010800102000000cc104d6178696d616c2063757272656e7400</MBoxUserCmdData>
<Pdo Name="ENC Status compact" Index="#x1a00" Flags="#x0010" SyncMan="3">
Expand Down
7 changes: 7 additions & 0 deletions ...LC Coupler 2 (EK1100)/PLC Junction 9 (EK1122)/SP1K4 Top Rail (EK1100)/SP1K4-EL5042-E1.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443494e00000000000000000000000044432d53796e6368726f6e2028696e7075742062617365642900000000000000000000000000000000000000000000030100000000000000000001000000000000000000000000000000000000000000</DcMode>
<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000e0000000300000000000000000000000000000000000000200880120100000032537570706c7920566f6c7461676500</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f0000000300000000000000000000000000000000000000200880130100000000436c6f636b204672657175656e637900</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000030000000000000000000000000000000000000020088016010000002053696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000003000000000000000000000000000000000000002008801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000e0000000300000000000000000000000000000000000000201880120100000032537570706c7920566f6c7461676500</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000030000000000000000000000000000000000000020188016010000002053696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000003000000000000000000000000000000000000002018801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<Pdo Name="FB Inputs Channel 1" Index="#x1a00" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a02</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6000" Sub="#x01">
Expand Down
6 changes: 6 additions & 0 deletions ...LC Coupler 2 (EK1100)/PLC Junction 9 (EK1122)/SP1K4 Top Rail (EK1100)/SP1K4-EL5042-E2.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443494e00000000000000000000000044432d53796e6368726f6e2028696e7075742062617365642900000000000000000000000000000000000000000000030100000000000000000001000000000000000000000000000000000000000000</DcMode>
<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000e0000000300000000000000000000000000000000000000200880120100000032537570706c7920566f6c7461676500</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000030000000000000000000000000000000000000020088016010000002053696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000003000000000000000000000000000000000000002008801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000e0000000300000000000000000000000000000000000000201880120100000032537570706c7920566f6c7461676500</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000030000000000000000000000000000000000000020188016010000002053696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000003000000000000000000000000000000000000002018801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<Pdo Name="FB Inputs Channel 1" Index="#x1a00" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a02</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6000" Sub="#x01">
Expand Down
2 changes: 1 addition & 1 deletion plc-tmo-motion/_Config/NC/Axes/FoilX.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,6 @@ External Setpoint Generation:
</AxisPara>
<Encoder Name="Enc" EncType="29">
<EncPara ScaleFactorNumerator="5e-05" MaxCount="#xffffffff">
<SoftEndMaxControl Enable="true" Range="-1"/>
<Inc RefSoftSyncMask="#x0000ffff"/>
</EncPara>
<Vars VarGrpType="1">
Expand Down Expand Up @@ -1378,6 +1377,7 @@ External Setpoint Generation:
<DrvPara>
<Analog VeloReferenz="25.4" ScaleFactorActTorque="0.1"/>
<TimeComp TaskDelayCycles="1"/>
<ParameterChanged>6</ParameterChanged>
</DrvPara>
<Vars VarGrpType="1">
<Name>Inputs</Name>
Expand Down
8 changes: 4 additions & 4 deletions plc-tmo-motion/tmo_motion/tmo_motion.tmc
View file

Large diffs are not rendered by default.

0 comments on commit a1b06dd

Please sign in to comment.