Index: LeahiRt/LeahiRtController.h =================================================================== diff -u -r6f9f24886c73d92b380e4c3afd82c0b19559d42d -r401d8ad0e5c070f9c6ecb41ed3ba25ba3d1c69a0 --- LeahiRt/LeahiRtController.h (.../LeahiRtController.h) (revision 6f9f24886c73d92b380e4c3afd82c0b19559d42d) +++ LeahiRt/LeahiRtController.h (.../LeahiRtController.h) (revision 401d8ad0e5c070f9c6ecb41ed3ba25ba3d1c69a0) @@ -4,13 +4,15 @@ #include #include #include +#include +#include #include -#include +#include "AgentInterface.h" +#include "AgentMessage.h" #include "CanInterface.h" #include "CanMessage.h" #include "MessageBuilder.h" -// SQ #include "ProtoInterface.h" using namespace Can; @@ -19,19 +21,20 @@ Q_OBJECT public: - explicit LeahiRtController(QObject *parent = nullptr); + explicit LeahiRtController(const QString &configPath, QObject *parent = nullptr); ~LeahiRtController(); - void openSocket(const QString host, const unsigned int port=80); + void connectToAgent(); private: + QSettings _settings; Can::CanInterface _canInterface; QThread _canThread; - QWebSocket _clientSocket; Can::MessageBuilder _msgBuilder; QMap _messages; - // SQ proto::ProtoInterface _protoInterface; - // SQ QThread _protoThread; + AgentInterface _agentInterface; + QThread _agentThread; + quint16 _txSequence = 0; Q_SIGNALS: void didCanMessageReceive(const QDateTime timestamp, const Can::Message msg);