From 52c3e832643fcb770d88aaa5121f9aa788233c0d Mon Sep 17 00:00:00 2001 From: Chsudeepta <142808099+Chsudeepta@users.noreply.github.com> Date: Thu, 6 Aug 2026 13:42:38 +0100 Subject: [PATCH 1/2] Update Merlin OPCUA --- release_notes/Release-Notes-v26.8.0.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/release_notes/Release-Notes-v26.8.0.md b/release_notes/Release-Notes-v26.8.0.md index 52a945e9..67e7ce5b 100644 --- a/release_notes/Release-Notes-v26.8.0.md +++ b/release_notes/Release-Notes-v26.8.0.md @@ -6,13 +6,14 @@ See [here](https://github.com/ISISComputingGroup/IBEX/wiki#instrument-informatio | Ticket | Type | Description | | ------ | ---- | ----------- | -| [#8780](https://github.com/ISISComputingGroup/IBEX/issues/8780) | Medium | Added block level alarm config | +| [8780](https://github.com/ISISComputingGroup/IBEX/issues/8780) | Medium | Added block level alarm config | | [#8995](https://github.com/ISISComputingGroup/IBEX/issues/8995) | Major | Remove ISIS MK2 chopper IOC | # Instrument Specific Changes | Instrument| Ticket | Type | Change | | --------- | ------ | ------| ------------- | +| MERLIN | [8726](https://github.com/ISISComputingGroup/IBEX/issues/8726) | MAJOR| Added Support for OPCUA interface | # Devices @@ -20,7 +21,7 @@ See [here](https://github.com/ISISComputingGroup/IBEX/wiki#instrument-informatio | Ticket | Device | Notes| | ------ | ------ | -----| -| [#8919](https://github.com/ISISComputingGroup/IBEX/issues/8919) | Moxa ioLogik E1213 | Added Support for new device| +| [8919](https://github.com/ISISComputingGroup/IBEX/issues/8919) | Moxa ioLogik E1213 | Added Support for new device| | [5885](https://github.com/ISISComputingGroup/IBEX/issues/5885) | QuantumNorthwest NeutronIQ | Added support. | @@ -37,7 +38,7 @@ See [here](https://github.com/ISISComputingGroup/IBEX/wiki#instrument-informatio | [8798](https://github.com/ISISComputingGroup/IBEX/issues/8798) | Major | Coherent OBIS Laser Remote | Support multiple lasers on a single IOC & add support for switching lasers on/off and setting output power. Previous PV names have changed, e.g. `CHTOBISR_01:some_pv` will now be `CHTOBISR_01:1:some_pv` (where `1` is the laser number). | | [TwinCat #4](https://github.com/ISISComputingGroup/EPICS-TwincatMotor/pull/4) | Patch | TC/Beckhoff | Send reset just before any moves to clear errors if possible | | [GUI #1840](https://github.com/ISISComputingGroup/ibex_gui/pull/1840) | Patch | Motors | Show a warning if motor has been left in SET mode | -| [#8688](https://github.com/ISISComputingGroup/IBEX/issues/8688) | Minor | Eurotherm | Added additional Eurotherm attributes.| +| [8688](https://github.com/ISISComputingGroup/IBEX/issues/8688) | Minor | Eurotherm | Added additional Eurotherm attributes.| | [2196](https://github.com/ISISComputingGroup/IBEX/issues/2196) & [8959](https://github.com/isisComputingGroup/ibex/issues/8959) | Minor | Nanodac | Add OPI, fix IOC, add control of "advanced loop". | | [8955](https://github.com/ISISComputingGroup/IBEX/issues/8955) | Patch | Mercury ITC | Allow Ethernet comms in addition to existing serial comms | | [8971](https://github.com/ISISComputingGroup/IBEX/issues/8971) | Patch | Knauer K-6 | Increase number of available IOCs from 2 to 4 | @@ -58,8 +59,8 @@ See [here](https://github.com/ISISComputingGroup/IBEX/wiki#instrument-informatio | Ticket | Type | Change | | ------ | ---- | ------------- | -| [#3396](https://github.com/ISISComputingGroup/IBEX/issues/3396) | Medium | Added a tab to show globals settings in the edit/view configuration screen | -| [#8764](https://github.com/ISISComputingGroup/IBEX/issues/8764) | Medium | Added block level alarm config in Add/Edit Block screen | +| [3396](https://github.com/ISISComputingGroup/IBEX/issues/3396) | Medium | Added a tab to show globals settings in the edit/view configuration screen | +| [8764](https://github.com/ISISComputingGroup/IBEX/issues/8764) | Medium | Added block level alarm config in Add/Edit Block screen | ### Script Generator From 705cad32ad306bebab5c948306da86dd7deee770 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Fri, 7 Aug 2026 16:31:50 +0100 Subject: [PATCH 2/2] Update release notes for version 26.8.0 --- release_notes/Release-Notes-v26.8.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release_notes/Release-Notes-v26.8.0.md b/release_notes/Release-Notes-v26.8.0.md index 67e7ce5b..19192a42 100644 --- a/release_notes/Release-Notes-v26.8.0.md +++ b/release_notes/Release-Notes-v26.8.0.md @@ -7,13 +7,13 @@ See [here](https://github.com/ISISComputingGroup/IBEX/wiki#instrument-informatio | Ticket | Type | Description | | ------ | ---- | ----------- | | [8780](https://github.com/ISISComputingGroup/IBEX/issues/8780) | Medium | Added block level alarm config | -| [#8995](https://github.com/ISISComputingGroup/IBEX/issues/8995) | Major | Remove ISIS MK2 chopper IOC | +| [8995](https://github.com/ISISComputingGroup/IBEX/issues/8995) | Major | Remove ISIS MK2 chopper IOC | # Instrument Specific Changes | Instrument| Ticket | Type | Change | | --------- | ------ | ------| ------------- | -| MERLIN | [8726](https://github.com/ISISComputingGroup/IBEX/issues/8726) | MAJOR| Added Support for OPCUA interface | +| MERLIN | [8726](https://github.com/ISISComputingGroup/IBEX/issues/8726) | MAJOR| Added Support for Vacuum PLC via OPCUA | # Devices