Browse Source

v1.2

master
cs151051 5 years ago
parent
commit
78cb2beb62
  1. 4
      README.md
  2. 4
      iNode/data.json
  3. 14
      iNode/parking.py
  4. 2
      serverNode/serv.py
  5. 4
      webInterface/parking.css
  6. 37
      webInterface/parking.html

4
README.md

@ -1,4 +1,6 @@
# smartParking # smartParking
#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
#===================================================================
Smart and Autonomous parking. 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 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. 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. the information as JSON from REST-API.

4
iNode/data.json

@ -0,0 +1,4 @@
{
'ip': '192.168.1.13',
'port': '8080'
}

14
iNode/parking.py

@ -1,10 +1,20 @@
#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
#===================================================================
#!/usr/bin/env python #!/usr/bin/env python
import time import time
import serial import serial
import requests import requests
import json
API_ENDPOINT = 'http://192.168.1.13:8080/parkingStatus' with open('data.json') as json_file:
server_par = json.load(json_file)
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" parkingCode = "1"
ser = serial.Serial( ser = serial.Serial(
port='/dev/ttyACM0', port='/dev/ttyACM0',
@ -32,4 +42,6 @@ while 1:
except NameError: except NameError:
print("**Not already prev variable.\n") print("**Not already prev variable.\n")
prev_status = park_status prev_status = park_status
else:
print("Create a *.json configuration like: {'ip' : 'xxx.xxx.xxx.xxx', 'port': 'xxxx'}")

2
serverNode/serv.py

@ -1,5 +1,5 @@
#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras #Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
#===================================================================
# using flask restful # using flask restful
from flask import Flask, request, jsonify from flask import Flask, request, jsonify
from flask_restful import Resource, Api from flask_restful import Resource, Api

4
webInterface/parking.css

@ -1,3 +1,7 @@
/*
#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
#===================================================================
*/
table, th, td { table, th, td {
border: 1px solid black; border: 1px solid black;
} }

37
webInterface/parking.html

@ -1,3 +1,7 @@
<!--
#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
#===================================================================
-->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -7,9 +11,9 @@
</script> </script>
<script> <script>
function getParkingStatus() { function getParkingStatus(ip, port) {
jQuery.ajax({ jQuery.ajax({
url: "http://192.168.1.13:8080/", url: "http://" + ip + ":" + port + "8080/",
type: "GET", type: "GET",
contentType: "application/json; charset=utf-8", contentType: "application/json; charset=utf-8",
@ -29,13 +33,40 @@ function getParkingStatus() {
}); });
} }
$(document).ready(function(){ $(document).ready(function(){
setInterval(getParkingStatus, 1000); $("#approve").click(function() {
server_ip = $("#server_ip").val();
server_port = $("#server_port").val();
$("#msg").empty();
if (server_ip !== "" && server_ip !== null && server_port !== "" && server_port !== null) {
$("#msg").html("<font color='red'>ok!</font>");
setInterval(getParkingStatus(server_ip, server_port), 1000);
} else {
$("#msg").html("<font color='red'>Something went wrong. Try again</font>");
}
});
}); });
</script> </script>
</head> </head>
<body> <body>
<h1>Parking</h1> <h1>Parking</h1>
<h3>Server Settings</h3>
<table>
<tr>
<td>Server IP:</td>
<td><input type="text" id="server_ip" placeholder="xxx.xxx.xxx.xxx"/></td>
</tr>
<tr>
<td>Server PORT:</td>
<td><input type="text" id="server_port" placeholder="xxxx"/></td>
</tr>
<tr>
<td><div id="msg"></div></td>
<td><input type="button" id="approve" value="ok"/></td>
</tr>
</table>
<h3>Parking Diagram</h3>
<table width="100%"> <table width="100%">
<tr> <tr>
<td id="park4" width="30%">No4<div id="4" class="full"></div></td> <td id="park4" width="30%">No4<div id="4" class="full"></div></td>

Loading…
Cancel
Save