Compare commits

..

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

@ -1,5 +1,4 @@
import time , json
#import simplejson as json
import time, json
import RPi.GPIO as GPIO
import keyboard
import subprocess
@ -45,15 +44,10 @@ if __name__ == '__main__':
GPIO.output(pin_config['tools_red_LED'], GPIO.LOW)
while True:
print ("Enter card ID:")
cardID=''
print "Enter card ID:"
cardID_input = keyboard.record(until='enter')
cardID_gen = keyboard.get_typed_strings(cardID_input)
for i in cardID_gen:
cardID += i
cardID = keyboard.get_typed_strings(cardID_input).next()
event = {}
event["time"] = time.time()
event["cardID"] = cardID
event["name"] = ''
@ -103,19 +97,15 @@ if __name__ == '__main__':
GPIO.output(pin_config['fridge_red_LED'], GPIO.LOW)
GPIO.output(pin_config['tools_red_LED'], GPIO.LOW)
wait = False
except Exception as e:
except:
btnBlink()
print( "Card not registered.")
print(e)
print "Card not registered."
history = []
try:
with open('history.json', 'r') as json_data:
history = json.load(json_data)
except Exception as e:
print('Initializing new history file.')
print(e)
except:
print 'Initializing new history file.'
finally:
history.append(event)
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)
elif what == "tools":
subprocess.call("/home/pi/ELAB-RFID-I2C/RPi/i2c_challenge 0x30", shell=True)
print('opened', what)
print 'opened', what
return redirect(url_for('status'))
@app.route('/gethistory')

Loading…
Cancel
Save