Skip to content

Commit f625631

Browse files
authored
Merge pull request #480 from ISISComputingGroup/Ticket2173_HRPD_sample_changer
Ticket2173: Added HRPD sample changer OPI
2 parents 977cb19 + 1a36d1d commit f625631

File tree

6 files changed

+1671
-2
lines changed

6 files changed

+1671
-2
lines changed

base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ public enum ComponentType {
112112
/** Omron PLC. */
113113
PLC,
114114
/** Zoom sample stack. */
115-
ZOOM_SAMPLE_STACK;
115+
ZOOM_SAMPLE_STACK,
116+
/** Sample changer for HRPD/POLARIS/GEM. */
117+
ROT_SAMPLE_CHANGER;
116118

117119
private Target target;
118120

base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,15 @@
706706
<macros>
707707
</macros>
708708
</value>
709-
</entry>
709+
</entry>
710+
<entry>
711+
<key>Rotating Sample Changer</key>
712+
<value>
713+
<type>ROT_SAMPLE_CHANGER</type>
714+
<path>rot_sample_changer.opi</path>
715+
<description>The OPI for the rotating sample changer on HRPD/GEM/POLARIS. No properties required.</description>
716+
</value>
717+
</entry>
710718
<entry>
711719
<key>Omron PLC</key>
712720
<value>

0 commit comments

Comments
 (0)