From bb5e8e6abede3975f783cd718237b90b68ed9b65 Mon Sep 17 00:00:00 2001
From: Daniel <dccote@cervo.ulaval.ca>
Date: Tue, 28 Jun 2022 11:19:25 -0400
Subject: [PATCH 1/3] Adding many checks for missing devices to skip tests

---
 .idea/workspace.xml                           | 68 +++++++++++--------
 hardwarelibrary/__init__.py                   |  2 +-
 hardwarelibrary/tests/testIntegraDevice.py    |  9 ++-
 hardwarelibrary/tests/testIntellidrive.py     |  2 +-
 hardwarelibrary/tests/testLabjackU3.py        |  9 ++-
 .../tests/testLinearMotionDevice.py           |  8 ++-
 hardwarelibrary/tests/testOscilloscope.py     | 20 ++----
 setup.py                                      |  6 +-
 8 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1fd78cc..a659510 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e1a2b906-4e8f-4edb-8efe-d2e272bf62ab" name="Default Changelist" comment="60" />
+    <list default="true" id="e1a2b906-4e8f-4edb-8efe-d2e272bf62ab" name="Default Changelist" comment="60">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testIntegraDevice.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testIntegraDevice.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testIntellidrive.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testIntellidrive.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testLabjackU3.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testLabjackU3.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testLinearMotionDevice.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testLinearMotionDevice.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testOscilloscope.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testOscilloscope.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -81,7 +90,7 @@
       <recent name="$PROJECT_DIR$/hardwarelibrary/tests/deprecated" />
     </key>
   </component>
-  <component name="RunManager" selected="Python tests.Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testInstantiateStellarNetDevice">
+  <component name="RunManager" selected="Python tests.Python tests for testOscilloscope.TestTektronik">
     <configuration name="hardwarelibrary" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -126,7 +135,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testGetConnectedDevices" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests for testOscilloscope.TestTektronik" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -137,11 +146,11 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testGetConnectedDevices&quot;" />
+      <option name="_new_target" value="&quot;testOscilloscope.TestTektronik&quot;" />
       <option name="_new_targetType" value="&quot;PYTHON&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testGetStellarNetDevices" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests in testModulePySerial.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -152,11 +161,11 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testGetStellarNetDevices&quot;" />
-      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testModulePySerial.py&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testInstantiateStellarNetDevice" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests in testNotificationCenter.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -167,11 +176,11 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testInstantiateStellarNetDevice&quot;" />
-      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testNotificationCenter.py&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests for testPyUSB.PyUSBTestCase" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests in testOptotuneDevice.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -182,11 +191,11 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;testPyUSB.PyUSBTestCase&quot;" />
-      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testOptotuneDevice.py&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests in testPhysicalDevice.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests in testOscilloscope.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -197,26 +206,26 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testPhysicalDevice.py&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testOscilloscope.py&quot;" />
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
     <list>
       <item itemvalue="Python.hardwarelibrary" />
       <item itemvalue="Python.test" />
-      <item itemvalue="Python tests.Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testGetConnectedDevices" />
-      <item itemvalue="Python tests.Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testGetStellarNetDevices" />
-      <item itemvalue="Python tests.Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testInstantiateStellarNetDevice" />
-      <item itemvalue="Python tests.Python tests for testPyUSB.PyUSBTestCase" />
-      <item itemvalue="Python tests.Python tests in testPhysicalDevice.py" />
+      <item itemvalue="Python tests.Python tests in testModulePySerial.py" />
+      <item itemvalue="Python tests.Python tests in testNotificationCenter.py" />
+      <item itemvalue="Python tests.Python tests in testOptotuneDevice.py" />
+      <item itemvalue="Python tests.Python tests in testOscilloscope.py" />
+      <item itemvalue="Python tests.Python tests for testOscilloscope.TestTektronik" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python tests.Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testInstantiateStellarNetDevice" />
-        <item itemvalue="Python tests.Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testGetStellarNetDevices" />
-        <item itemvalue="Python tests.Python tests for testPhysicalDevice.TestPhysicalDeviceCompatibilityClasses.testGetConnectedDevices" />
-        <item itemvalue="Python tests.Python tests for testPyUSB.PyUSBTestCase" />
-        <item itemvalue="Python tests.Python tests in testPhysicalDevice.py" />
+        <item itemvalue="Python tests.Python tests for testOscilloscope.TestTektronik" />
+        <item itemvalue="Python tests.Python tests in testOscilloscope.py" />
+        <item itemvalue="Python tests.Python tests in testOptotuneDevice.py" />
+        <item itemvalue="Python tests.Python tests in testNotificationCenter.py" />
+        <item itemvalue="Python tests.Python tests in testModulePySerial.py" />
       </list>
     </recent_temporary>
   </component>
@@ -244,7 +253,7 @@
       <workItem from="1655919181403" duration="2830000" />
       <workItem from="1656018359548" duration="14482000" />
       <workItem from="1656249319552" duration="3372000" />
-      <workItem from="1656254916479" duration="2746000" />
+      <workItem from="1656254916479" duration="4473000" />
     </task>
     <servers />
   </component>
@@ -369,6 +378,11 @@
           <line>293</line>
           <option name="timeStamp" value="124" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/hardwarelibrary/tests/testIntegraDevice.py</url>
+          <line>11</line>
+          <option name="timeStamp" value="129" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -383,7 +397,7 @@
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testPhysicalDevice_TestSpectrometerPhysicalDevice_testPhysicalDeviceRecognizedByDeviceManagerSynchronously.coverage" NAME="Unittests for testPhysicalDevice.TestSpectrometerPhysicalDevice.testPhysicalDeviceRecognizedByDeviceManagerSynchronously Coverage Results" MODIFIED="1633319357042" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$__main__.coverage" NAME="__main__ Coverage Results" MODIFIED="1633237489450" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testPyUSB_PyUSBTestCase.coverage" NAME="Unittests for testPyUSB.PyUSBTestCase Coverage Results" MODIFIED="1656216273536" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
-    <SUITE FILE_PATH="coverage/PyHardwareLibrary$.coverage" NAME=" Coverage Results" MODIFIED="1656258239460" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
+    <SUITE FILE_PATH="coverage/PyHardwareLibrary$.coverage" NAME=" Coverage Results" MODIFIED="1656429386903" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testLinearMotionDevice.coverage" NAME="Unittests for testLinearMotionDevice Coverage Results" MODIFIED="1633280168464" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testPhysicalDevice_TestSpectrometerPhysicalDevice_testConfiguredStateAfterInitialize.coverage" NAME="Unittests for testPhysicalDevice.TestSpectrometerPhysicalDevice.testConfiguredStateAfterInitialize Coverage Results" MODIFIED="1633293814434" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testPhysicalDevice.coverage" NAME="Unittests for testPhysicalDevice Coverage Results" MODIFIED="1633662737770" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
diff --git a/hardwarelibrary/__init__.py b/hardwarelibrary/__init__.py
index 7ca1b70..b86bcef 100644
--- a/hardwarelibrary/__init__.py
+++ b/hardwarelibrary/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 __author__ = "Daniel Cote <dccote@cervo.ulaval.ca>"
 
 __all__ = ["communication","motion","oscilloscope","powermeters","spectrometers"]
diff --git a/hardwarelibrary/tests/testIntegraDevice.py b/hardwarelibrary/tests/testIntegraDevice.py
index 5bf4280..9246de3 100644
--- a/hardwarelibrary/tests/testIntegraDevice.py
+++ b/hardwarelibrary/tests/testIntegraDevice.py
@@ -12,7 +12,10 @@ class TestIntegraDevice(unittest.TestCase):
     def setUp(self):
         self.device = IntegraDevice()
         self.assertIsNotNone(self.device)
-        self.device.initializeDevice()
+        try:
+            self.device.initializeDevice()
+        except Exception as err:
+            self.skipTest("No IntegraDevice connected")
 
     def tearDown(self):
         self.device.shutdownDevice()
@@ -39,8 +42,8 @@ def setUp(self):
         self.port = USBPort(idVendor=0x1ad5, idProduct=0x0300, interfaceNumber=0, defaultEndPoints=(1,2))
         try:
             self.port.open()
-        except:
-            raise (unittest.SkipTest("No devices connected"))
+        except Exception as err:
+            self.skipTest("No IntegraDevice connected")
 
     def tearDown(self):
         self.port.close()
diff --git a/hardwarelibrary/tests/testIntellidrive.py b/hardwarelibrary/tests/testIntellidrive.py
index 272419c..c6bd0c7 100644
--- a/hardwarelibrary/tests/testIntellidrive.py
+++ b/hardwarelibrary/tests/testIntellidrive.py
@@ -13,7 +13,7 @@ def setUp(self):
         self.portPath = None
         ports = serial.tools.list_ports.comports()
         for port in ports:
-            if port.vid == 0x0403 and port.pid == 0x6001: # Sutter Instruments
+            if port.vid == 0x0403 and port.pid == 0x6001:
                 self.portPath = "/dev/cu.usbserial-{0}".format(serialNumber)
 
         if self.portPath is None:
diff --git a/hardwarelibrary/tests/testLabjackU3.py b/hardwarelibrary/tests/testLabjackU3.py
index 04c61fc..0b6b848 100644
--- a/hardwarelibrary/tests/testLabjackU3.py
+++ b/hardwarelibrary/tests/testLabjackU3.py
@@ -11,9 +11,12 @@
 class TestLabjackDevice(unittest.TestCase):
     def setUp(self):
         super().setUp()
-        self.device = LabjackDevice()
-        self.assertIsNotNone(self.device)
-        self.device.initializeDevice()
+        try:
+            self.device = LabjackDevice()
+            self.assertIsNotNone(self.device)
+            self.device.initializeDevice()
+        except Exception as err:
+            self.skipTest("No Labjack connected")
 
     def tearDown(self):
         super().tearDown()
diff --git a/hardwarelibrary/tests/testLinearMotionDevice.py b/hardwarelibrary/tests/testLinearMotionDevice.py
index 7bdb9e9..f7187b5 100644
--- a/hardwarelibrary/tests/testLinearMotionDevice.py
+++ b/hardwarelibrary/tests/testLinearMotionDevice.py
@@ -174,8 +174,14 @@ def setUp(self):
 
 class TestRealSutterDeviceBase(BaseTestCases.TestLinearMotionDevice):
     def setUp(self):
-        self.device = SutterDevice()
+
+        try:
+            self.device = SutterDevice()
+        except Exception as err:
+            self.skipTest("No Sutter device connected")
+
         super().setUp()
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/hardwarelibrary/tests/testOscilloscope.py b/hardwarelibrary/tests/testOscilloscope.py
index afedc80..7481788 100644
--- a/hardwarelibrary/tests/testOscilloscope.py
+++ b/hardwarelibrary/tests/testOscilloscope.py
@@ -10,34 +10,26 @@
 from hardwarelibrary.oscilloscope import *
 
 class TestTektronik(unittest.TestCase):
-
-    def testCreate(self):
+    def setUp(self) -> None:
         self.device = OscilloscopeDevice()
         self.assertIsNotNone(self.device)
+        try :
+            self.device.initializeDevice()
+        except Exception as err:
+            self.skipTest("No Tektronik connected")
 
-    def testInit(self):
-        self.device = OscilloscopeDevice()
-        self.device.initializeDevice()
+    def tearDown(self) -> None:
         self.device.shutdownDevice()
 
     def testGetWaveform(self):
-        self.device = OscilloscopeDevice()
-        self.device.initializeDevice()
         self.device.getWaveform(Channels.CH1)
         self.device.getWaveform(Channels.CH2)
-        self.device.shutdownDevice()
 
     def testDisplayWaveform(self):
-        self.device = OscilloscopeDevice()
-        self.device.initializeDevice()
         self.device.displayWaveforms([Channels.CH1, Channels.CH2])
-        self.device.shutdownDevice()
 
     def testDisplayWaveform(self):
-        self.device = OscilloscopeDevice()
-        self.device.initializeDevice()
         self.device.displayWaveforms([Channels.CH1, Channels.CH2])
-        self.device.shutdownDevice()
 
 
 @unittest.skip("For understanding earlier on, not necessary anymore")
diff --git a/setup.py b/setup.py
index 510e874..54f65d1 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 setuptools.setup(
     name="hardwarelibrary",
-    version="1.0.1",
+    version="1.0.3",
     url="https://github.com/DCC-Lab/PyHardwareLibrary",
     author="Daniel Cote",
     author_email="dccote@cervo.ulaval.ca",
@@ -24,10 +24,12 @@
     packages=setuptools.find_packages(),
     install_requires=['numpy','matplotlib','PySerial','PyUSB','pyftdi','opencv-python','LabJackPython'],
     python_requires='>=3.7',
+    include_package_data=True,
     package_data = {
         # If any package contains *.txt or *.rst files, include them:
         '': ['*.png'],
-        "doc": ['*.html']
+        "doc": ['*.html'],
+        "zip": ['*.zip']
     },
     classifiers=[
         'Development Status :: 4 - Beta',

From c9a1885ecccb7bb3d591a564f4cc1bac32627f22 Mon Sep 17 00:00:00 2001
From: Daniel <dccote@cervo.ulaval.ca>
Date: Thu, 30 Jun 2022 10:18:51 -0400
Subject: [PATCH 2/3] Update setup.py

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index dee8b5f..d38b8de 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 setuptools.setup(
     name="hardwarelibrary",
-    version="1.0.3",
+    version="1.0.4",
     url="https://github.com/DCC-Lab/PyHardwareLibrary",
     author="Daniel Cote",
     author_email="dccote@cervo.ulaval.ca",

From fd1e38b2bf7e14255a6cfffc25d0b89451f47838 Mon Sep 17 00:00:00 2001
From: Daniel <dccote@cervo.ulaval.ca>
Date: Mon, 31 Oct 2022 16:25:58 -0400
Subject: [PATCH 3/3] Better tests

---
 .idea/workspace.xml                           | 76 ++++++++++---------
 hardwarelibrary/daq/labjackdevice.py          |  4 +-
 hardwarelibrary/devicemanager.py              |  2 +-
 hardwarelibrary/spectrometers/oceaninsight.py |  6 ++
 hardwarelibrary/tests/testPhysicalDevice.py   | 18 ++---
 test.py                                       |  7 +-
 6 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a659510..22f63ef 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,13 +6,11 @@
   <component name="ChangeListManager">
     <list default="true" id="e1a2b906-4e8f-4edb-8efe-d2e272bf62ab" name="Default Changelist" comment="60">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hardwarelibrary/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testIntegraDevice.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testIntegraDevice.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testIntellidrive.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testIntellidrive.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testLabjackU3.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testLabjackU3.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testLinearMotionDevice.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testLinearMotionDevice.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testOscilloscope.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testOscilloscope.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/daq/labjackdevice.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/daq/labjackdevice.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/devicemanager.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/devicemanager.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/spectrometers/oceaninsight.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/spectrometers/oceaninsight.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hardwarelibrary/tests/testPhysicalDevice.py" beforeDir="false" afterPath="$PROJECT_DIR$/hardwarelibrary/tests/testPhysicalDevice.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -90,7 +88,7 @@
       <recent name="$PROJECT_DIR$/hardwarelibrary/tests/deprecated" />
     </key>
   </component>
-  <component name="RunManager" selected="Python tests.Python tests for testOscilloscope.TestTektronik">
+  <component name="RunManager" selected="Python tests.Python tests for testDeviceManager.TestDeviceManager">
     <configuration name="hardwarelibrary" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -135,7 +133,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests for testOscilloscope.TestTektronik" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests for testDeviceManager.TestDeviceManager" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -146,11 +144,11 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;testOscilloscope.TestTektronik&quot;" />
+      <option name="_new_target" value="&quot;testDeviceManager.TestDeviceManager&quot;" />
       <option name="_new_targetType" value="&quot;PYTHON&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests in testModulePySerial.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests for testOscilloscope.TestTektronik" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -161,11 +159,11 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testModulePySerial.py&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <option name="_new_target" value="&quot;testOscilloscope.TestTektronik&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests in testNotificationCenter.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests in testPhysicalDevice.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -176,11 +174,11 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testNotificationCenter.py&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testPhysicalDevice.py&quot;" />
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests in testOptotuneDevice.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Python tests in tests" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -191,41 +189,41 @@
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testOptotuneDevice.py&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests&quot;" />
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="Python tests in testOscilloscope.py" type="tests" factoryName="Autodetect" temporary="true" nameIsGenerated="true">
+    <configuration name="Unittests for testPhysicalDevice" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
       <module name="PyHardwareLibrary" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
+      <option name="SDK_HOME" value="/usr/bin/python3" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/hardwarelibrary/tests" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/hardwarelibrary/tests/testOscilloscope.py&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <option name="_new_target" value="&quot;testPhysicalDevice&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
       <method v="2" />
     </configuration>
     <list>
       <item itemvalue="Python.hardwarelibrary" />
       <item itemvalue="Python.test" />
-      <item itemvalue="Python tests.Python tests in testModulePySerial.py" />
-      <item itemvalue="Python tests.Python tests in testNotificationCenter.py" />
-      <item itemvalue="Python tests.Python tests in testOptotuneDevice.py" />
-      <item itemvalue="Python tests.Python tests in testOscilloscope.py" />
       <item itemvalue="Python tests.Python tests for testOscilloscope.TestTektronik" />
+      <item itemvalue="Python tests.Python tests in tests" />
+      <item itemvalue="Python tests.Python tests in testPhysicalDevice.py" />
+      <item itemvalue="Python tests.Unittests for testPhysicalDevice" />
+      <item itemvalue="Python tests.Python tests for testDeviceManager.TestDeviceManager" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python tests.Python tests for testDeviceManager.TestDeviceManager" />
+        <item itemvalue="Python tests.Unittests for testPhysicalDevice" />
+        <item itemvalue="Python tests.Python tests in testPhysicalDevice.py" />
+        <item itemvalue="Python tests.Python tests in tests" />
         <item itemvalue="Python tests.Python tests for testOscilloscope.TestTektronik" />
-        <item itemvalue="Python tests.Python tests in testOscilloscope.py" />
-        <item itemvalue="Python tests.Python tests in testOptotuneDevice.py" />
-        <item itemvalue="Python tests.Python tests in testNotificationCenter.py" />
-        <item itemvalue="Python tests.Python tests in testModulePySerial.py" />
       </list>
     </recent_temporary>
   </component>
@@ -253,7 +251,8 @@
       <workItem from="1655919181403" duration="2830000" />
       <workItem from="1656018359548" duration="14482000" />
       <workItem from="1656249319552" duration="3372000" />
-      <workItem from="1656254916479" duration="4473000" />
+      <workItem from="1656254916479" duration="6850000" />
+      <workItem from="1662658045679" duration="361000" />
     </task>
     <servers />
   </component>
@@ -363,11 +362,6 @@
           <line>262</line>
           <option name="timeStamp" value="113" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/hardwarelibrary/devicemanager.py</url>
-          <line>215</line>
-          <option name="timeStamp" value="120" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/hardwarelibrary/tests/testPhysicalDevice.py</url>
           <line>298</line>
@@ -383,6 +377,16 @@
           <line>11</line>
           <option name="timeStamp" value="129" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/hardwarelibrary/spectrometers/oceaninsight.py</url>
+          <line>804</line>
+          <option name="timeStamp" value="131" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/test.py</url>
+          <line>3</line>
+          <option name="timeStamp" value="132" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -397,7 +401,7 @@
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testPhysicalDevice_TestSpectrometerPhysicalDevice_testPhysicalDeviceRecognizedByDeviceManagerSynchronously.coverage" NAME="Unittests for testPhysicalDevice.TestSpectrometerPhysicalDevice.testPhysicalDeviceRecognizedByDeviceManagerSynchronously Coverage Results" MODIFIED="1633319357042" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$__main__.coverage" NAME="__main__ Coverage Results" MODIFIED="1633237489450" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testPyUSB_PyUSBTestCase.coverage" NAME="Unittests for testPyUSB.PyUSBTestCase Coverage Results" MODIFIED="1656216273536" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
-    <SUITE FILE_PATH="coverage/PyHardwareLibrary$.coverage" NAME=" Coverage Results" MODIFIED="1656429386903" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
+    <SUITE FILE_PATH="coverage/PyHardwareLibrary$.coverage" NAME=" Coverage Results" MODIFIED="1662658263127" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testLinearMotionDevice.coverage" NAME="Unittests for testLinearMotionDevice Coverage Results" MODIFIED="1633280168464" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testPhysicalDevice_TestSpectrometerPhysicalDevice_testConfiguredStateAfterInitialize.coverage" NAME="Unittests for testPhysicalDevice.TestSpectrometerPhysicalDevice.testConfiguredStateAfterInitialize Coverage Results" MODIFIED="1633293814434" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
     <SUITE FILE_PATH="coverage/PyHardwareLibrary$Unittests_for_testPhysicalDevice.coverage" NAME="Unittests for testPhysicalDevice Coverage Results" MODIFIED="1633662737770" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/hardwarelibrary/tests" />
diff --git a/hardwarelibrary/daq/labjackdevice.py b/hardwarelibrary/daq/labjackdevice.py
index 8c762c7..f4a52d7 100644
--- a/hardwarelibrary/daq/labjackdevice.py
+++ b/hardwarelibrary/daq/labjackdevice.py
@@ -5,8 +5,8 @@
 class LabjackDevice(PhysicalDevice, AnalogIOProtocol, DigitalIOProtocol):
     classIdVendor = 0x0cd5
     classIdProduct = 0x003
-    def __init__(self, serialNumber="*"):
-        super().__init__(serialNumber, idProduct=0x003, idVendor=0x0cd5)
+    def __init__(self, serialNumber="*", idProduct=0x003, idVendor=0x0cd5):
+        super().__init__(serialNumber, idProduct=idProduct, idVendor=idVendor)
         self.dev = None
 
     def doInitializeDevice(self):
diff --git a/hardwarelibrary/devicemanager.py b/hardwarelibrary/devicemanager.py
index f31f0fc..05b3c98 100644
--- a/hardwarelibrary/devicemanager.py
+++ b/hardwarelibrary/devicemanager.py
@@ -218,7 +218,7 @@ def usbDeviceConnected(self, usbDevice):
             # This may throw if incompat:
             #                 deviceInstanceible
             try:
-                candidateClass(serialNumber=descriptor.serialNumber,
+                deviceInstance = candidateClass(serialNumber=descriptor.serialNumber,
                                             idProduct=descriptor.idProduct,
                                             idVendor=descriptor.idVendor)
                 deviceInstance.initializeDevice()
diff --git a/hardwarelibrary/spectrometers/oceaninsight.py b/hardwarelibrary/spectrometers/oceaninsight.py
index 3a0d58a..71a2cd2 100644
--- a/hardwarelibrary/spectrometers/oceaninsight.py
+++ b/hardwarelibrary/spectrometers/oceaninsight.py
@@ -798,6 +798,12 @@ class USB2000Plus(USB4000_2000Plus):
     def __init__(self, serialNumber=None, idProduct:int = None, idVendor:int = None):
         USB4000_2000Plus.__init__(self, serialNumber=serialNumber, idProduct=idProduct, idVendor=idVendor, model="USB2000+")
 
+class SAS(USB4000_2000Plus):
+    classIdProduct = 0x1006
+
+    def __init__(self, serialNumber=None, idProduct:int = None, idVendor:int = None):
+        USB4000_2000Plus.__init__(self, serialNumber=serialNumber, idProduct=idProduct, idVendor=idVendor)
+
 
 class DebugSpectro:
     class Emitter(NamedTuple):
diff --git a/hardwarelibrary/tests/testPhysicalDevice.py b/hardwarelibrary/tests/testPhysicalDevice.py
index b5d58c8..23d23ad 100644
--- a/hardwarelibrary/tests/testPhysicalDevice.py
+++ b/hardwarelibrary/tests/testPhysicalDevice.py
@@ -33,13 +33,13 @@ class BaseTestCases:
     class TestPhysicalDeviceBase(unittest.TestCase):
         def setUp(self):
             super().setUp()
-            DeviceManager().updateConnectedDevices()
+            # DeviceManager().updateConnectedDevices()
 
             self.device = None
             self.isRunning = False
             self.notificationReceived = None
 
-            DeviceManager().destroy()
+            # DeviceManager().destroy()
             NotificationCenter().destroy()
 
         def tearDown(self):
@@ -47,7 +47,7 @@ def tearDown(self):
                 self.device.shutdownDevice()
                 self.device = None
 
-            DeviceManager().removeAllDevices()
+            # DeviceManager().removeAllDevices()
             super().tearDown()
 
         def testIsRunning(self):
@@ -200,7 +200,7 @@ def setUp(self):
             self.device = DeviceManager().anySpectrometerDevice()
             self.assertIsNotNone(self.device)
         except Exception as err:
-            raise (unittest.SkipTest("No spectrometer connected"))
+            self.skipTest("No Spectro connected")
 
 class TestPowerMeterPhysicalDevice(BaseTestCases.TestPhysicalDeviceBase):
     def setUp(self):
@@ -209,7 +209,7 @@ def setUp(self):
             self.device = IntegraDevice()
             self.assertIsNotNone(self.device)
         except Exception as err:
-            raise (unittest.SkipTest("No powermeter connected"))
+            self.skipTest("No powermeter connected")
 
 class TestTektronikPhysicalDevice(BaseTestCases.TestPhysicalDeviceBase):
     def setUp(self):
@@ -218,7 +218,7 @@ def setUp(self):
             self.device = OscilloscopeDevice()
             self.assertIsNotNone(self.device)
         except Exception as err:
-            raise (unittest.SkipTest("No oscilloscope connected"))
+            self.skipTest("No Oscilloscope connected")
 
 class TestEchoPhysicalDevice(BaseTestCases.TestPhysicalDeviceBase):
     def setUp(self):
@@ -227,7 +227,7 @@ def setUp(self):
             self.device = EchoDevice()
             self.assertIsNotNone(self.device)
         except Exception as err:
-            raise (unittest.SkipTest("No ECHO connected"))
+            self.skipTest("No ECHO connected")
 
     def testEchoCommands(self):
         self.device.initializeDevice()
@@ -245,7 +245,7 @@ def setUp(self):
             self.device = DebugEchoDevice()
             self.assertIsNotNone(self.device)
         except Exception as err:
-            raise (unittest.SkipTest("No ECHO connected"))
+            self.skipTest("No ECHO connected")
 
 
 class TestCameraPhysicalDevice(BaseTestCases.TestPhysicalDeviceBase):
@@ -255,7 +255,7 @@ def setUp(self):
             self.device = OpenCVCamera()
             self.assertIsNotNone(self.device)
         except Exception as err:
-            raise (unittest.SkipTest("No Facetime Camera connected"))
+            self.skipTest("No Facetime connected")
 
 class TestPhysicalDeviceCompatibilityClasses(unittest.TestCase):
     def testGetDeviceClasses(self):
diff --git a/test.py b/test.py
index 42243de..f4aee05 100644
--- a/test.py
+++ b/test.py
@@ -1,5 +1,4 @@
-from hardwarelibrary.spectrometers import getAllSubclasses, Spectrometer
+from hardwarelibrary.spectrometers import getAllSubclasses, Spectrometer, SAS
+from hardwarelibrary.utils import *
 
-devices = getAllSubclasses(Spectrometer)
-for dev in devices:
-    print("{0}".format(dev))
+device = SAS()