PySigmaKoki 2.1.2__tar.gz → 2.1.4__tar.gz

pysigmakoki-2.1.4/PKG-INFO

@@ -0,0 +1,29 @@
+Metadata-Version: 2.4
+Name: PySigmaKoki
+Version: 2.1.4
+Summary: Python Interface for Instruments by Sigma Koki
+Author-email: Akira Okumura <oxon@mac.com>
+License: BSD License
+Project-URL: Repository, https://github.com/akira-okumura/PySigmaKoki.git
+Project-URL: Issues, https://github.com/akira-okumura/PySigmaKoki/issues
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+Requires-Dist: pyserial
+
+# PySigmaKoki
+Python module to control Sigma Koki stages
+
+# Install
+    $ pip install pysigmakoki
+
+# Example
+    >>> import sigma_koki
+    >>> gsc02 = sigma_koki.GSC02()
+    >>> gsc02.open('/dev/tty.usbserial-FTT75V89A')
+    >>> gsc02.setSpeed(1, 50, 20000, 1000, 50, 20000, 1000)
+    >>> gsc02.returnToMechanicalOrigin('+', '+')
+    >>> gsc02.move(-50000, -50000)
+    >>> gsc02.getStatus()
+    '-    50000,-    50000,K,K,R'

pysigmakoki-2.1.4/PySigmaKoki.egg-info/PKG-INFO

@@ -0,0 +1,29 @@
+Metadata-Version: 2.4
+Name: PySigmaKoki
+Version: 2.1.4
+Summary: Python Interface for Instruments by Sigma Koki
+Author-email: Akira Okumura <oxon@mac.com>
+License: BSD License
+Project-URL: Repository, https://github.com/akira-okumura/PySigmaKoki.git
+Project-URL: Issues, https://github.com/akira-okumura/PySigmaKoki/issues
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+Requires-Dist: pyserial
+
+# PySigmaKoki
+Python module to control Sigma Koki stages
+
+# Install
+    $ pip install pysigmakoki
+
+# Example
+    >>> import sigma_koki
+    >>> gsc02 = sigma_koki.GSC02()
+    >>> gsc02.open('/dev/tty.usbserial-FTT75V89A')
+    >>> gsc02.setSpeed(1, 50, 20000, 1000, 50, 20000, 1000)
+    >>> gsc02.returnToMechanicalOrigin('+', '+')
+    >>> gsc02.move(-50000, -50000)
+    >>> gsc02.getStatus()
+    '-    50000,-    50000,K,K,R'

{PySigmaKoki-2.1.2 → pysigmakoki-2.1.4}/PySigmaKoki.egg-info/SOURCES.txt

@@ -1,5 +1,5 @@
 README.md
-setup.py
+pyproject.toml
 sigma_koki.py
 PySigmaKoki.egg-info/PKG-INFO
 PySigmaKoki.egg-info/SOURCES.txt

{PySigmaKoki-2.1.2 → pysigmakoki-2.1.4}/README.md

@@ -1,6 +1,9 @@
 # PySigmaKoki
 Python module to control Sigma Koki stages
 
+# Install
+    $ pip install pysigmakoki
+
 # Example
     >>> import sigma_koki
     >>> gsc02 = sigma_koki.GSC02()

pysigmakoki-2.1.4/pyproject.toml

@@ -0,0 +1,25 @@
+[build-system]
+requires = ["setuptools >= 61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "PySigmaKoki"
+version = "2.1.4"
+description = "Python Interface for Instruments by Sigma Koki"
+authors = [
+    { name = "Akira Okumura", email = "oxon@mac.com" }
+]
+readme = {file = "README.md", content-type = "text/markdown"}
+license = {text = "BSD License"}
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: OS Independent"
+]
+dependencies = [
+    "pyserial"
+]
+
+[project.urls]
+Repository = "https://github.com/akira-okumura/PySigmaKoki.git"
+Issues = "https://github.com/akira-okumura/PySigmaKoki/issues"

{PySigmaKoki-2.1.2 → pysigmakoki-2.1.4}/sigma_koki.py

@@ -24,12 +24,13 @@ class BaseStageController(object):
         self.__acknowledge =  True
 
     def setBaudRate(self, rate):
-        if product == 'GSC-02' and rate in (2400, 4800, 9600, 19200):
-            self.__baudRate = rate
-        elif product == 'SHOT-702' and rate == 38400:
+        rates = {'GSC-02': (2400, 4800, 9600, 19200),
+                 'SHOT-702' : (38400,),
+                 'SHOT-702H' : (38400,)}
+        if rate in rates[self.__product]:
             self.__baudRate = rate
         else:
-            raise ValueError('Attempting to set an invalid buard rate %d to %s. Must be chosen from 2400/4800/9600/19200 for GSC-02 and 38400 for SHOT-702.' % (rate, self.__product))
+            raise ValueError('Attempting to set an invalid buard rate of %d to %s. The rate must be chosen from %s.' % (rate, self.__product, rates[self.__product]))
 
     def disableAcknowledge(self):
         self.__acknowledge = False
@@ -225,6 +226,19 @@ class BaseStageController(object):
         """
         return self.query('!:')
 
+    def waitForReady(self, timeout_in_sec):
+        """
+        Sleep up to timeout_in_sec until the ACK3 state becomes ready.
+        """
+         for i in range(timeout_in_sec*10):
+            ack3 = self.getACK3()
+            if ack3 == 'R': # ready
+                break
+            elif ack3 == 'B': # busy
+                time.sleep(0.1)
+            elif: # unknown state
+                time.sleep(0.1) # wait anyway 
+
     def getVersion(self):
         """
         Returns the ROM version

PySigmaKoki-2.1.2/PKG-INFO

@@ -1,17 +0,0 @@
-Metadata-Version: 2.1
-Name: PySigmaKoki
-Version: 2.1.2
-Summary: Python Interface for Instruments by Sigma Koki
-Home-page: https://github.com/akira-okumura/PySigmaKoki
-Author: Akira Okumura
-Author-email: oxon@mac.com
-License: BSD License
-Platform: MacOS :: MacOS X
-Platform: POSIX
-Platform: Windows
-Classifier: Topic :: Terminals :: Serial
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python
-
-
-This is an interface module for instruments produced by Sigma Koki

PySigmaKoki-2.1.2/PySigmaKoki.egg-info/PKG-INFO

@@ -1,17 +0,0 @@
-Metadata-Version: 2.1
-Name: PySigmaKoki
-Version: 2.1.2
-Summary: Python Interface for Instruments by Sigma Koki
-Home-page: https://github.com/akira-okumura/PySigmaKoki
-Author: Akira Okumura
-Author-email: oxon@mac.com
-License: BSD License
-Platform: MacOS :: MacOS X
-Platform: POSIX
-Platform: Windows
-Classifier: Topic :: Terminals :: Serial
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python
-
-
-This is an interface module for instruments produced by Sigma Koki

PySigmaKoki-2.1.2/setup.py

@@ -1,19 +0,0 @@
-from distutils.core import setup
-import sigma_koki
-
-setup(name='PySigmaKoki',
-      version='2.1.2',
-      description='Python Interface for Instruments by Sigma Koki',
-      author='Akira Okumura',
-      author_email='oxon@mac.com',
-      license='BSD License',
-      platforms=['MacOS :: MacOS X', 'POSIX', 'Windows'],
-      url='https://github.com/akira-okumura/PySigmaKoki',
-      py_modules=['sigma_koki'],
-      install_requires=['pyserial'],
-      classifiers=['Topic :: Terminals :: Serial',
-                   'Development Status :: 5 - Production/Stable',
-                   'Programming Language :: Python',
-                   ],
-      long_description=sigma_koki.__doc__
-      )