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

5 years ago · 99ff56a5ab
6 changed files with 111 additions and 51 deletions
--- 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.
--- a/iNode/data.json
+++ b/iNode/data.json
@ -0,0 +1,4 @@
+{
+    "ip": "192.168.89.14",
+    "port": "8080"
+}
--- a/iNode/parking.py
+++ b/iNode/parking.py
@ -1,11 +1,24 @@
+#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"
+# 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'
        ser = serial.Serial(
            port='/dev/ttyACM0',
            baudrate = 9600,
@ -19,17 +32,22 @@ 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 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
+    else:
+        print("Create a *.json configuration like: {'ip' : 'xxx.xxx.xxx.xxx', 'port': 'xxxx'}")

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

 <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%">
 	<tr>
 		<td id="park4" width="30%">No4<div id="4" class="full"></div></td>