diff --git a/iNode/data.json b/iNode/data.json index b991d4b..9d62f9c 100644 --- a/iNode/data.json +++ b/iNode/data.json @@ -1,4 +1,4 @@ { - 'ip': '192.168.1.13', - 'port': '8080' + "ip": "192.168.89.14", + "port": "8080" } diff --git a/iNode/parking.py b/iNode/parking.py index 2d06542..65981d1 100644 --- a/iNode/parking.py +++ b/iNode/parking.py @@ -7,15 +7,18 @@ import serial import requests import json -with open('data.json') as json_file: - server_par = json.load(json_file) +# Open file to configure communication with server. +with open('data.json', 'r') as json_file: + json_data = json_file.read() + +if json_data != "" and json_data != None: + server_par = json.loads(json_data.replace('\n','').replace(' ','')) server_ip = server_par['ip'] server_port = server_par['port'] if server_ip != None and server_port != None: API_ENDPOINT = 'http://' + server_ip + ':' + server_port + '/parkingStatus' - parkingCode = "1" ser = serial.Serial( port='/dev/ttyACM0', baudrate = 9600, @@ -29,16 +32,19 @@ with open('data.json') as json_file: prev_status = ser.readline() while 1: park_status = ser.readline() + park_status_data = str(park_status).split("#") + + parkingCode = park_status_data[0].replace('b\'','') + parkingStatus = park_status_data[1].replace('\\r\\n\'', '') + try: if park_status != prev_status: - if b'1' in park_status: - data = """{"no":""" + parkingCode + ""","status":1}""" - r = requests.post(url = API_ENDPOINT, data = data) + if parkingStatus == "1": print("parking reserved. RESPONSE :", r.status_code, "\n") - elif b'0' in park_status: - data = """{"no":""" + parkingCode + ""","status":0}""" - r = requests.post(url = API_ENDPOINT, data = data) + elif parkingStatus == "0": print("parking not reserved. RESPONSE : ", r.status_code, "\n") + data = """{"no":""" + parkingCode + ""","status":""" + parkingStatus + """}""" + r = requests.post(url = API_ENDPOINT, data = data) except NameError: print("**Not already prev variable.\n") prev_status = park_status diff --git a/webInterface/parking.html b/webInterface/parking.html index 49fd311..16c6d89 100644 --- a/webInterface/parking.html +++ b/webInterface/parking.html @@ -11,35 +11,36 @@