cs151051
/
smartParking
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of https://git.swarmlab.io:3000/cs151051/smartParking

master
cs161079 5 years ago
parent
1286b0bcae 7ee83277e0
commit
99ff56a5ab
6 changed files with 111 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      README.md
  2. 4
      iNode/data.json
  3. 34
      iNode/parking.py
  4. 2
      serverNode/serv.py
  5. 4
      webInterface/parking.css
  6. 40
      webInterface/parking.html

4
README.md
View File

@ -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
View File

@ -0,0 +1,4 @@
{
"ip": "192.168.89.14",
"port": "8080"
}

34
iNode/parking.py
View File

@ -1,11 +1,24 @@
#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' # Open file to configure communication with server.
parkingCode = "1" 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'
ser = serial.Serial( ser = serial.Serial(
port='/dev/ttyACM0', port='/dev/ttyACM0',
baudrate = 9600, baudrate = 9600,
@ -19,17 +32,22 @@ counter=0
prev_status = ser.readline() prev_status = ser.readline()
while 1: while 1:
park_status = ser.readline() 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: try:
if park_status != prev_status: if park_status != prev_status:
if b'1' in park_status: if parkingStatus == "1":
data = """{"no":""" + parkingCode + ""","status":1}"""
r = requests.post(url = API_ENDPOINT, data = data)
print("parking reserved. RESPONSE :", r.status_code, "\n") print("parking reserved. RESPONSE :", r.status_code, "\n")
elif b'0' in park_status: elif parkingStatus == "0":
data = """{"no":""" + parkingCode + ""","status":0}"""
r = requests.post(url = API_ENDPOINT, data = data)
print("parking not reserved. RESPONSE : ", r.status_code, "\n") print("parking not reserved. RESPONSE : ", r.status_code, "\n")
data = """{"no":""" + parkingCode + ""","status":""" + parkingStatus + """}"""
r = requests.post(url = API_ENDPOINT, data = data)
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
View File

@ -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
View File

@ -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;
} }

40
webInterface/parking.html
View File

@ -1,3 +1,7 @@
<!--
#Authors: Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
#===================================================================
-->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -7,9 +11,18 @@
</script> </script>
<script> <script>
function getParkingStatus() { $(document).ready(function(){
$("#approve").click(function() {
server_ip = $("#server_ip").val();
server_port = $("#server_port").val();
alert(server_ip + " " + server_port + ". Started!!!")
$("#msg").empty();
if (server_ip !== "" && server_ip !== null && server_port !== "" && server_port !== null) {
$("#msg").html("<font color='red'>ok!</font>");
setInterval(function () {
jQuery.ajax({ jQuery.ajax({
url: "http://192.168.1.13:8080/", url: "http://" + server_ip + ":" + server_port + "/",
type: "GET", type: "GET",
contentType: "application/json; charset=utf-8", contentType: "application/json; charset=utf-8",
@ -27,15 +40,34 @@ function getParkingStatus() {
timeout: 12000, timeout: 12000,
}); });
}, 1000);
} else {
$("#msg").html("<font color='red'>Something went wrong. Try again</font>");
} }
$(document).ready(function(){ });
setInterval(getParkingStatus, 1000);
}); });
</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>

Write Preview
Loading…
Cancel
Save