Merge branch 'master' into fix-visa_version_check

Author: scasagrande

doc/examples/qubitekk/ex_qubitekk_mc1.py

@@ -0,0 +1,39 @@
+#!/usr/bin/python
+# Qubitekk Motor controller example
+from time import sleep
+
+from instruments.qubitekk import MC1
+import quantities as pq
+
+
+if __name__ == "__main__":
+
+    mc1 = MC1.open_serial(vid=1027, pid=24577, baud=9600, timeout=1)
+    mc1.step_size = 25*pq.ms
+    mc1.inertia = 10*pq.ms
+    print("step size:", mc1.step_size)
+    print("inertial force: ", mc1.inertia)
+
+    print("Firmware", mc1.firmware)
+    print("Motor controller type: ", mc1.controller)
+    print("centering")
+
+    mc1.center()
+    while mc1.is_centering():
+        print(str(mc1.metric_position)+" "+str(mc1.direction))
+        pass
+
+    print("Stage Centered")
+    # for the motor in the mechanical delay line, the travel is limited from
+    # the full range of travel. Here's how to set the limits.
+    mc1.lower_limit = -260*pq.ms
+    mc1.upper_limit = 300*pq.ms
+    mc1.increment = 5*pq.ms
+    x_pos = mc1.lower_limit
+    while x_pos <= mc1.upper_limit:
+        print(str(mc1.metric_position)+" "+str(mc1.direction))
+        mc1.move(x_pos)
+        while mc1.move_timeout > 0:
+            sleep(0.5)
+        sleep(1)
+        x_pos += mc1.increment

doc/source/apiref/ondax.rst

@@ -0,0 +1,16 @@
+..
+    TODO: put documentation license header here.
+    
+.. currentmodule:: instruments.ondax
+    
+=====
+Ondax
+=====
+
+:class:`LM` Ondax SureLock Laser Module
+=======================================
+
+.. autoclass:: LM
+    :members:
+    :undoc-members:
+

doc/source/apiref/qubitekk.rst

@@ -14,4 +14,9 @@ Qubitekk
     :members:
     :undoc-members:
 
+:class:`MC1` Motor Controller
+=============================
 
+.. autoclass:: MC1
+    :members:
+    :undoc-members:

instruments/__init__.py

@@ -36,7 +36,7 @@
 # In keeping with PEP-396, we define a version number of the form
 # {major}.{minor}[.{postrelease}]{prerelease-tag}
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 
 __title__ = "instrumentkit"
 __description__ = "Test and measurement communication library"

instruments/ondax/__init__.py

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Module containing Ondax Instruments
+"""
+from __future__ import absolute_import
+from .lm import LM