script/devices/BarcodeReader.py

@@ -2,6 +2,12 @@
 
 class BarcodeReader(DeviceBase):
 
+    def __init__(self, name, microscan, microscan_cmd):
+        DeviceBase.__init__(self, name)
+        self.microscan = microscan
+        self.microscan_cmd = microscan_cmd
+
+        
     def doInitialize(self):
         self.disable()
         self.readout = None
@@ -9,19 +15,19 @@ class BarcodeReader(DeviceBase):
         self.task_callable=None
         
     def enable(self):
-        microscan_cmd.write("<H>")
+        self.microscan_cmd.write("<H>")
         self.setState(State.Ready)
     
     def disable(self):    
-        microscan_cmd.write("<I>")
+        self.microscan_cmd.write("<I>")
         self.setState(State.Disabled)
     
     def get(self,timeout=1.0):    
         self.state.assertReady()
         try:
             self.setState(State.Busy)
-            microscan.flush()
-            ret =  microscan.waitString(int(timeout * 1000)) 
+            self.microscan.flush()
+            ret =  self.microscan.waitString(int(timeout * 1000)) 
             if ret is not None:
                 ret = ret.strip()   
             self.setCache(ret, None)
@@ -72,5 +78,6 @@ class BarcodeReader(DeviceBase):
         return self.readout
 
 
-add_device(BarcodeReader("barcode_reader"), force = True)         
+add_device(BarcodeReader("barcode_reader", mscan_pin, mscan_pin_cmd), force = True)         
+add_device(BarcodeReader("barcode_reader_puck", mscan_puck, mscan_puck_cmd), force = True)         
         

script/devices/Hexiposi.py

@@ -146,7 +146,7 @@ class Hexiposi(DiscretePositionerBase):
         
  
 #http://myriotell:8003/hexiposi/get
-dev = Hexiposi("hexiposi", "myriotell")
+dev = Hexiposi("hexiposi", "myriotell6s")
 
 add_device(dev, True)
 hexiposi.polling=1000

script/local.py

@@ -55,6 +55,13 @@ def set_barcode_reader_scan_pucks(value):
 def reset_mounted_sample_position():
  set_setting("mounted_sample_position", None)  
 
+
+def get_puck_barcode_reader(): 
+    if is_barcode_reader_scan_pucks():
+        return barcode_reader
+    else:
+        return barcode_reader_puck
+
 #In order to apply current config
 set_imaging_enabled(is_imaging_enabled())    
 set_puck_types(get_puck_types())