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.

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

Ticket2365 emma chopper lifter #13

Merged
merged 3 commits into from
Nov 29, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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 GalilSup/Db/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ GMC += galil_Default_Footer.gmc galil_Default_Header.gmc galil_Home_ForwLimit.
GMC += galil_Home_Home.gmc galil_Home_Home+FIneg.gmc galil_Home_Home+FIpos.gmc galil_Home_RevLimit.gmc
GMC += galil_Home_RevLimit_Home.gmc galil_Piezo_Home.gmc galil_Home_ForwLimit+FIneg.gmc galil_Home_RevLimit+FIpos.gmc
GMC += galil_Home_Pin_Hole_Selector.gmc galil_Home_Thread.gmc galil_Home_Dummy_Axis.gmc
GMC += galil_Home_FIpos.gmc galil_Home_FIneg.gmc galil_Muon_Slits.gmc
GMC += galil_Home_FIpos.gmc galil_Home_FIneg.gmc galil_Muon_Slits.gmc galil_emma_chopper_lifter.gmc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please could this be put below under "device specific routines" rather than here in the homing routines. Muons should probably move down too.

# Device specific routines
GMC += galil_Oscillating_Collimator.gmc galil_Oscillating_Collimator_Merlin.gmc
# Dummy routines mainly used for testing
Expand Down
73 changes: 73 additions & 0 deletions GalilSup/Db/galil_emma_chopper_lifter.gmc
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
' status=1 clamped
' status=2 parked
' status=3 moving
' status=5 error
#Park
IF(_LFF=1)
MTF=2;
ACF=1024;
DCF=16384;
'
SHF;
'
WT1000
SPF=1000;
HMF;
BGF;
status=3; 'moving
'
AMF;
IF(_SCF=10)
WT=1000;
SPF=5000;
PRF=369*1280; 'mm x usteps/mm
BGF;
'
AMF;
'
IF(_LFF=0)
status=2; 'parked
ELSE
status=5; 'ERROR
ENDIF
'
ELSE
status=5; 'ERROR
ENDIF
ENDIF
MOF
EN
'
#Clamp
IF(_LRF=1)
MTF=2;
ACF=1024;
DCF=16384;
'
SHF;
SPF=5000;
HMF;
BGF;
status=4; 'moving
'
AMF;
IF(_SCF=10)
WT=1000;
SPF=1000;
PRF=-9*1280; 'mm x usteps/mm
BGF;
'
AMF;
'
IF(_LRF=0)
status=1; 'clamped
ELSE
status=5; 'ERROR
ENDIF
'
ELSE
status=5; 'ERROR
ENDIF
ENDIF
MOF
EN