Skip to content

Commit

Permalink
Merge pull request pcdshub#121 from ghalym/sl1k0-align
Browse files Browse the repository at this point in the history 
Sl1k0 align
  • Loading branch information
@ghalym
ghalym authored Aug 16, 2024
2 parents d5d7d34 + 9f2f4bc commit 2f16fe9
Show file tree
Hide file tree
Showing 4 changed files with 1,057 additions and 94,302 deletions.
158 changes: 158 additions & 0 deletions TwinCAT Measurement Project1/VSSettings/.vsm
View file
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>
4 changes: 2 additions & 2 deletions plc-kfe-motion/kfe_motion/POUs/PRG_SL1K0_POWER.TcPOU
View file
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

0 comments on commit 2f16fe9

Please sign in to comment.