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

Txi optics veto #28

Merged
merged 5 commits into from
Nov 20, 2024
Merged

Txi optics veto #28

merged 5 commits into from
Nov 20, 2024

Conversation

ghalym
Copy link
Contributor

@ghalym ghalym commented Oct 23, 2024

Description

FIX FFO dev name and description

Double the MR1K3 IN position's encoder count delta from 5,000 microns to 10,000 microns as per https://jira.slac.stanford.edu/browse/ECS-5650

Motivation and Context

How Has This Been Tested?

Where Has This Been Documented?

Screenshots (if appropriate):

Pre-merge checklist

  • Code works interactively
  • Code contains descriptive comments
  • Test suite passes locally
  • Libraries are set to fixed versions and not Always Newest
  • Code committed with pre-commit (alternatively pre-commit run --all-files)

@ghalym ghalym requested a review from nrwslac October 23, 2024 01:02
@ghalym ghalym requested a review from ZLLentz November 5, 2024 19:30
FFO_RIX_TXI_OPTICS : FB_FastFault :=(
i_Desc := 'Fault when MR1K1 is IN while a TXI Optics is in (either MR1K3 and MR2K3)',
FFO_RIX_TXI_OPTICS : FB_FastFault :=(i_DevName := 'PMPS Arbiter',
i_Desc := 'Fault when MR1K1 is IN while a TXI Optics is IN (Check MR1K3 and MR2K3)',
Copy link
Member

Choose a reason for hiding this comment

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

I like the updated names and descriptions 👍

Comment on lines +117 to +118
cMR1K3_IN_UpperLimit : UDINT := 108500000 + 10000000;
cMR1K3_IN_LowerLimit : UDINT := 108500000 - 10000000 ;
Copy link
Member

@ZLLentz ZLLentz Nov 5, 2024

Choose a reason for hiding this comment

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

Is there a reference for these encoder count changes?
It is not mentioned in the PR description.

Copy link

Choose a reason for hiding this comment

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

https://jira.slac.stanford.edu/browse/ECS-5650 I think its in the comments here.

Copy link

Choose a reason for hiding this comment

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

Could use better documentation here, but 10,000 microns specified as delta converted nano here.

Copy link
Member

Choose a reason for hiding this comment

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

I'm going to add "Double the MR1K3 IN position's encoder count delta from 5,000 microns to 10,000 microns as per https://jira.slac.stanford.edu/browse/ECS-5650" to the PR description, then I'm going to approve.

Copy link

@nrwslac nrwslac left a comment

Choose a reason for hiding this comment

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

lgtm

@ghalym ghalym merged commit 13a48d8 into pcdshub:master Nov 20, 2024
9 checks passed
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.

3 participants