mirror of
https://github.com/eclipse/upm.git
synced 2025-07-02 09:51:14 +03:00
python: Added upm directory for python modules
* Grouped UPM python modules into upm directory, for example: /usr/local/lib/python2.7/dist-packages/upm * Updated UPM example import statements * Removed unused RPATH statements from UPM src CMakeLists.txt, currently build collateral contains an explicit RPATH which is stripped from the install collateral. * Converted python examples to work on both python2 AND python3 * Added ctest for loading examples w/python3 * Removed returns from swig macros * UPM python module use will change... Before: import pyupm_dfrph After: from upm import pyupm_dfrph or import upm.pyupm_dfrph etc... * This commit fixes #468 Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@ -21,8 +21,9 @@
|
||||
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
from __future__ import print_function
|
||||
import time, sys, signal, atexit
|
||||
import pyupm_zfm20 as upmZfm20
|
||||
from upm import pyupm_zfm20 as upmZfm20
|
||||
|
||||
def main():
|
||||
# Instantiate a ZFM20 Fingerprint reader on UART 0
|
||||
@ -36,7 +37,7 @@ def main():
|
||||
# This function lets you run code on exit,
|
||||
# including functions from myFingerprintSensor
|
||||
def exitHandler():
|
||||
print "Exiting"
|
||||
print("Exiting")
|
||||
sys.exit(0)
|
||||
|
||||
# Register exit handlers
|
||||
@ -45,29 +46,29 @@ def main():
|
||||
|
||||
# make sure port is initialized properly. 57600 baud is the default.
|
||||
if (not myFingerprintSensor.setupTty(upmZfm20.cvar.int_B57600)):
|
||||
print "Failed to setup tty port parameters"
|
||||
print("Failed to setup tty port parameters")
|
||||
sys.exit(1)
|
||||
|
||||
# how many valid stored templates (fingerprints) do we have?
|
||||
print "Total stored templates: %d" % myFingerprintSensor.getNumTemplates()
|
||||
print " "
|
||||
print("Total stored templates: %d" % myFingerprintSensor.getNumTemplates())
|
||||
print(" ")
|
||||
|
||||
# now spin waiting for a fingerprint to successfully image
|
||||
print "Waiting for finger print..."
|
||||
print("Waiting for finger print...")
|
||||
|
||||
while (myFingerprintSensor.generateImage() == upmZfm20.ZFM20.ERR_NO_FINGER):
|
||||
pass
|
||||
|
||||
# in theory, we have an image
|
||||
print "Image captured, converting..."
|
||||
print("Image captured, converting...")
|
||||
|
||||
rv = myFingerprintSensor.image2Tz(1)
|
||||
if (rv != upmZfm20.ZFM20.ERR_OK):
|
||||
print "Image conversion failed with error code %d" % rv
|
||||
print("Image conversion failed with error code %d" % rv)
|
||||
sys.exit(1)
|
||||
|
||||
print "Image conversion succeeded."
|
||||
print "Searching database..."
|
||||
print("Image conversion succeeded.")
|
||||
print("Searching database...")
|
||||
|
||||
myid = upmZfm20.uint16Array(0)
|
||||
myid.__setitem__(0, 0)
|
||||
@ -79,14 +80,14 @@ def main():
|
||||
rv = myFingerprintSensor.search(1, myid, myscore)
|
||||
if (rv != upmZfm20.ZFM20.ERR_OK):
|
||||
if (rv == upmZfm20.ZFM20.ERR_FP_NOTFOUND):
|
||||
print "Finger Print not found"
|
||||
print("Finger Print not found")
|
||||
sys.exit(0)
|
||||
else:
|
||||
print "Search failed with error code %d" % rv
|
||||
print("Search failed with error code %d" % rv)
|
||||
sys.exit(1)
|
||||
|
||||
print "Fingerprint found!"
|
||||
print "ID: %d, Score: %d" % (myid.__getitem__(0), myscore.__getitem__(0))
|
||||
print("Fingerprint found!")
|
||||
print("ID: %d, Score: %d" % (myid.__getitem__(0), myscore.__getitem__(0)))
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
Reference in New Issue
Block a user