Merge pull request #480 from ISISComputingGroup/Ticket2173_HRPD_sampl…

…e_changer Ticket2173: Added HRPD sample changer OPI
ISISComputingGroup · Apr 18, 2017 · f625631 · f625631
2 parents 977cb19 + 1a36d1d
commit f625631
Show file tree

Hide file tree

Showing 6 changed files with 1,671 additions and 2 deletions.
diff --git a/...s.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java b/...s.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java
@@ -112,7 +112,9 @@ public enum ComponentType {
     /** Omron PLC. */
     PLC,
     /** Zoom sample stack. */
-    ZOOM_SAMPLE_STACK;
+    ZOOM_SAMPLE_STACK,
+    /** Sample changer for HRPD/POLARIS/GEM. */
+    ROT_SAMPLE_CHANGER;
 
 	private Target target;
 

diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml
@@ -706,7 +706,15 @@
 				<macros>
 				</macros>
 			</value>
-		</entry> 				
+		</entry> 
+		<entry>
+			<key>Rotating Sample Changer</key>
+			<value>
+				<type>ROT_SAMPLE_CHANGER</type>
+				<path>rot_sample_changer.opi</path>
+				<description>The OPI for the rotating sample changer on HRPD/GEM/POLARIS. No properties required.</description>
+			</value>
+		</entry> 	
 		<entry>
 			<key>Omron PLC</key>
 			<value>