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

Jump to bottom

Sl1k0 align #121

Merged
merged 6 commits into from
Aug 16, 2024
Merged

Sl1k0 align #121

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d64480c
stash
ghalym May 17, 2024
3d4b237
DEV: SL1K0 vertical re center.
ghalym May 18, 2024
2e72ee1
STY: reformatted with pre-commit
ghalym May 21, 2024
b497c55
MNT: BLD
ghalym Aug 16, 2024
8975612
Merge branch 'master' of github.com:ghalym/lcls-plc-kfe-motion
ghalym Aug 16, 2024
9f2f4bc
Merge branch 'master' of github.com:ghalym/lcls-plc-kfe-motion into s…
ghalym Aug 16, 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
158 changes: 158 additions & 0 deletions TwinCAT Measurement Project1/VSSettings/.vsm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<Node>
<Title>TwinCAT Measurement Project1</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>Scope YT NC Project</Title>
<Expanded>True</Expanded>
<FileName>C:\Github (mghaly)\lcls-plc-kfe-motion\TwinCAT Measurement Project1\Scope YT NC Project.tcscopex</FileName>
<Children>
<Node>
<Title>DataPool</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:01 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:01 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:02 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:02 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:03 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:03 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:04 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:04 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
<Node>
<Title>AT1K4-SOLID</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 SOLID MMS:01 Position </Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:01 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:01 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
<Node>
<Title>AT1K4 SOLID MMS:02 Position</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:02 SetPos </Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:02 ActPos </Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
<Node>
<Title>AT1K4 SOLID MMS:03 Position</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:03 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4 MMS:03 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
<Node>
<Title>AT1K4 MMS:04 Position</Title>
<Expanded>True</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>AT1K4 MMS:04 SetPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
<Node>
<Title>AT1K4:MMS:04 ActPos</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
</Children>
</Node>
<Node>
<Title>Trigger</Title>
<Expanded>False</Expanded>
<FileName></FileName>
<Children />
</Node>
</Children>
</Node>
</Children>
</Node>
16 changes: 8 additions & 8 deletions plc-kfe-motion/_Config/PLC/kfe_motion.xti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4176,6 +4176,14 @@ External Setpoint Generation:
<Name>PRG_ST1K4_TEST.fbFlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_OTHER.fbPC1K0FlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_OTHER.fbPC1K4FlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_3_PMPS_POST.fbArbiterIO.i_stCurrentBP</Name>
<Type GUID="{292CD354-C7C0-4A61-AAD0-1C85DD69646B}">ST_BeamParams_IO</Type>
Expand Down Expand Up @@ -7552,14 +7560,6 @@ External Setpoint Generation:
<Name>GVL.rReqTrans</Name>
<Type GUID="{6D319B26-4590-2152-3DE7-3BA9B629CA65}">ARRAY [1..16] OF ST_PMPS_Attenuator_IO</Type>
</Var>
<Var>
<Name>PRG_OTHER.fbPC1K0FlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_OTHER.fbPC1K4FlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
</Vars>
<Vars VarGrpType="2">
<Name>PlcTask Outputs</Name>
Expand Down
4 changes: 2 additions & 2 deletions plc-kfe-motion/kfe_motion/POUs/PRG_SL1K0_POWER.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ VAR

(*Offsets*)
(* Absolute encoder value at the HLS + Absolure eoncoder value at the centered beam *)
rEncoderOffsetTop: REAL := -11.2; (* 0+(-15)*)
rEncoderOffsetBottom: REAL := -11.9; (* 0+(-15)*)
rEncoderOffsetTop: REAL := -11.810; (* 0+(-15)*)
rEncoderOffsetBottom: REAL := -12.499; (* 0+(-15)*)
rEncoderOffsetNorth: REAL := -11.4;//-4.6;(* 0+(-15)*)
rEncoderOffsetSouth: REAL := -13;(* 0+(-15)*)
END_VAR
Expand Down
Loading
Loading