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

Changes made to CRISP locally #910

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes made to CRISP locally #910

wants to merge 1 commit into from

Conversation

jackbdoughty
Copy link
Contributor

Changes that were on CRISP before deploying- these look to be intentional.

@FreddieAkeroyd
Copy link
Member

FreddieAkeroyd commented Jan 24, 2025

It looks like it was changed to support two axes/cards - we may want to recode this is a way to allow it to support both options (and even e.g. three axes) could do tests on presence of AXIS1_ID etc and other macros to determine axes present

ifeq ($(AREA_DETECTOR),)
include $(CONFIG)/CONFIG_PVA_ISIS
endif

$(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS)
Copy link
Member

Choose a reason for hiding this comment

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

This change should be discarded - it is because the instrument had an older version of the file

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants