diff --git a/README.md b/README.md
index cb36fca..cd44668 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
# smartParking
+#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
+#===================================================================
Smart and Autonomous parking.
@@ -10,5 +12,5 @@ and send it via serial port the information if there is a car or no.
At folder iNode/ there is the application that runs on Raspberry Pi, get
the information from Arduino and post it to REST-API as JSON.
-At webInterface there is an html page that provide the parking status simply get
+At folder webInterface/ there is an html page that provide the parking status simply get
the information as JSON from REST-API.
diff --git a/iNode/data.json b/iNode/data.json
new file mode 100644
index 0000000..9d62f9c
--- /dev/null
+++ b/iNode/data.json
@@ -0,0 +1,4 @@
+{
+ "ip": "192.168.89.14",
+ "port": "8080"
+}
diff --git a/iNode/parking.py b/iNode/parking.py
index bc13402..65981d1 100644
--- a/iNode/parking.py
+++ b/iNode/parking.py
@@ -1,35 +1,53 @@
+#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
+#===================================================================
#!/usr/bin/env python
import time
import serial
import requests
+import json
-API_ENDPOINT = 'http://192.168.1.13:8080/parkingStatus'
-parkingCode = "1"
-ser = serial.Serial(
- port='/dev/ttyACM0',
- baudrate = 9600,
- parity=serial.PARITY_NONE,
- stopbits=serial.STOPBITS_ONE,
- bytesize=serial.EIGHTBITS,
- timeout=1
-)
-counter=0
+# Open file to configure communication with server.
+with open('data.json', 'r') as json_file:
+ json_data = json_file.read()
-prev_status = ser.readline()
-while 1:
- park_status = ser.readline()
- 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)
- print("parking reserved. RESPONSE :", r.status_code, "\n")
- elif b'0' in park_status:
- data = """{"no":""" + parkingCode + ""","status":0}"""
+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'
+ ser = serial.Serial(
+ port='/dev/ttyACM0',
+ baudrate = 9600,
+ parity=serial.PARITY_NONE,
+ stopbits=serial.STOPBITS_ONE,
+ bytesize=serial.EIGHTBITS,
+ timeout=1
+ )
+ counter=0
+
+ 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 parkingStatus == "1":
+ print("parking reserved. RESPONSE :", r.status_code, "\n")
+ 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)
- print("parking not reserved. RESPONSE : ", r.status_code, "\n")
- except NameError:
- print("**Not already prev variable.\n")
- prev_status = park_status
+ except NameError:
+ print("**Not already prev variable.\n")
+ prev_status = park_status
+ else:
+ print("Create a *.json configuration like: {'ip' : 'xxx.xxx.xxx.xxx', 'port': 'xxxx'}")
diff --git a/serverNode/serv.py b/serverNode/serv.py
index 9c0ad8a..3f4be91 100644
--- a/serverNode/serv.py
+++ b/serverNode/serv.py
@@ -1,5 +1,5 @@
#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
-
+#===================================================================
# using flask restful
from flask import Flask, request, jsonify
from flask_restful import Resource, Api
diff --git a/webInterface/parking.css b/webInterface/parking.css
index a62e658..6a05587 100644
--- a/webInterface/parking.css
+++ b/webInterface/parking.css
@@ -1,3 +1,7 @@
+/*
+#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
+#===================================================================
+*/
table, th, td {
border: 1px solid black;
}
@@ -26,4 +30,4 @@ table, th, td {
.road {
color: lightgrey;
-}
\ No newline at end of file
+}
diff --git a/webInterface/parking.html b/webInterface/parking.html
index a4d3602..16c6d89 100644
--- a/webInterface/parking.html
+++ b/webInterface/parking.html
@@ -1,3 +1,7 @@
+
@@ -7,35 +11,63 @@
Parking
+Server Settings
+
+
+Parking Diagram