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

Allow selection of encoder source in Ecam table #20

Merged
merged 7 commits into from
Jul 17, 2023
Merged

Conversation

ovallcorba
Copy link
Contributor

A new controller property has been added EcamSource where we can set which encoder source should be used for specific motors (axes). Then, this information is used for the calculation of start/end/step when setting up the ecam table (by taking into consideration the selected encoder resolution and setting it as source).

Up to now the ecam table was always using AXIS as source and now it supports ENCIN, ABSENC and INPOS

Notes:

  • The name of the branch says syncpos (because tests started with syncpos...) but syncpos is not actually used here at the end, only ecam
  • This branch and PR contains also the changes from: Generate automatically MoveableOnInput #19
    (they will probably cause merge conflicts)

This reverts commit cc760d7.

# Conflicts:
#	sardana_icepap/ctrl/IcePAPTriggerController.py
@rhomspuron
Copy link
Contributor

Reverted commit from #19

@rhomspuron rhomspuron merged commit 87ab4f3 into master Jul 17, 2023
@rhomspuron rhomspuron deleted the use_syncpos branch July 17, 2023 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants