Compare commits

..

No commits in common. 'master' and 'd5e4964c65b0b08f3c78dd6c4c22eee06df10ef7' have entirely different histories.

@ -1,5 +1,4 @@
import time , json import time, json
#import simplejson as json
import RPi.GPIO as GPIO import RPi.GPIO as GPIO
import keyboard import keyboard
import subprocess import subprocess
@ -45,15 +44,10 @@ if __name__ == '__main__':
GPIO.output(pin_config['tools_red_LED'], GPIO.LOW) GPIO.output(pin_config['tools_red_LED'], GPIO.LOW)
while True: while True:
print ("Enter card ID:") print "Enter card ID:"
cardID=''
cardID_input = keyboard.record(until='enter') cardID_input = keyboard.record(until='enter')
cardID_gen = keyboard.get_typed_strings(cardID_input) cardID = keyboard.get_typed_strings(cardID_input).next()
for i in cardID_gen:
cardID += i
event = {} event = {}
event["time"] = time.time() event["time"] = time.time()
event["cardID"] = cardID event["cardID"] = cardID
event["name"] = '' event["name"] = ''
@ -103,19 +97,15 @@ if __name__ == '__main__':
GPIO.output(pin_config['fridge_red_LED'], GPIO.LOW) GPIO.output(pin_config['fridge_red_LED'], GPIO.LOW)
GPIO.output(pin_config['tools_red_LED'], GPIO.LOW) GPIO.output(pin_config['tools_red_LED'], GPIO.LOW)
wait = False wait = False
except Exception as e: except:
btnBlink() btnBlink()
print( "Card not registered.") print "Card not registered."
print(e)
history = [] history = []
try: try:
with open('history.json', 'r') as json_data: with open('history.json', 'r') as json_data:
history = json.load(json_data) history = json.load(json_data)
except:
except Exception as e: print 'Initializing new history file.'
print('Initializing new history file.')
print(e)
finally: finally:
history.append(event) history.append(event)
with open('history.json', 'w') as outfile: with open('history.json', 'w') as outfile:

@ -65,7 +65,7 @@ def users(what):
subprocess.call("/home/pi/ELAB-RFID-I2C/RPi/i2c_challenge 0x20", shell=True) subprocess.call("/home/pi/ELAB-RFID-I2C/RPi/i2c_challenge 0x20", shell=True)
elif what == "tools": elif what == "tools":
subprocess.call("/home/pi/ELAB-RFID-I2C/RPi/i2c_challenge 0x30", shell=True) subprocess.call("/home/pi/ELAB-RFID-I2C/RPi/i2c_challenge 0x30", shell=True)
print('opened', what) print 'opened', what
return redirect(url_for('status')) return redirect(url_for('status'))
@app.route('/gethistory') @app.route('/gethistory')

Loading…
Cancel
Save