12 Commits

Author SHA1 Message Date
ishak jmilou.ishak
8b66702605 changed function 2025-01-14 16:50:11 +01:00
ishak jmilou.ishak
d8b3ec2938 added thread 2025-01-14 16:39:52 +01:00
ishak jmilou.ishak
97076dfe05 Add Kobuki connection monitoring and automatic start/stop functionality 2025-01-14 16:35:51 +01:00
ishak jmilou.ishak
967bc8247c Refactor YOLO results handling by separating database insertion logic into a dedicated function 2025-01-14 15:37:08 +01:00
ishak jmilou.ishak
5d61579973 Refactor YOLO results endpoint to handle empty results and improve database insertion logic 2025-01-14 14:22:50 +01:00
ishak jmilou.ishak
ebd88e43ab Add error handling and database insertion for YOLO results 2025-01-14 13:23:48 +01:00
ishak jmilou.ishak
2fbe18be76 went back 2025-01-14 13:14:38 +01:00
ishak jmilou.ishak
74d9687af5 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/technische-informatica-sm3/ti-projectten/rooziinuubii79 2025-01-14 12:30:56 +01:00
ishak jmilou.ishak
48023773c6 went back to older version. db get empty rows 2025-01-14 12:30:54 +01:00
56ac9cf687 change dockerfile command 2025-01-14 12:11:50 +01:00
ishak jmilou.ishak
3232ff121f changed db connection 2025-01-14 12:08:08 +01:00
5844387b19 merge foutje opgelost 2025-01-14 11:56:28 +01:00
3 changed files with 38 additions and 21 deletions

View File

@@ -8,6 +8,8 @@
using namespace std;
using namespace cv;
CKobuki robot;
std::atomic<bool> kobuki_connected(false);
std::string readMQTT();
void parseMQTT(std::string message);
@@ -28,12 +30,28 @@ void setup()
client.subscribe("home/commands");
}
void checkKobukiConnection() {
while (true) {
bool connected = robot.isConnected();
if (!connected && kobuki_connected) {
cout << "Kobuki is disconnected" << endl;
kobuki_connected = false;
} else if (connected && !kobuki_connected) {
cout << "Kobuki is connecting..." << endl;
// Start de Kobuki automatisch
robot.startCommunication("/dev/ttyUSB0", true, nullptr);
}
std::this_thread::sleep_for(std::chrono::seconds(5)); // Controleer elke 5 seconden
}
}
int main()
{
setup();
std::thread image (CapnSend);
std::thread safety([&]() { robot.robotSafety(&message); });
std::thread sendMqtt([&]() { sendKobukiData(robot.parser.data); });
std::thread connectionThread(checkKobukiConnection);
while(true){
std::string message = readMQTT();
@@ -46,6 +64,7 @@ int main()
sendMqtt.join();
safety.join();
image.join();
connectionThread.join();
}
std::string readMQTT()

View File

@@ -14,5 +14,5 @@ EXPOSE 5000
CMD ["python", "web/app.py"]
#build instruction: sudo docker buildx build -t flaskapp:latest .
#run instruction: sudo docker run --network="host" flaskapp:latest
#run instruction: sudo docker run --network="host" --restart=always flaskapp:latest
# need to use network host to connect to the host's mqtt server

View File

@@ -59,9 +59,6 @@ mqtt_client.subscribe("kobuki/cam")
mqtt_client.on_message = on_message # this line needs to be under the function definition otherwise it can't find which function it needs to use
mqtt_client.on_message = on_message # this line needs to be under the function definition otherwise it can't 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
@@ -110,15 +107,6 @@ def move():
cursor.close()
db_connection.close()
return jsonify({"status": "success", "direction": direction})
@app.route("/database")
def database():
db = get_db()
cursor = db.cursor()
cursor.execute("SELECT * FROM kobuki_data")
rows = cursor.fetchall()
cursor.close()
return str(rows)
@app.route('/data', methods=['GET'])
@@ -142,15 +130,15 @@ def data():
# Database-insert
db = get_db()
cursor = db.cursor()
with db.cursor() as cursor:
# Zorg dat je tabel `kobuki_data` kolommen heeft: `name` en `value`
sql_sensor = "INSERT INTO kobuki_data (name, value) VALUES (%s, %s)"
cursor.executemany(sql_sensor, sensor_data_tuples)
# Commit en sluit de cursor
db.commit()
cursor.close()
# Zorg dat je tabel `kobuki_data` kolommen heeft: `name` en `value`
sql_sensor = "INSERT INTO kobuki_data (name, value) VALUES (%s, %s)"
cursor.executemany(sql_sensor, sensor_data_tuples)
# Commit en sluit de cursor
db.commit()
cursor.close()
except json.JSONDecodeError as e:
print(f"JSON decode error: {e}")
except mysql.connector.Error as err:
@@ -176,6 +164,16 @@ def yolo_results_endpoint():
with lock:
return jsonify(yolo_results)
def yolo_results_db():
global yolo_results
db = get_db()
with db.cursor() as cursor:
sql_yolo = "INSERT INTO yolo_results (object, confidence) VALUES (%s, %s)"
yolo_tuples = [(result["class"], result["confidence"]) for result in yolo_results]
cursor.executemany(sql_yolo, yolo_tuples)
db.commit()
cursor.close()
if __name__ == '__main__':
app.run(debug=True, port=5000)