mirror of
https://github.com/Sani7/remote-ui.git
synced 2026-10-27 06:01:14 +01:00
simulators
Move websocket to thread
This commit is contained in:
@@ -1,11 +1,15 @@
|
|||||||
#include "simulators.hpp"
|
#include "simulators.hpp"
|
||||||
#include "can_debugger.hpp"
|
#include "can_debugger.hpp"
|
||||||
#include "test_sim.hpp"
|
#include "test_sim.hpp"
|
||||||
#include <QDebug>
|
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
|
|
||||||
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(Test_Sim);
|
||||||
INSERT_SIMULATOR(Can_Debugger);
|
INSERT_SIMULATOR(Can_Debugger);
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <QThread>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
@@ -52,6 +53,7 @@ class Simulators : public QObject
|
|||||||
void event_handler(json event);
|
void event_handler(json event);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
QThread *m_server_thread;
|
||||||
Websocket *m_server;
|
Websocket *m_server;
|
||||||
std::map<std::string, std::unique_ptr<Simulator_base>> m_simulators;
|
std::map<std::string, std::unique_ptr<Simulator_base>> m_simulators;
|
||||||
std::string m_current_simulator = "";
|
std::string m_current_simulator = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user