Merge pull request #819 from bmoneke/PR-Toptica-Adapter

Remove Toptica adapter
pymeasure · Jan 19, 2023 · c04f211 · c04f211
2 parents f36ba14 + 9f61154
commit c04f211
Show file tree

Hide file tree

Showing 9 changed files with 345 additions and 188 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -9,6 +9,7 @@ Deprecated features
 -------------------
 - HP 34401A: :code:`voltage_ac`, :code:`current_dc`, :code:`current_ac`, :code:`resistance`, :code:`resistance_4w` properties,
   use :code:`function_` and :code:`reading` properties instead.
+- Toptica IBeamSmart: :code:`channel1_enabled`, use :code:`ch_1.enabled` property instead (similar channel2). Also :code:`laser_enabled` is deprecated in favor of :code:`emission`.
 
 Version 0.11.1 (2022-12-31)
 ===========================

diff --git a/docs/api/instruments/toptica/adapters.rst b/docs/api/instruments/toptica/adapters.rst
diff --git a/docs/api/instruments/toptica/ibeamsmart.rst b/docs/api/instruments/toptica/ibeamsmart.rst
@@ -5,3 +5,7 @@ Toptica IBeam Smart Laser diode
 .. autoclass:: pymeasure.instruments.toptica.ibeamsmart.IBeamSmart
     :members:
     :show-inheritance:
+
+.. autoclass:: pymeasure.instruments.toptica.ibeamsmart.DriverChannel
+    :members:
+    :show-inheritance:
diff --git a/docs/api/instruments/toptica/index.rst b/docs/api/instruments/toptica/index.rst
@@ -9,5 +9,4 @@ This section contains specific documentation on the Toptica Photonics instrument
 .. toctree::
    :maxdepth: 2
 
-   adapters
    ibeamsmart
diff --git a/pymeasure/instruments/toptica/__init__.py b/pymeasure/instruments/toptica/__init__.py
@@ -22,5 +22,4 @@
 # THE SOFTWARE.
 #
 
-from .adapters import TopticaAdapter
 from .ibeamsmart import IBeamSmart
diff --git a/pymeasure/instruments/toptica/adapters.py b/pymeasure/instruments/toptica/adapters.py