match instruction added

Author: girish946

examples/store.py

@@ -1,6 +1,6 @@
 import serial
 import time
-from r305 import genImg, Img2Tz, RegModel, TemplateNum, Store
+from r305 import genImg, Img2Tz, RegModel, TemplateNum, Store, Match
 import sys
 
 ser = serial.Serial(sys.argv[1])
@@ -59,49 +59,60 @@ def write(callback= None):
     print([hex(ord(c)) for c in s])
     Img2Tz.parse(s)
 
-
-
-    #create RegModel
-    callback("creating reg model")
-    
-    data = RegModel.getHeader()
+    data = Match.getHeader()
+    #print "mathc header is ", [hex(ord(c)) for c in data]
+    print "the length of match header is ", len(data)
     ser.write(bytearray(data));
     time.sleep(1)
     s = ser.read(ser.inWaiting())
     print([hex(ord(c)) for c in s])
-    RegModel.parse(s)
-    #getTemplateNumber
-    callback("getting template number")
+    match, match_score = Match.parse(s)
+    if match == 0:
+        #create RegModel
+        callback("creating reg model")
 
-    data = TemplateNum.getHeader()
-    ser.write(bytearray(data));
-    time.sleep(1)
-    s = ser.read(ser.inWaiting())
-    print([hex(ord(c)) for c in s])
-    num = TemplateNum.parse(s)
-    callback("template num is "+str(num))
-    print "recived template Number is "+ str(num)
+        data = RegModel.getHeader()
+        ser.write(bytearray(data));
+        time.sleep(1)
+        s = ser.read(ser.inWaiting())
+        print([hex(ord(c)) for c in s])
+        RegModel.parse(s)
+        #getTemplateNumber
+        callback("getting template number")
 
+        data = TemplateNum.getHeader()
+        ser.write(bytearray(data));
+        time.sleep(1)
+        s = ser.read(ser.inWaiting())
+        print([hex(ord(c)) for c in s])
+        num = TemplateNum.parse(s)
+        callback("template num is "+str(num))
+        print "recived template Number is "+ str(num)
 
-    data = Store.getHeader(0x01,int(num)+1 )
-    print([hex(c) for c in data])
-    ser.write(bytearray(data));
-    time.sleep(1)
-    s = ser.read(ser.inWaiting())
-    print([hex(ord(c)) for c in s])
-    print len(s)
-    Store.parse(s)
+    
+        data = Store.getHeader(0x01,int(num)+1 )
+        print([hex(c) for c in data])
+        ser.write(bytearray(data));
+        time.sleep(1)
+        s = ser.read(ser.inWaiting())
+        print([hex(ord(c)) for c in s])
+        print len(s)
+        Store.parse(s)
 
-    #getTemplateNumber
-    data = TemplateNum.getHeader()
-    ser.write(bytearray(data));
-    time.sleep(1)
-    s = ser.read(ser.inWaiting())
-    print([hex(ord(c)) for c in s])
-    num = TemplateNum.parse(s)
-    callback("template stored at "+str(num + 1))
-    print "recived template Number is "+ str(num)
-    return
+        #getTemplateNumber
+        data = TemplateNum.getHeader()
+        ser.write(bytearray(data));
+        time.sleep(1)
+        s = ser.read(ser.inWaiting())
+        print([hex(ord(c)) for c in s])
+        num = TemplateNum.parse(s)
+        callback("template stored at "+str(num + 1))
+        print "recived template Number is "+ str(num)
+        return
+        
+    else:
+        print "the two fingers don't match"
+        return
 
 
 

r305/Match.py

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from R305 import generateHeader, header, address
+import struct
+
+# Match intruction is used in R305 fingerprint module to carry out
+# precise matching of two templates from CharBuffer1 and CharBuffer2
+
+
+identifire = {1:"command packet",
+              2: "data packet",
+              7:"acknokedge packet",
+              8:"end of data packte"}
+
+confirmation_codes = {0:"Templates of the two buffers are matching!",
+                      1:"error while reciving packet",
+                      0x08:"templates of the two buffers aren’t matching",
+                     }
+                     
+def parse(s):
+    print len(s)
+    recived_header = s[:2]
+    recived_address = s[2:6]
+    recived_id = s[6]
+    recived_length = s[7:9]
+    recived_conf_code = s[9]
+    recived_matching_score = s[10:12]
+    recived_checksum = s[12:14]
+    print confirmation_codes[int(ord(recived_conf_code))]
+    print "accuracy is ", 256*ord(recived_matching_score[0]) +256*ord(recived_matching_score[1])
+    return int(ord(recived_conf_code)), recived_matching_score
+    
+                     
+
+def getHeader():
+    data = [0x01, 0x00, 0x03, 0x03, 0x00, 0x07 ]
+    #print "generating header ", [hex(c) for c in generateHeader()+ data], len([hex(c) for c in generateHeader()+ data])
+    return generateHeader()+ data