changed from pygame to mpv

Author: XenGi

Diff for: config.py.sample

@@ -1,12 +1,12 @@
-#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 class LDAP:
-        URI                     = 'ldap://10.0.1.7:389/'
-        BASE                    = 'dc=c-base,dc=org'
-        USERBASE                = 'ou=crew'
-        BINDDN                  ='cn=c-labpin,ou=bind,dc=c-base,dc=org'
-        BINDPW                  ='ENTER PWD HERE'
-        PINFIELD                ='c-labPIN'
-	UIDFIELD		='uid'
-        ACCESS_FILTER   ='(&(uidNumber={})(memberof=cn=cey-c-lab,ou=groups,dc=c-base,dc=org)(memberof=cn=crew,ou=groups,dc=c-base,dc=org))'
+    URI = 'ldap://10.0.1.7:389/'
+    BASE = 'dc=c-base,dc=org'
+    USERBASE = 'ou=crew'
+    BINDDN = 'cn=c-labpin,ou=bind,dc=c-base,dc=org'
+    BINDPW = 'ENTER PWD HERE'
+    PINFIELD = 'c-labPIN'
+	UIDFIELD ='uid'
+    ACCESS_FILTER ='(&(uidNumber={})(memberof=cn=cey-c-lab,ou=groups,dc=c-base,dc=org)(memberof=cn=crew,ou=groups,dc=c-base,dc=org))'
+

Diff for: ldap_interface.py

@@ -1,9 +1,10 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import base64
 import hashlib
 from datetime import datetime
+
 from lmap import *
 
 import config
@@ -14,6 +15,7 @@ def ldap_connect():
 	ld.simple_bind(config.LDAP.BINDDN, config.LDAP.BINDPW)
 	return lmap.lmap(dn=config.LDAP.BASE, ldap=ld)
 
+
 def pwcheck(record, pw):
 	if not record.startswith('{SSHA}'):
 		return record == pw
@@ -23,6 +25,7 @@ def pwcheck(record, pw):
 	newhashv = hashlib.sha1(bytearray(pw, 'UTF-8')+salt).digest()
 	return hashv == newhashv
 
+
 def authenticate(uid, pin):
 	lm = ldap_connect()
 	try:
@@ -35,8 +38,10 @@ def authenticate(uid, pin):
 		print(datetime.now(), 'Invalid user/pin:', uid, '('+str(e)+')')
 	return False
 
+
 numbuf = []
 
+
 if __name__ == "__main__":
 	print(pwcheck('{SSHA}c8pLDYbSkF2jBAKxxa67nY7NYkdQXiPNFzzRso9FRZI=', '1234'))
 

Diff for: requirements.txt

@@ -0,0 +1,3 @@
+RPi.GPIO==0.6.2
+lmap==0.0.2
+-e  git+https://github.com/jaseg/python-mpv.git#egg=python-mpv

Diff for: run_schloss.sh

@@ -1,52 +1,45 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-import os
 import time
-# import pifacedigitalio as pfio
-from RPi import GPIO
 import queue
 from threading import Thread, RLock
-import pygame
 
+import mpv
+from RPi import GPIO
 from ldap_interface import authenticate
 
+
 NUMERIC_KEYS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
 
-BOUNCE_TIME = 300 # in milliseconds
-STALE_TIMEOUT = 30 # in seconds
-timeouts = {'1': BOUNCE_TIME, '2': BOUNCE_TIME, '3': BOUNCE_TIME, '4': BOUNCE_TIME, 
+BOUNCE_TIME = 300  # in milliseconds
+STALE_TIMEOUT = 30  # in seconds
+timeouts = {'1': BOUNCE_TIME, '2': BOUNCE_TIME, '3': BOUNCE_TIME, '4': BOUNCE_TIME,
             '5': BOUNCE_TIME, '6': BOUNCE_TIME, '7': BOUNCE_TIME, '8': BOUNCE_TIME,
-            '9': BOUNCE_TIME, '0': BOUNCE_TIME, 'A': BOUNCE_TIME, 'B': BOUNCE_TIME, 
+            '9': BOUNCE_TIME, '0': BOUNCE_TIME, 'A': BOUNCE_TIME, 'B': BOUNCE_TIME,
             'C': BOUNCE_TIME, 'D': BOUNCE_TIME, 'E': BOUNCE_TIME, 'F': BOUNCE_TIME}
 
 
 q = queue.Queue()
 lock = RLock()
 
-# for piface
-# ROWS = [2, 3, 4, 5]
-# COLS = [0, 1, 2, 3]
-
 COLS = [15, 13, 11, 7]
 ROWS = [12, 16, 18, 22]
 
 OPEN_PIN = 26
 
 # preinit to avoid sound lag
-pygame.mixer.pre_init(44100, -16, 2, 2048) # setup mixer to avoid sound lag
-pygame.mixer.init()
-beep = pygame.mixer.Sound('/home/pi/raspberrylock/beep.wav')
-fail = pygame.mixer.Sound('/home/pi/raspberrylock/fail.wav')
-success = pygame.mixer.Sound('/home/pi/raspberrylock/success.wav')
-
-def init_piface():
-    pfio.init()
-    pfio.digital_write_pullup(0, 1)
-    pfio.digital_write_pullup(1, 1)
-    pfio.digital_write_pullup(2, 1)
-    pfio.digital_write_pullup(3, 1)
-    
+MPV = mpv.MPV()
+beep = '/opt/raspberrylock/beep.wav'
+fail = '/opt/raspberrylock/fail.wav'
+success = '/opt/raspberrylock/success.wav'
+
+state = 0
+uid = ''
+pin = ''
+reset_timer = STALE_TIMEOUT
+
+
 def init_gpios():
     GPIO.setmode(GPIO.BOARD)
     GPIO.setup(OPEN_PIN, GPIO.OUT)
@@ -56,80 +49,83 @@ def init_gpios():
     for pin in COLS:
         GPIO.setup(pin, GPIO.IN, pull_up_down=GPIO.PUD_DOWN)
 
+
 def decode_keypad(measurements):
     """
     x1 = (0,0,1,0)
     """
-    layout = [['C', 'D', 'E', 'F'], ['B', '9', '6', '3'], 
+    layout = [['C', 'D', 'E', 'F'], ['B', '9', '6', '3'],
               ['0', '8', '5', '2'], ['A', '7', '4', '1']]
     for y_index, y_row in enumerate(measurements):
         for x_index, x_state in enumerate(y_row):
             if x_state > 0:
                 return layout[y_index][x_index]
 
+
 def decrease_timeouts(timeouts):
     for k, v in timeouts.items():
         if v > 0:
             timeouts[k] = v - 1
     return timeouts
 
+
 def collect_measurements():
     """
     """
     pin_state = []
     for y_pin in ROWS:
-        # pfio.digital_write(y_pin, 1)
         GPIO.output(y_pin, 1)
         x_pin_states = []
         for x_pin in COLS:
-            #pin_in = pfio.digital_read(x_pin)
             pin_in = GPIO.input(x_pin)
             # print("{}x{} = {}".format(y_pin, x_pin, pin_in))
             x_pin_states.append(pin_in)
-        # pfio.digital_write(y_pin, 0)
         GPIO.output(y_pin, 0)
         pin_state.append(x_pin_states)
     return pin_state
 
+
 def read_keypad():
     decrease_timeouts(timeouts)
     key = decode_keypad(collect_measurements())
     if key:
         if timeouts[key] > 0:
             return None
         else:
-            beep.play()
+            play(beep)
             timeouts[key] = BOUNCE_TIME
             return key
     else:
         return None
 
 
-state = 0
-uid = ''
-pin = ''
-reset_timer = STALE_TIMEOUT
 
 def reset_state():
-    print("reset state")
     global state, uid, pin
+
+    print("reset state")
     state = 0
     uid = ''
     pin = ''
 
+
 def timeout_reset_state():
     global reset_timer
+
     while True:
         reset_timer -= 1
         if reset_timer <= 0:
             reset_state()
             reset_timer = STALE_TIMEOUT
         time.sleep(1.0)
 
+
 def control_loop():
     global reset_timer
     global state, uid, pin
+
     reset_state()
+
     # Main state machine.
     # Expects the user to enter her UID, then PIN like this:
     # [A] 2903 [A] 123456 A
@@ -172,32 +168,28 @@ def control_loop():
                 pin += key
                 continue
             elif key == 'C':
-                reset_state() 
+                reset_state()
                 continue
             elif key == 'A':
                 t = Thread(target=open_if_correct, args=(uid, pin))
                 t.start()
                 reset_state()
                 continue
 
+
 def open_if_correct(uid, pin):
     print('checking ldap ...')
     if authenticate(uid, pin):
-        success.play()
+        play(success)
         with lock:
             GPIO.output(OPEN_PIN, 1)
-            #pfio.digital_write(6, 1)
-            # pfio.digital_write(1, 1)
             time.sleep(10)
             GPIO.output(OPEN_PIN, 0)
-            # pfio.digital_write(6, 0)
-            # pfio.digital_write(1, 0)
     else:
-        fail.play()
+        play(fail)
         with lock:
-            #pfio.digital_write(7, 1)
             time.sleep(2)
-            # pfio.digital_write(7, 0)
+
 
 def keypad_loop():
     while True:
@@ -206,8 +198,8 @@ def keypad_loop():
             if key:
                 q.put(key)
 
+
 def main():
-    # pfio.init()
     #os.nice(10)
     init_gpios()
     control_thread = Thread(target=control_loop)
@@ -217,8 +209,10 @@ def main():
     timeout_thread = Thread(target=timeout_reset_state)
     timeout_thread.start()
 
+
 if __name__ == '__main__':
     try:
         main()
     except KeyboardInterrupt:
         GPIO.cleanup()
+

Diff for: schloss.py

@@ -1,10 +1,10 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import unittest
 
 from schloss import *
 
+
 class SchlossTest(unittest.TestCase):
     def test_decode_keypad(self):
         key_1 = [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 1]]
@@ -17,3 +17,4 @@ def test_decrease_timeouts(self):
         self.assertEquals(timeout_expected, result)
         result = decrease_timeouts(result)
         self.assertEquals(timeout_expected, result)
+