Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+6
-2
@@ -6,6 +6,8 @@
|
||||
#include "WebSocketInterface/json_keys.h"
|
||||
#include "WebSocketInterface/data_manager.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QUuid>
|
||||
|
||||
@@ -42,12 +44,14 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS
|
||||
ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data)
|
||||
: LtsWebSocket::AbstractClientMessage(client, type, typeId, uuid, data)
|
||||
, m_dataManager(dataManager)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{}
|
||||
|
||||
|
||||
|
||||
SendBiteRequest::SendBiteRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
SendBiteRequest::SendBiteRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data)
|
||||
: ClientMessage(dataManager, client, type, typeId, uuid, data)
|
||||
{}
|
||||
|
||||
void SendBiteRequest::process()
|
||||
{
|
||||
|
||||
+3
-3
@@ -108,9 +108,9 @@ PositionMessage::PositionMessage(const PositionMessage::PositionData &data, cons
|
||||
{
|
||||
m_jsonRepresentation.insert(DATA(),
|
||||
QJsonObject({{EQUIP_NO(), data.equipNo},
|
||||
{POS_LAT(), data.pos.lat()},
|
||||
{POS_LON(), data.pos.lon()},
|
||||
{POS_Z(), data.pos.z()},
|
||||
{POS_LAT(), data.pos.lat},
|
||||
{POS_LON(), data.pos.lon},
|
||||
{POS_Z(), data.pos.z},
|
||||
{LAST_POSITION_UPDATE(), data.gpsTime}
|
||||
}));
|
||||
}
|
||||
|
||||
+3
-3
@@ -23,9 +23,9 @@ DataManager::DataManager(MainHandler *mainHandler)
|
||||
LtsWebSocket::ReplyMessage* DataManager::sendBiteRequest(const QString &uuid, int equipNo)
|
||||
{
|
||||
DemandBiteRequest request;
|
||||
request.equipmentNumbers().push_back(equipNo);
|
||||
request.withSelfTest(true);
|
||||
request.requestId(s_requestId++);
|
||||
request.equipmentNumbers.push_back(equipNo);
|
||||
request.withSelfTest = true;
|
||||
request.requestId = s_requestId++;
|
||||
|
||||
rti::core::SampleIdentity sampleIdentity;
|
||||
m_mainHandler->ftsHandler()->onDemandBiteRequest(sampleIdentity, request);
|
||||
|
||||
+2
@@ -7,6 +7,7 @@
|
||||
#include "WebSocketInterface/Messages/client_message.h"
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
#include "settings.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
@@ -19,6 +20,7 @@ WebSocketInterfaceHandler::WebSocketInterfaceHandler(MainHandler *mainHandler, Q
|
||||
, m_messageFactory(nullptr)
|
||||
, m_dataManager(nullptr)
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user