From: W. Trevor King <wking@drexel.edu>
Date: Tue, 28 Feb 2012 20:25:07 +0000 (-0500)
Subject: Fix deflection channel config extraction in AFM.move_just_onto_surface().
X-Git-Tag: v0.4~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01e11d3e054ffacb320b1a0ba4c523f53bc61c68;p=pyafm.git

Fix deflection channel config extraction in AFM.move_just_onto_surface().
---

diff --git a/pyafm/afm.py b/pyafm/afm.py
index 35e8d66..fe3da22 100644
--- a/pyafm/afm.py
+++ b/pyafm/afm.py
@@ -83,10 +83,10 @@ class AFM (object):
         stepper_tolerance = 2*self.stepper.step_size
 
         axis = self.piezo.axis_by_name(self.axis_name)
-        defc = self.piezo._deflection_channel()
+        def_config = self.piezo.config.select_config('inputs', 'deflection')
 
         zero = _convert_volts_to_bits(axis.config['channel'], 0)
-        target_def = _convert_volts_to_bits(defc.config, setpoint)
+        target_def = _convert_volts_to_bits(def_config, setpoint)
         self._check_target_deflection(deflection=target_def)
 
         _LOG.debug('zero the %s piezo output' % self.axis_name)