From: Mitchell Pomery <bob_george33@hotmail.com>
Date: Sun, 1 Mar 2015 15:12:00 +0000 (+0800)
Subject: Ensure door opening triggers
X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=commitdiff_plain;h=40879050954ca0b244b9388caaade17ed0713d81

Ensure door opening triggers
---

diff --git a/VendServer/VendServer.py b/VendServer/VendServer.py
index 58622cf..ef74c0d 100755
--- a/VendServer/VendServer.py
+++ b/VendServer/VendServer.py
@@ -31,7 +31,11 @@ Nick Bannon
 Cameron Patrick
 and a collective of hungry alpacas.
 
+The MIFARE card reader bought to you by:
+David Adam
 
+Bug Hunting and hardware maintenance by:
+Mitchell Pomery
 
 For a good time call +61 8 6488 3901
 
@@ -926,24 +930,24 @@ def create_state_table(vstatus):
 	vstatus.state_table[(STATE_DOOR_CLOSING,MIFARE,1)] = do_nothing
 
 	vstatus.state_table[(STATE_GETTING_UID,TICK,1)] = handle_getting_uid_idle
-	vstatus.state_table[(STATE_GETTING_UID,DOOR,1)] = do_nothing
+	vstatus.state_table[(STATE_GETTING_UID,DOOR,1)] = handle_door_event
 	vstatus.state_table[(STATE_GETTING_UID,KEY,1)] = handle_getting_uid_key
 	vstatus.state_table[(STATE_GETTING_UID,MIFARE,1)] = handle_mifare_event
 
 	vstatus.state_table[(STATE_GETTING_PIN,TICK,1)] = handle_getting_pin_idle
-	vstatus.state_table[(STATE_GETTING_PIN,DOOR,1)] = do_nothing
+	vstatus.state_table[(STATE_GETTING_PIN,DOOR,1)] = handle_door_event
 	vstatus.state_table[(STATE_GETTING_PIN,KEY,1)] = handle_getting_pin_key
 	vstatus.state_table[(STATE_GETTING_PIN,MIFARE,1)] = handle_mifare_event
 
 	vstatus.state_table[(STATE_GET_SELECTION,TICK,1)] = handle_get_selection_idle
-	vstatus.state_table[(STATE_GET_SELECTION,DOOR,1)] = do_nothing
+	vstatus.state_table[(STATE_GET_SELECTION,DOOR,1)] = handle_door_event
 	vstatus.state_table[(STATE_GET_SELECTION,KEY,1)] = handle_get_selection_key
 	vstatus.state_table[(STATE_GET_SELECTION,MIFARE,1)] = handle_mifare_add_user_event
 
 	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,TICK,1)] = handle_idle_grandfather_tick
 	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,TICK,2)] = handle_grandfather_tick
-	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,DOOR,1)] = do_nothing
-	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,DOOR,2)] = do_nothing
+	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,DOOR,1)] = handle_door_event
+	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,DOOR,2)] = handle_door_event
 	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,KEY,1)] = do_nothing
 	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,KEY,2)] = do_nothing
 	vstatus.state_table[(STATE_GRANDFATHER_CLOCK,MIFARE,1)] = handle_mifare_event