added kobuki_message

src/C++/Driver/src/main.cpp

@@ -1,7 +1,6 @@
 #include <iostream>
 #include <cmath>
 #include <thread>
-#include "KobukiDriver/graph.h"
 #include "MQTT/MqttClient.h"
 #include "KobukiDriver/CKobuki.h"
 
@@ -10,7 +9,7 @@ CKobuki robot;
 std::string readMQTT();
 void parseMQTT(std::string message);
 //ip, clientID, username, password
-MqttClient client("mqtt://145.92.224.21:1884", "KobukiRPI", "rpi", "rpiwachtwoordofzo"); // create a client object
+MqttClient client("ws://145.92.224.21/ws/", "KobukiRPI", "rpi", "rpiwachtwoordofzo"); // create a client object
 std::string message = "stop";
 std::string serializeKobukiData(const TKobukiData &data);
 void sendKobukiData(TKobukiData &data);
@@ -18,24 +17,27 @@ void sendKobukiData(TKobukiData &data);
 void setup()
 {
     unsigned char *null_ptr(0);
-    robot.startCommunication("/dev/ttyUSB0", true, null_ptr);
+    // robot.startCommunication("/dev/ttyUSB0", true, null_ptr);
     //connect mqtt server and sub to commands
+
     client.connect();
     client.subscribe("home/commands");
 }
 
 int main()
 {
+    // Unset the http_proxy environment variable
+
+
     setup();
     std::thread safety([&]() { robot.robotSafety(&message); });
     std::thread sendMqtt([&]() { sendKobukiData(robot.parser.data); });
     
     while(true){
-    parseMQTT(readMQTT());
+        parseMQTT(readMQTT());
     }
     sendMqtt.join();
     safety.join();
-    return 0;
 }
 
 std::string readMQTT()
@@ -270,6 +272,7 @@ std::string serializeKobukiData(const TKobukiData &data) {
 void sendKobukiData(TKobukiData &data) {
     while (true) {
         client.publishMessage("kobuki/data", serializeKobukiData(data));
+        std::cout << "Sent data" << std::endl;
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     }
 }

src/Python/flask/web/app.py

@@ -1,39 +1,50 @@
-from flask import Flask, request, render_template, jsonify
+from flask import Flask, request, render_template, jsonify, g
 import paho.mqtt.client as mqtt
-import mysql.connector
+import mysql.connector 
 
 app = Flask(__name__)
 
+# Globale MQTT setup
 kobuki_message = "empty"
-def on_message(client, userdata, message):
-    global kobuki_message #set scope for this variable
-    kobuki_message = str(message.payload.decode("utf-8"))
-    print(kobuki_message)
+def on_message(client, message):
+    global kobuki_message, latest_image
+    if message.topic == "kobuki/data":
+        kobuki_message = str(message.payload.decode("utf-8"))
+    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")
-mqtt_client.connect("localhost", 80, 60)
+mqtt_client.connect("localhost", 1884, 60)
 mqtt_client.loop_start()
 mqtt_client.subscribe("kobuki/data")
-mqtt_client.on_message = on_message # this lines needs to be under the function definition otherwise it cant find which function it needs to use
 
+# Database connectie-functie
+def get_db():
+    if 'db' not in g:  # 'g' is specifiek voor een request en leeft zolang een request duurt
+        g.db = mysql.connector.connect(
+            host="127.0.0.1",
+            port=3306,
+            user="admin",
+            password="kobuki",
+            database="kobuki"
+        )
+    return g.db
 
-cnx = mysql.connector.connect(
-    host="127.0.0.1",
-    port=3306,
-    user="admin",
-    password="kobuki",
-    database="kobuki")
-
-cnx.close()
+# Sluit de database na elke request
+@app.teardown_appcontext
+def close_db(error):
+    db = g.pop('db', None)
+    if db is not None:
+        db.close()
 
 @app.route('/')
 def index():
     return render_template('index.html')
 
-
-@app.route('/control', methods=["GET","POST"])
+@app.route('/control', methods=["GET", "POST"])
 def control():
     if request.authorization and request.authorization.username == 'ishak' and request.authorization.password == 'kobuki':
         return render_template('control.html')
@@ -47,35 +58,31 @@ def move():
 
     # Verstuur de richting via MQTT
     if direction:
-        mqtt_client.publish("home/commands", direction)  # Het topic kan aangepast worden
+        mqtt_client.publish("home/commands", direction)
 
+    db_connection = get_db()
+    cursor = db_connection.cursor()
+    sql = "INSERT INTO command (command) VALUES (%s)"
+    value = direction
+    cursor.execute(sql, (value,))
+    db_connection.commit()
+    cursor.close()
+    db_connection.close()
+    
     return jsonify({"status": "success", "direction": direction})
 
-
 @app.route('/data', methods=['GET'])
 def data():
     return kobuki_message
 
-@app.route('/phpmyadmin/<path:path>')
-def phpmyadmin_passthrough(path):
-    # Laat Apache deze route direct afhandelen
-    return "", 404
-
 @app.route("/database")
 def database():
-    try:
-        cur = cnx.cursor()
-        cur.execute("SELECT * FROM kobuki_data")
-        rows = cur.fetchall()  # Haal alle rijen op uit het resultaat
-        cur.close()
-       
-        return str(rows)
-    except Exception as e:
-        print(f"Database error: {e}")
-        return "Er is een fout opgetreden bij het ophalen van de databasegegevens.", 500
-    
-def add_command(command):
-    command_query = "INSERT INTO kobuki (command) VALUES ();"
+    db = get_db()
+    cursor = db.cursor()
+    cursor.execute("SELECT * FROM kobuki_data")
+    rows = cursor.fetchall()
+    cursor.close()
+    return str(rows)
 
 if __name__ == '__main__':
     app.run(debug=True, port=5000)

teamdocumentatie/Ishak/motivatie.md

@@ -0,0 +1,21 @@
+Motivation Letter
+
+16/12/2024
+
+Cognizant Digital StudioAttn. Hayo Rubingh
+
+Subject: Internship Application Cognizant Digital Studio
+
+Dear Mr. Rubingh,
+
+With great enthusiasm, I am applying for the internship position at Cognizant Digital Studio in Amsterdam. As a second-year bachelor’s student in Technische Informatica(Computer Science) at Hogeschool Van Amsterdam, I am seeking a challenging internship where I can combine my technical skills with my passion for innovation. Cognizant’s focus  IoT, and technology prototypes fits perfectly with my interests .
+
+Throughout my studies, I have gained experience in software development, including Python and JavaScript, and have worked with IoT devices such as Arduino/ESP. What drives me is the opportunity to create and develop new solutions that can make life easier and more efficient. I am particularly interested in the field of IoT and the possibilities it offers for creating smart solutions. I am eager to learn more about the latest technologies and how they can be applied in real-world projects.
+
+I am available to start in February 2025 and look forward to contributing to innovative projects.
+
+I would be delighted to discuss my motivation and experience further in a personal interview. You can find my contact details in my CV. Thank you for considering my application. I am looking forward to hearing from you.
+
+Yours sincerely,
+
+Ishak Jmilou

teamdocumentatie/Ishak/verslag.md

@@ -0,0 +1,54 @@
+![alt text](images/image.png)
+
+# Welke communicatieprotocol geeft de mogelijkheid om veilig en betrouwbaar te communiceren tussen IoT apparaten?
+
+Auteur: Ishak Jmilou
+
+Datum: 17-12-2024
+
+
+
+---
+
+
+## Inleiding
+
+In dit verslag wordt er gekeken naar de verschillende communicatieprotocollen die gebruikt kunnen worden om veilig en betrouwbaar te communiceren tussen IoT apparaten. Er wordt gekeken naar de verschillende protocollen en de voor- en nadelen van elk protocol.
+
+---
+
+## 1. Wat houdt veilige en betrouwbare communicatie tussen apparaten in?
+
+Als je werkt met IoT-apparaten, is het belangrijk dat de communicatie tussen deze apparaten veilig en betrouwbaar is. Iot-apparaten verzamelen gegeven over de omgeving en communiceert deze tussen apparaten over het internet. Als deze communicatie niet veilig is, kunnen hackers deze gegevens onderscheppen en gebruiken(Ministerie van Algemene Zaken, 2022). Je wilt voorkomen dat hackers toegang krijgen tot gevoelige informatie zoals persoonlijke gegevens of bedrijfsgeheimen. Daarom is het belangrijk dat de communicatie tussen apparaten veilig en betrouwbaar is.
+
+## 2. Welke protocollen zijn er om veilig en betrouwbaar te communiceren tussen apparaten?
+
+Er zijn verschillende soorten protocollen die 
+
+
+## 3. Wat zijn de voor- en nadelen van de verschillende protocollen?
+
+
+## literatuurlijst
+
+- Singh, S., & Jyoti. (2024, June 7). Secure Communications Protocols for IoT networks: a survey. https://journal.ijprse.com/index.php/ijprse/article/view/1082
+  
+- Nguyen, K. T., Laurent, M., Oualha, N., CEA, & Institut Mines-Telecom. (2015). Survey on secure communication protocols for the Internet of Things. In Ad Hoc Networks (Vol. 32, pp. 17–31) [Journal-article]. http://dx.doi.org/10.1016/j.adhoc.2015.01.006
+
+- Miorandi, D., Sicari, S., De Pellegrini, F., & Imrich Chlamtac. (2012). Internet of things: Vision, applications and research challenges. In Ad Hoc Networks (Vol. 10, pp. 1497–1516) [Journal-article]. Elsevier B.V. http://dx.doi.org/10.1016/j.adhoc.2012.02.016
+
+- Christiano, P. (2023, November 5). Top 9 IoT communication protocols & their features in 2024: An In-Depth guide - ExpertBeacon. Expertbeacon. https://expertbeacon.com/iot-communication-protocol/
+
+- Yugha, R., & Chithra, S. (2020). A survey on technologies and security protocols: Reference for future generation IoT. Journal of Network and Computer Applications, 169, 102763. https://doi.org/10.1016/j.jnca.2020.102763
+
+- De Mendizábal, I. (2022, June 16). IoT Communication Protocols—IoT Data Protocols. Technical Articles. https://www.allaboutcircuits.com/technical-articles/internet-of-things-communication-protocols-iot-data-protocols/
+
+- IoT-technologieën en -protocollen | Microsoft Azure. (n.d.). https://azure.microsoft.com/nl-nl/solutions/iot/iot-technology-protocols
+
+- Het IoT verbinden: wat is MQTT en waarin verschilt het van CoAP? (n.d.). https://www.onlogic.com/nl/blog/het-iot-verbinden-wat-is-mqtt-en-waarin-verschilt-het-van-coap/
+
+- Nader, K. (2023, October 30). Wat zijn de voordelen van het gebruik van WebSocket voor IoT-communicatie? AppMaster - Ultimate All-in No-code Platform. https://appmaster.io/nl/blog/websocket-voor-iot-communicatie
+
+- Sidna, J., Amine, B., Abdallah, N., & Alami, H. E. (2020). Analysis and evaluation of communication Protocols for IoT Applications. Karbala International Journal of Modern Science. https://doi.org/10.1145/3419604.3419754
+
+- Ministerie van Algemene Zaken. (2022, February 8). Hoe kan ik slimme apparaten veilig gebruiken? Rijksoverheid.nl. https://www.rijksoverheid.nl/onderwerpen/bescherming-van-consumenten/vraag-en-antwoord/hoe-kan-ik-slimme-apparaten-veilig-gebruiken