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

David's latest versions from IMAT #87

Merged
merged 1 commit into from
Oct 22, 2016
Merged

Conversation

FreddieAkeroyd
Copy link
Member

@FreddieAkeroyd FreddieAkeroyd commented Oct 21, 2016

Description of work

Add David's IMAT files - see ISISComputingGroup/IBEX#1737

To test

Which ticket does this PR fix?

Acceptance criteria

Already working on IMAT


Code Review

Functional Tests

  • Do changes function as described? Add comments below that describe the tests performed.
  • Does the IOC respond correctly both in full and simulation mode, where it's possible to test both?
  • If there are multiple _0n IOCs, do they run correctly?

Final steps

  • Reviewer has updated the submodule in the main EPICS repo? See Reviewing work for the subModules of EPICS in the Git workflow page for details.
  • Reviewer has moved the release notes entry for this ticket in the "Changes merged into master" section

@FreddieAkeroyd FreddieAkeroyd added this to the SPRINT_2016_10_06 milestone Oct 21, 2016
@FreddieAkeroyd FreddieAkeroyd self-assigned this Oct 22, 2016
@FreddieAkeroyd
Copy link
Member Author

The code as is makes multiple copies of the common ioc startup file, this is incorrect but as it is already in use I will merge. The code should be tidied up - see ISISComputingGroup/IBEX#1738

@FreddieAkeroyd FreddieAkeroyd merged commit ad85d48 into master Oct 22, 2016
@FreddieAkeroyd FreddieAkeroyd deleted the Ticket1737_david_files branch October 22, 2016 11:01
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.

1 participant