Skip to content
Merged
Changes from all 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
4 changes: 2 additions & 2 deletions scripts/motor-expert-screen
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ if [ "${rtyp}" == 'xps8p' ]; then
title='Newport XPS Positioner'
elif [ "${rtyp}" == 'ims' ]; then
title='IMS Motor Control -- Main'
elif [ "${rtyp}" == 'motor' ]; then
elif [[ "${rtyp}" == 'motor' ]] || [[ "${rtyp}" == 'tcmotor' ]]; then
# Check to see if this is a Beckhoff axis
# caget will return exit code 0 if :PLC:nErrorId_RBV exists,
# we set isbeckhoff based on this.
if caget "${PREFIX}:PLC:nErrorId_RBV" > /dev/null 2>&1; then
if [[ "${rtyp}" == 'tcmotor' ]] || caget "${PREFIX}:PLC:nErrorId_RBV" > /dev/null 2>&1; then

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Did you make sure this still works for non tcmotor beckhoff motors?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah, regular IMS motors still work; I haven't tested on Aerotech yet. I'm not sure if we still use them.

@ZLLentz ZLLentz Jul 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't mean to ask you to test every motor type, just the ones affected by this line: motors on beckhoff IOCs that aren't tcmotor type

@ctslac ctslac Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I wanted to check Aerotech becuase I see the beckhoff logic is close the Aerotech. But it still works

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yeah I see now that aerotech is the else clause here- didn't see it on review because it was outside the diff. Good job being thorough.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But yeah I'll approve this if you can confirm that "old" beckhoff motors still work

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yep! Tc motors with the RTYP as 'motor' still work.

title="Typhos Suite - ${PREFIX}"
isbeckhoff=true;
else
Expand Down