Skip to content

#8614 Added notes for Oxford Instruments - Mercury IPS controller #8831

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 16, 2025
Merged

#8614 Added notes for Oxford Instruments - Mercury IPS controller #8831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88e1316
Resolved conflicts on merging with master
iangillingham-stfc Sep 18, 2025
b7c96b4
Delete & gitignore .idea
Tom-Willemsen Oct 16, 2025
56c6906
Merge branch 'master' into Ticket8614_mercury_IPS_magnet_supply
Tom-Willemsen Oct 16, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Copy link
Contributor Author

@iangillingham-stfc iangillingham-stfc Oct 16, 2025

Choose a reason for hiding this comment

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

Yep - didn't realise I'd committed .idea. Good move to ignore.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.idea/

2 changes: 2 additions & 0 deletions release_notes/Release-Notes-v26.2.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ See [here](https://github.com/ISISComputingGroup/IBEX/wiki#instrument-informatio

| Ticket | Type | Device | Change |
| ------ | --- |------| ------------- |

|[#8614](https://github.com/ISISComputingGroup/IBEX/issues/8614) | Minor | Oxford Instruments - Mercury IPS| Added support for SCPI mode to use the full capabilities of the new Mercury IPS magnet supplies|
|[#8766](https://github.com/ISISComputingGroup/IBEX/issues/8766) | Minor | DELFTDCMAG IOC| Echo Coil RBV and SP now agree on units (Amps)|
|[#8680](https://github.com/ISISComputingGroup/IBEX/issues/8680) | Minor | HVCAEN | Number of summary channels is now configurable by macro. |

Expand Down