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

Add SL1K2 flow meter #111

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Add SL1K2 flow meter #111

merged 2 commits into from
Jan 17, 2024

Conversation

nrwslac
Copy link
Contributor

@nrwslac nrwslac commented Jan 12, 2024

Description

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)

@@ -4337,8 +4345,8 @@ Emergency Stop for MR1K1]]></Comment>
<Link VarA="PlcTask Inputs^Main.M23.nRawEncoderULINT" VarB="FB Inputs Channel 1^Position" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^E5 (EK1122)^SL1K2-EXIT (EK1100)^EL7047_SL1K2_GAP">
<Link VarA="PlcTask Inputs^Main.M22.bLimitBackwardEnable" VarB="STM Status^Status^Digital input 1" AutoLink="true" Size="1"/>
<Link VarA="PlcTask Inputs^Main.M22.bLimitForwardEnable" VarB="STM Status^Status^Digital input 2" AutoLink="true" Size="1"/>
<Link VarA="PlcTask Inputs^Main.M22.bLimitBackwardEnable" VarB="STM Status^Status^Digital input 2" AutoLink="true" Size="1"/>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure why this changed? I didn't modify these. Is bLimitBackwardEnable supposed to be linked to input 1? @ghalym

Copy link
Contributor Author

Choose a reason for hiding this comment

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

bLimitBackwardEnable on 2 as it is here is consist with the previous pull request, but master has bLimitBackwardEnable on 1.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Interesting. Checking my notes the forwards is input 1 and the backwards is input 2. These changes should have been committed. I also changes the limits for other axes. I will take another look.

Copy link
Collaborator

@ghalym ghalym 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 76421ce into pcdshub:master Jan 17, 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.

2 participants