Make .load_from_config explicit and optional (don't call it from __init__).

[pypiezo.git] / pypiezo / afm.py

diff --git a/pypiezo/afm.py b/pypiezo/afm.py
index 5cf5569365f29cf3c7e239ee64c7820ef6826943..a7cb9d5e3ff227216ef75a133d299c80d4b003b6 100644 (file)
--- a/pypiezo/afm.py
+++ b/pypiezo/afm.py
@@ -42,13 +42,11 @@ class AFMPiezo (_base.Piezo):
     deflection measurements.
 
     >>> from pprint import pprint
-    >>> from pycomedi.device import Device
     >>> from pycomedi.constant import AREF
     >>> from . import config
     >>> from . import surface
 
-    >>> d = Device('/dev/comedi0')
-    >>> d.open()
+    >>> devices = []
 
     >>> piezo_config = config.PiezoConfig()
     >>> piezo_config['name'] = 'Molly'
@@ -70,10 +68,8 @@ class AFMPiezo (_base.Piezo):
     >>> piezo_config['axes'][0].update(
     ...     {'gain':20, 'sensitivity':8e-9, 'minimum':-9})
 
-    >>> a = _base.PiezoAxis(config=piezo_config['axes'][0], devices=[d])
-    >>> c = _base.InputChannel(config=piezo_config['inputs'][0], devices=[d])
-
-    >>> p = AFMPiezo(config=piezo_config, axes=[a], inputs=[c])
+    >>> p = AFMPiezo(config=piezo_config)
+    >>> p.load_from_config(devices=devices)
     >>> p.setup_config()
 
     >>> deflection = p.read_deflection()
@@ -142,7 +138,8 @@ class AFMPiezo (_base.Piezo):
     >>> abs(e.left_slope-1) < 0.1
     True
 
-    >>> d.close()
+    >>> for device in devices:
+    ...     device.close()
     """
     def _deflection_channel(self):
         return self.channel_by_name(name='deflection', direction='input')