From 63d6ff460b7e2b43a7af53fe07d5332fc861a644 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Mon, 10 Mar 2025 16:38:49 +0100 Subject: [PATCH] simulators Move websocket to thread --- server/simulators.cpp | 8 ++++++-- server/simulators.hpp | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/simulators.cpp b/server/simulators.cpp index 0f30b5e..c989ad6 100644 --- a/server/simulators.cpp +++ b/server/simulators.cpp @@ -1,11 +1,15 @@ #include "simulators.hpp" #include "can_debugger.hpp" #include "test_sim.hpp" -#include #include -Simulators::Simulators(uint16_t port, QObject *parent) : QObject(parent), m_server(new Websocket(port, this)) +Simulators::Simulators(uint16_t port, QString can_dev, QObject *parent) + : QObject(parent), m_server_thread(new QThread), m_server(new Websocket(port, parent)), + m_can_wrapper(new CAN_Wrapper(new CAN_Interface(can_dev, parent), parent)) { + m_server->moveToThread(m_server_thread); + m_server_thread->start(); + INSERT_SIMULATOR(Test_Sim); INSERT_SIMULATOR(Can_Debugger); diff --git a/server/simulators.hpp b/server/simulators.hpp index f1b9e0f..929cb4b 100644 --- a/server/simulators.hpp +++ b/server/simulators.hpp @@ -1,4 +1,5 @@ #pragma once +#include #include #include #include @@ -52,6 +53,7 @@ class Simulators : public QObject void event_handler(json event); private: + QThread *m_server_thread; Websocket *m_server; std::map> m_simulators; std::string m_current_simulator = "";