From: W. Trevor King <wking@drexel.edu>
Date: Tue, 27 Sep 2011 20:19:24 +0000 (-0400)
Subject: Add bit/volt/meter converter imports to pyafm.afm.
X-Git-Tag: v0.4~53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=081cc75b4c9192f0594c275b1646575600215a7b;p=pyafm.git

Add bit/volt/meter converter imports to pyafm.afm.
---

diff --git a/pyafm/afm.py b/pyafm/afm.py
index 9ff467a..8ae61fa 100644
--- a/pyafm/afm.py
+++ b/pyafm/afm.py
@@ -23,6 +23,10 @@ for controlling the piezo (`pypiezo`) and stepper (`stepper`), this
 module only contains methods that require the capabilities of both.
 """
 
+from pypiezo.base import convert_bits_to_meters as _convert_bits_to_meters
+from pypiezo.base import convert_meters_to_bits as _convert_meters_to_bits
+from pypiezo.base import convert_volts_to_bits as _convert_volts_to_bits
+
 from . import LOG as _LOG