Index: LeahiRt/LeahiRtController.h =================================================================== diff -u -r6b422c15085ed605d40cb5dd70177e4657a0ca7e -rf8c0a0b1c19dc386b2f88484d53db022270690a7 --- LeahiRt/LeahiRtController.h (.../LeahiRtController.h) (revision 6b422c15085ed605d40cb5dd70177e4657a0ca7e) +++ LeahiRt/LeahiRtController.h (.../LeahiRtController.h) (revision f8c0a0b1c19dc386b2f88484d53db022270690a7) @@ -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);