5 Commits

Author SHA1 Message Date
ishak jmilou.ishak
b48243f831 changed sensor data to db in other function 2025-01-13 14:57:52 +01:00
317731ec87 python merge fix 2025-01-13 11:00:43 +01:00
441ca19578 repaired js after merge 2025-01-13 10:44:20 +01:00
7f807d0031 added g import from flask 2025-01-13 10:39:23 +01:00
c0ec6901c4 edited python requirements 2025-01-13 10:33:46 +01:00
3 changed files with 9 additions and 20 deletions

View File

@@ -3,3 +3,4 @@ paho-mqtt==1.6.1
ultralytics==8.3.58
opencv-python-headless==4.6.0.66
numpy==1.23.4
mysql-connector-python==9.1.0

View File

@@ -1,4 +1,4 @@
from flask import Flask, Response, request, render_template, jsonify
from flask import Flask, Response, request, render_template, jsonify, g
import paho.mqtt.client as mqtt
from ultralytics import YOLO
import cv2
@@ -49,18 +49,6 @@ def on_message(client, userdata, message):
cv2.rectangle(processed_image, (x1, y1), (x2, y2), (0, 255, 0), 2)
cv2.putText(processed_image, f"{class_name} {box.conf.item():.2f}", (x1, y1 - 10), cv2.FONT_HERSHEY_SIMPLEX, 0.9, (0, 255, 0), 2)
# Globale MQTT setup
def on_message(client,userdata, message):
global kobuki_message, latest_image
if message.topic == "kobuki/data":
kobuki_message = str(message.payload.decode("utf-8"))
with app.app_context():
sensor_data(kobuki_message) # Sla de data op in de database
elif message.topic == "kobuki/cam":
latest_image = message.payload
# Create an MQTT client instance
mqtt_client = mqtt.Client()
mqtt_client.username_pw_set("server", "serverwachtwoordofzo")
@@ -131,8 +119,10 @@ def database():
rows = cursor.fetchall()
cursor.close()
return str(rows)
def sensor_data(kobuki_message):
@app.route('/data', methods=['GET'])
def data():
try:
# Parse de JSON-string naar een Python-dictionary
data = json.loads(kobuki_message)
@@ -165,10 +155,8 @@ def sensor_data(kobuki_message):
print(f"JSON decode error: {e}")
except mysql.connector.Error as err:
print(f"Database error: {err}")
@app.route('/data', methods=['GET'])
def data():
return kobuki_message
@app.route('/image')

View File

@@ -34,7 +34,8 @@ document.addEventListener("DOMContentLoaded", function() {
}
}
// Parse the data and show it on the website
// Parse the data and show it on the website
async function parseData() {
const data = await fetchData();
const sensorDataContainer = document.getElementById("sensor-data");
sensorDataContainer.innerHTML = ""; // Clear previous data
@@ -57,5 +58,4 @@ document.addEventListener("DOMContentLoaded", function() {
// Update the image every 200 milliseconds
setInterval(updateImage, 100);
});
});