search

pcdshub / lcls-plc-tmo-motion

Beckhoff motion control for TMO beamline components in the FEE and in TMO
https://pcdshub.github.io/lcls-plc-tmo-motion/index.html
Other
0 stars 14 forks source link

Wfs ppm pmps #95

Closed tongju12 closed 1 year ago

tongju12 commented 1 year ago

Description

WFS-PPM PMPS deployed Because when I work on WFS-PPM-PMPS branch, I did not fetch the most recent in master which includes Nick recent flow sensor codes. So I try to merge WFS-PPM-PMPS branch and upstream master and manually choose. However it only merge part of his code. Only IM3K4 flow sensor is here. So I need to manually put the others code into WFS-PPM-PMPS branch. This branch is running in PLC. I plan to push again after I adding other flow sensor codes. 8-29: I push all flow sensor code in IM4K4-Im6K4; I also ad bmoveOk for every common component

Add WFS-PPM PMPS. If WFS any target in, PPM YAG can take any beam. Otherwise, PPM YAG will work as normal PMPS state

Motivation and Context

TMO scientists ask for it and give them freedom during the beam time.

How Has This Been Tested?

Tested in TMO GUI. While PF1K4 IN, IM5K4 and take 100% beam. While PF1K4 OUT, IM4K4 YAG take 10% beam as normal PMPS device.

Where Has This Been Documented?

https://jira.slac.stanford.edu/browse/ECS-3735

Screenshots (if appropriate):

Pre-merge checklist

tongju12 commented 1 year ago

My second commit is manually add flow sensor code for Im4K4 to IM6K4 in WFS-PPM-PMPS branch that it could not automatically merged with master branch.

tongju12 commented 1 year ago

I add one more commit by adding bMoveOK for every common component every state. It is all done. And I test it by TMO motion GUI. Meanwhile, I used Zach temporary common component library 0.0.0 for one of the small bug. Zach will release new library for fixing this bug.

tongju12 commented 1 year ago

Thanks Zach. I did change all of them and push again.

tongju12 commented 1 year ago

Zach, this version has new library 4.01 of twincats and 3.01 of common components. Meanwhile, I fixed the limit switch of sp1k4-solid attenuator and encoder/motor alignment. I should create a different branch but forget to do that. So I embed those together.