From: W. Trevor King <wking@drexel.edu>
Date: Fri, 29 Jul 2011 13:49:00 +0000 (-0400)
Subject: `name` is a ChannelConfig setting, not an AxisConfig setting.
X-Git-Tag: 0.6~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd86796f06b024cfa560785c5ffea11f68413140;p=pypiezo.git

`name` is a ChannelConfig setting, not an AxisConfig setting.
---

diff --git a/pypiezo/afm.py b/pypiezo/afm.py
index 2dee129..1906115 100644
--- a/pypiezo/afm.py
+++ b/pypiezo/afm.py
@@ -73,8 +73,9 @@ class AFMPiezo (_base.Piezo):
 
     >>> axis_config = config.AxisConfig()
     >>> axis_config.update(
-    ...     {'name': 'z', 'gain':20, 'sensitivity':8e-9, 'minimum':-9})
+    ...     {'gain':20, 'sensitivity':8e-9, 'minimum':-9})
     >>> axis_config['channel'] = config.OutputChannelConfig()
+    >>> axis_config['channel']['name'] = 'z'
     >>> input_config = config.InputChannelConfig()
     >>> input_config['name'] = 'deflection'
 
diff --git a/pypiezo/base.py b/pypiezo/base.py
index 50abcaa..37c6fc4 100644
--- a/pypiezo/base.py
+++ b/pypiezo/base.py
@@ -364,8 +364,9 @@ class Piezo (object):
     ...     chan.range = chan.find_range(unit=UNIT.volt, min=-10, max=10)
 
     >>> axis_config = _config.AxisConfig()
-    >>> axis_config.update({'name': 'z', 'gain':20, 'sensitivity':8e-9})
+    >>> axis_config.update({'gain':20, 'sensitivity':8e-9})
     >>> axis_config['channel'] = _config.OutputChannelConfig()
+    >>> axis_config['channel']['name'] = 'z'
     >>> axis_config['monitor'] = _config.InputChannelConfig()
     >>> input_config = _config.InputChannelConfig()
     >>> input_config['name'] = 'some-input'