projects
/
pyafm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d7c0941
)
Add bit/volt/meter converter imports to pyafm.afm.
author
W. Trevor King
<wking@drexel.edu>
Tue, 27 Sep 2011 20:19:24 +0000
(16:19 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Tue, 27 Sep 2011 20:19:24 +0000
(16:19 -0400)
pyafm/afm.py
patch
|
blob
|
history
diff --git
a/pyafm/afm.py
b/pyafm/afm.py
index 9ff467a16697d87fbe218e1ea5672b8f789609d0..8ae61fa524e76e068091f90fdfd014eecba8d95d 100644
(file)
--- 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