diff --git a/.gitignore b/.gitignore index 908a659..7482133 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ src/C++/Driver/Makefile src/C++/Driver/vgcore* src/C++/Driver/cmake_install.cmake src/C++/Driver/Makefile -src/Python/flask/web/_pycache_ \ No newline at end of file +src/Python/flask/web/_pycache_ +venv \ No newline at end of file diff --git a/src/Python/flask/web/app.py b/src/Python/flask/web/app.py index 5b555b0..4bcc928 100644 --- a/src/Python/flask/web/app.py +++ b/src/Python/flask/web/app.py @@ -1,4 +1,5 @@ -from flask import Flask, render_template +from flask import Flask, request, render_template +import paho.mqtt.publish as publish app = Flask(__name__) @@ -6,12 +7,11 @@ app = Flask(__name__) def index(): return render_template('index.html') -@app.route('/control', methods=['POST']) -def control(): - return("hello") - +@app.route('/move', methods=['POST']) +def move(): + direction = request.form['direction'] + publish.single("home/commands", direction, hostname="ishak.ishakpi.ddns.net") + return "Message sent" if __name__ == '__main__': - app.run(debug=True) - - + app.run(debug=True) \ No newline at end of file diff --git a/src/Python/flask/web/templates/index.html b/src/Python/flask/web/templates/index.html index c32b2d8..0ab2680 100644 --- a/src/Python/flask/web/templates/index.html +++ b/src/Python/flask/web/templates/index.html @@ -4,13 +4,15 @@ Kobuki Robot
- - - - +
+ + + + +
-

Sensor Data

+

Sensor Data

{%endblock%} diff --git a/src/Python/socket/socketServer.py b/src/Python/socket/socketServer.py index 1bff9ef..023c0fc 100644 --- a/src/Python/socket/socketServer.py +++ b/src/Python/socket/socketServer.py @@ -1,20 +1,17 @@ -import socket +import paho.mqtt.client as mqtt -HOST = "127.0.0.1" # Listen on all available interfaces -PORT = 4024 # Port to listen on (non-privileged ports are > 1023) +def on_connect(client, userdata, flags, rc): + print("Connected with result code " + str(rc)) + client.subscribe("move") -with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s: - s.bind((HOST, PORT)) - s.listen() - print(f"Server listening on {HOST}:{PORT}") - conn, addr = s.accept() - with conn: - print(f"Connected by {addr}") - conn.sendall(b"hallo\n") - while True: - data = conn.recv(2048) - if data: - print("Received:", repr(data)) - conn.sendall(b"message received\n") - if not data: - break \ No newline at end of file +def on_message(client, userdata, msg): + command = msg.payload.decode() + print(f"Received command: {command}") + # Voeg hier je code toe om het commando uit te voeren + +client = mqtt.Client() +client.on_connect = on_connect +client.on_message = on_message + +client.connect("ishak.ishakpi.ddns.net", 1883, 60) +client.loop_forever() \ No newline at end of file