Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -20,7 +20,7 @@ namespace NmeaManagement
|
||||
DdsHandler::DdsHandler(int domainId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
|
||||
{
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
DdsHandler::~DdsHandler()
|
||||
@@ -30,7 +30,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -46,36 +46,36 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
|
||||
if (!m_ddsDts->enableBatteryAlarm())
|
||||
{
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enableBatteryAlarm data topic server";
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableBatteryAlarm data topic server";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ddsDts->enableServiceControl())
|
||||
{
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enableServiceControl data topic server";
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableServiceControl data topic server";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ddsDts->enableBatteryState())
|
||||
{
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enableBatteryState data topic server";
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableBatteryState data topic server";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ddsDts->enablePositionExcon())
|
||||
{
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enablePositionExcon data topic server";
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enablePositionExcon data topic server";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG() << "Dts initialised";
|
||||
INFO_LOG(m_logger) << "Dts initialised";
|
||||
|
||||
|
||||
if (!m_ddsFts->enableAll())
|
||||
{
|
||||
ERROR_LOG() << "Could not initialize NmeaManagement enableAll function topic";
|
||||
ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableAll function topic";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG() << "Fts initialised";
|
||||
INFO_LOG(m_logger) << "Fts initialised";
|
||||
|
||||
// TODO: call at the end of main_handler init:
|
||||
this->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
|
||||
@@ -44,6 +44,7 @@ public:
|
||||
std::shared_ptr<NmeaManagement::Interface::Fts> fts() const { return m_ddsFts;}
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<DTS::CurrentRunningState> m_dtsCurrentRunningState;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
|
||||
@@ -14,9 +14,8 @@
|
||||
namespace NmeaManagement
|
||||
{
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
{}
|
||||
MainHandler::MainHandler(QObject *parent) : QObject(parent),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
@@ -32,10 +31,10 @@ bool MainHandler::init(int domainId)
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation ddsHandler failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
|
||||
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
|
||||
|
||||
m_nmeaHandler = std::make_shared<NmeaHandler>(m_ddsHandler, this);
|
||||
m_nmeaHandler->init();
|
||||
|
||||
@@ -29,6 +29,7 @@ public:
|
||||
std::shared_ptr<DdsHandler> dds() const { return m_ddsHandler; }
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<SocketHandler> m_socketHandler;
|
||||
std::shared_ptr<NmeaHandler> m_nmeaHandler;
|
||||
|
||||
@@ -65,29 +65,29 @@ void NmeaHandler::IIXDR(QString package)
|
||||
NmeaManagement::ServiceControl serviceControl;
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
INFO_LOG() << "----------------------------------------------------";
|
||||
INFO_LOG() << "batteryState pkt_data.size=" << pkt_data.size();
|
||||
INFO_LOG(m_logger) << "----------------------------------------------------";
|
||||
INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
|
||||
for (int i = 0; i < pkt_data.size(); i++)
|
||||
INFO_LOG() << "i=" << i << "Value=" << pkt_data[i];
|
||||
INFO_LOG(m_logger) << "i=" << i << "Value=" << pkt_data[i];
|
||||
|
||||
|
||||
int index = pkt_data.indexOf(QLatin1String("S")) + 1;
|
||||
if ( index >= 1)
|
||||
{
|
||||
INFO_LOG() << "Ausschalten!!!";
|
||||
INFO_LOG(m_logger) << "Ausschalten!!!";
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_PRESHUTDOWN"))
|
||||
{
|
||||
INFO_LOG() << "SERVICE_CONTROL_PRESHUTDOWN";
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_PRESHUTDOWN";
|
||||
serviceControl.ServiceControlState(ServiceControlEnum_def::PRESHUTDOWN);
|
||||
}
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN"))
|
||||
{
|
||||
INFO_LOG() << "SERVICE_CONTROL_SHUTDOWN";
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN";
|
||||
serviceControl.ServiceControlState(ServiceControlEnum_def::SHUTDOWN);
|
||||
}
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP"))
|
||||
{
|
||||
INFO_LOG() << "SERVICE_CONTROL_STOP";
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP";
|
||||
serviceControl.ServiceControlState(ServiceControlEnum_def::STOP);
|
||||
}
|
||||
m_ddsHandler->dts()->publish(serviceControl);
|
||||
@@ -160,7 +160,7 @@ void NmeaHandler::IIXDR(QString package)
|
||||
batteryState.voltage(voltage);
|
||||
|
||||
batteryState.serialNumber(serialNumber.toStdString()) ;
|
||||
INFO_LOG() << "publish batteryState serialNumber=" << serialNumber;
|
||||
INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber;
|
||||
m_ddsHandler->dts()->publish(batteryState);
|
||||
}
|
||||
|
||||
@@ -187,10 +187,10 @@ void NmeaHandler::IIALR(QString package)
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
alarm_state packageData;
|
||||
INFO_LOG() << "pkt_data.size=" << pkt_data.size();
|
||||
INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
|
||||
// for ( int i = 0; i < pkt_data.size(); i++)
|
||||
// {
|
||||
// INFO_LOG()<< "i=" << i << "Value=" << pkt_data[i];
|
||||
// INFO_LOG(m_logger)<< "i=" << i << "Value=" << pkt_data[i];
|
||||
// }
|
||||
packageData.time = pkt_data[1];
|
||||
packageData.number = pkt_data[2].toInt();
|
||||
@@ -206,7 +206,7 @@ void NmeaHandler::IIALR(QString package)
|
||||
|
||||
qint64 timeAlarm = getDateTime(packageData.time);
|
||||
|
||||
INFO_LOG() << "time=" << packageData.time
|
||||
INFO_LOG(m_logger) << "time=" << packageData.time
|
||||
<< " timeAlarm=" << timeAlarm
|
||||
<< " number=" << packageData.number
|
||||
<< " condition=" << packageData.condition
|
||||
@@ -276,10 +276,10 @@ void NmeaHandler::GPGGA(QString package)
|
||||
|
||||
if (packageData.C_latitude_dir == 'S' || packageData.C_latitude_dir == 's')
|
||||
latDecimal = ((real / 60) + inteiro) * -1;
|
||||
//INFO_LOG() << QString::number(((real / 60) + inteiro) * -1, 'g', 9);
|
||||
//INFO_LOG(m_logger) << QString::number(((real / 60) + inteiro) * -1, 'g', 9);
|
||||
else
|
||||
latDecimal = ((real / 60) + inteiro);
|
||||
//INFO_LOG() << "latitude=" << QString::number(((real / 60) + inteiro), 'g', 9);
|
||||
//INFO_LOG(m_logger) << "latitude=" << QString::number(((real / 60) + inteiro), 'g', 9);
|
||||
|
||||
|
||||
while (packageData.D_longitude[0] == QStringLiteral("0"))
|
||||
@@ -300,7 +300,7 @@ void NmeaHandler::GPGGA(QString package)
|
||||
lonDecimal = ((real / 60) + inteiro);
|
||||
}
|
||||
|
||||
INFO_LOG() << "longitude=" << lonDecimal
|
||||
INFO_LOG(m_logger) << "longitude=" << lonDecimal
|
||||
<< " latitude=" << latDecimal;
|
||||
|
||||
|
||||
@@ -332,7 +332,7 @@ void NmeaHandler::GPRMC(QString package)
|
||||
packageData.K_variacao_magnetica_coord = pkt_data[11].toStdString()[0];
|
||||
|
||||
|
||||
INFO_LOG() << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
|
||||
INFO_LOG(m_logger) << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
|
||||
|
||||
}
|
||||
|
||||
@@ -357,7 +357,7 @@ void NmeaHandler::decode(QString nmeaPackage)
|
||||
nmeaPackage.remove(0, startingPoint);
|
||||
|
||||
nmeaType = nmeaPackage.mid(1, 5);
|
||||
INFO_LOG() << "nmeaType=" << nmeaType;
|
||||
INFO_LOG(m_logger) << "nmeaType=" << nmeaType;
|
||||
|
||||
if (nmeaType == QStringLiteral("IIXDR"))
|
||||
{
|
||||
@@ -366,10 +366,10 @@ void NmeaHandler::decode(QString nmeaPackage)
|
||||
|
||||
if (nmeaType == QStringLiteral("GPGGA"))
|
||||
{
|
||||
INFO_LOG() << "Eigenposition";
|
||||
INFO_LOG(m_logger) << "Eigenposition";
|
||||
if (checksum(nmeaPackage))
|
||||
{
|
||||
INFO_LOG() << "Eigenposition checksum ok";
|
||||
INFO_LOG(m_logger) << "Eigenposition checksum ok";
|
||||
GPGGA(nmeaPackage);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,8 +44,8 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
|
||||
connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWritten(qint64)));
|
||||
|
||||
INFO_LOG() << "Connecting,..";
|
||||
INFO_LOG() << nmeaHost << " port: " << nmeaPort;
|
||||
INFO_LOG(m_logger) << "Connecting,..";
|
||||
INFO_LOG(m_logger) << nmeaHost << " port: " << nmeaPort;
|
||||
//socket->connectToHost(QHostAddress::LocalHost, nmeaPort);
|
||||
//socket->connectToHost(nmeaHost, nmeaPort);
|
||||
reconnect();
|
||||
@@ -54,12 +54,12 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
|
||||
void SocketHandler::reconnect()
|
||||
{
|
||||
INFO_LOG() << "Connecting,.." << " host = " << m_nmeaHost
|
||||
INFO_LOG(m_logger) << "Connecting,.." << " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;;
|
||||
|
||||
if(!socket->bind(m_nmeaPort, QAbstractSocket::BindFlag::ShareAddress))
|
||||
{
|
||||
ERROR_LOG() << "Error from Socket: " << socket->errorString();
|
||||
ERROR_LOG(m_logger) << "Error from Socket: " << socket->errorString();
|
||||
m_reconnectTimer->start(10000);
|
||||
}
|
||||
|
||||
@@ -69,24 +69,24 @@ void SocketHandler::connected()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
|
||||
INFO_LOG() << "Connected!";
|
||||
INFO_LOG(m_logger) << "Connected!";
|
||||
}
|
||||
|
||||
|
||||
void SocketHandler::disconnected()
|
||||
{
|
||||
INFO_LOG() << "Disconnected!";
|
||||
INFO_LOG(m_logger) << "Disconnected!";
|
||||
}
|
||||
|
||||
void SocketHandler::bytesWritten(qint64 bytes)
|
||||
{
|
||||
TRACE_LOG() << "We wrote: " << bytes;
|
||||
TRACE_LOG(m_logger) << "We wrote: " << bytes;
|
||||
}
|
||||
|
||||
void SocketHandler::reconnectTimerSlot()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
INFO_LOG() << "Reconnect NMEA-Socket "
|
||||
INFO_LOG(m_logger) << "Reconnect NMEA-Socket "
|
||||
<< " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;
|
||||
reconnect();
|
||||
@@ -96,7 +96,7 @@ void SocketHandler::reconnectTimerSlot()
|
||||
void SocketHandler::readyRead()
|
||||
{
|
||||
bool hasData = true;
|
||||
INFO_LOG() << "Reading...";
|
||||
INFO_LOG(m_logger) << "Reading...";
|
||||
// QByteArray ba = socket->readDatagram();
|
||||
|
||||
QByteArray ba;
|
||||
@@ -106,18 +106,18 @@ void SocketHandler::readyRead()
|
||||
|
||||
ba.resize(int(socket->pendingDatagramSize()));
|
||||
socket->readDatagram(ba.data(), ba.size());
|
||||
INFO_LOG() << ba;
|
||||
INFO_LOG(m_logger) << ba;
|
||||
QByteArray nmeaDataBa = ba; // ba.mid(startNmeaData, endNmeaData);
|
||||
std::string nmeaDataStd = nmeaDataBa.toStdString() ;
|
||||
QString nmeaData = QString::fromLocal8Bit(nmeaDataStd.c_str());
|
||||
|
||||
|
||||
INFO_LOG() << "nmeaDecoder :" << nmeaData;
|
||||
INFO_LOG(m_logger) << "nmeaDecoder :" << nmeaData;
|
||||
//ba = ba.mid(endNmeaData, ba.length());
|
||||
m_nmeaHandler->decode(nmeaData);
|
||||
|
||||
INFO_LOG() << "NMEA-Data=" << nmeaData;
|
||||
INFO_LOG() << "NMEA-Data ba=" << ba;
|
||||
INFO_LOG(m_logger) << "NMEA-Data=" << nmeaData;
|
||||
INFO_LOG(m_logger) << "NMEA-Data ba=" << ba;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ void SocketHandler::onTurnRadioMasterOffRequest(const rti::core::SampleIdentity
|
||||
|
||||
Core::FunctionReplyObject reply;
|
||||
if (reply.error())
|
||||
WARNING_LOG() << "onTurnRadioMasterOffReply: " << reply();
|
||||
WARNING_LOG(m_logger) << "onTurnRadioMasterOffReply: " << reply();
|
||||
|
||||
m_ddsHandler->fts()->turnRadioMasterOffReply(cookie, reply);
|
||||
|
||||
|
||||
Reference in new issue
Block a user