From: W. Trevor King Date: Fri, 29 Jul 2011 13:33:39 +0000 (-0400) Subject: Assorted typo fixes turned up by test suite. X-Git-Tag: 0.6~47 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7a613ac23924ca24b058ffdbef140e7babfd01d;p=pypiezo.git Assorted typo fixes turned up by test suite. --- diff --git a/pypiezo/afm.py b/pypiezo/afm.py index 8430ba6..8f211df 100644 --- a/pypiezo/afm.py +++ b/pypiezo/afm.py @@ -84,7 +84,7 @@ class AFMPiezo (_base.Piezo): >>> c = _base.InputChannel(config=input_config, channel=input_channel) >>> c.setup_config() - >>> p = AFMPiezo(axes=[a], input_channels=[c], name='Molly') + >>> p = AFMPiezo(axes=[a], channels=[c], name='Molly') >>> deflection = p.read_deflection() >>> deflection # doctest: +SKIP diff --git a/pypiezo/base.py b/pypiezo/base.py index 4e58cdb..eb8d221 100644 --- a/pypiezo/base.py +++ b/pypiezo/base.py @@ -284,8 +284,8 @@ class PiezoAxis (object): if self.config['minimum'] is None: self.config['minimum'] = convert_bits_to_volts( self.config['channel'], 0) - if self.axis_config['maximum'] is None: - self.axis_config['maximum'] = convert_bits_to_volts( + if self.config['maximum'] is None: + self.config['maximum'] = convert_bits_to_volts( self.config['channel'], self.axis_channel.get_maxdata())