fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
@@ -14,8 +14,8 @@ namespace WirelessLocationSystem
|
||||
{
|
||||
|
||||
DdsHandler::DdsHandler(int domainId, int exerciseId)
|
||||
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId))
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
: m_logger(getLogger("DdsHandler"))
|
||||
, m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ bool sendBinarySfmData(const QByteArray &ba, int sendCounter)
|
||||
|
||||
if (!WlsParticipant::calcChunkCountAndLen(ba, chunkCount, chunkLen))
|
||||
{
|
||||
fprintf(stderr, "Chunk count is not ok - data size: %d\n", ba.size());
|
||||
fprintf(stderr, "Chunk count is not ok - data size: %d\n", (int)ba.size());
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ bool sendBinarySfmData(const QByteArray &ba, int sendCounter)
|
||||
SfmMsgTetra_rx rx;
|
||||
rx.setPayload(tx.getPayload());
|
||||
fprintf(stdout, "Output: len: %d(%d), %s, sendCounter: %d(0x%02x), is fragmented: %d, fragment: %d/%d\n",
|
||||
payload.size(), tx.getPayload().size(), payload.data(),
|
||||
(int)payload.size(), (int)tx.getPayload().size(), payload.data(),
|
||||
rx.sendCounter(), rx.sendCounter(), rx.isFragmented(), rx.fragmentNumber(), rx.fragmentCount());
|
||||
|
||||
++sendCounter;
|
||||
@@ -75,12 +75,12 @@ static int checkData(const QByteArray &data)
|
||||
try
|
||||
{
|
||||
const auto msg = LtsUtils::byteStreamToSfmMessage(ba);
|
||||
fprintf(stdout, "Message payload: len: %d, %s\n", msg.payload().size(), msg.payload().toHex().data());
|
||||
fprintf(stdout, "Message payload: len: %d, %s\n", (int)msg.payload().size(), msg.payload().toHex().data());
|
||||
if (msg.id() == int(SfmMessage::MsgId::TetraMessage))
|
||||
{
|
||||
WirelessLocationSystem::SfmMsgTetra_rx rx;
|
||||
rx.setPayload(msg.payload());
|
||||
fprintf(stdout, "SfmMsgTetra payload: len: %d, %s, ", rx.payload().size(), rx.payload().toHex().data());
|
||||
fprintf(stdout, "SfmMsgTetra payload: len: %d, %s, ", (int)rx.payload().size(), rx.payload().toHex().data());
|
||||
fprintf(stdout, "sendCounter: %d(0x%02x), is fragmented: %d, fragment: %d/%d\n",
|
||||
rx.sendCounter(), rx.sendCounter(), rx.isFragmented(), rx.fragmentNumber(), rx.fragmentCount());
|
||||
sendBinarySfmData(rx.payload(), 0x02);
|
||||
|
||||
@@ -15,8 +15,8 @@ namespace WirelessLocationSystem
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(nullptr)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
, m_ddsHandler(nullptr)
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
|
||||
+2
-2
@@ -24,9 +24,9 @@ namespace WirelessLocationSystem
|
||||
const char *exerciseIdProperty = "exerciseId";
|
||||
|
||||
WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
|
||||
, m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint())),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
, m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint())) {}
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
{}
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@ static constexpr int s_maxWlsRetryCount = 3;
|
||||
namespace WirelessLocationSystem
|
||||
{
|
||||
WlsParticipant::WlsParticipant(QObject *parent) : QObject(parent)
|
||||
, m_wlsTeleTimeoutTimer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, m_wlsTeleTimeoutTimer(new QTimer(this)) {
|
||||
m_wlsTeleTimeoutTimer->setSingleShot(true);
|
||||
m_wlsTeleTimeoutTimer->setTimerType(Qt::VeryCoarseTimer);
|
||||
m_wlsTeleTimeoutTimer->setInterval(s_dataCommunicationAliveTimeout);
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
namespace WirelessLocationSystem
|
||||
{
|
||||
WlsParticipantHandler::WlsParticipantHandler(QObject *parent) : QObject(parent)
|
||||
, m_gpsOnOffTimeoutTimer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, m_gpsOnOffTimeoutTimer(new QTimer(this)) {
|
||||
connect(m_gpsOnOffTimeoutTimer, &QTimer::timeout, this, &WlsParticipantHandler::onGpsOnOffTimeoutTimer);
|
||||
m_gpsOnOffTimeoutTimer->setSingleShot(false);
|
||||
m_gpsOnOffTimeoutTimer->start(1000);
|
||||
|
||||
Reference in new issue
Block a user