From 2976676c05794966ac86692db6ad971aab99054a Mon Sep 17 00:00:00 2001
From: Giacomo Caironi <giacomo.caironi@skywarder.eu>
Date: Wed, 14 Jun 2023 23:47:48 +0200
Subject: [PATCH] [CI] Fixed cppcheck warnings and code formatting
---
CMakeLists.txt | 1 +
.../Modules/RefuelingButton/RefuelingButton.cpp | 5 +++--
.../RefuelingVisualizer/RefuelingVisualizer.cpp | 13 +++++++------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99fc298a..1d1628e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,7 @@ add_executable(groundstation
src/shared/Modules/OrientationVisualizer/OrientationVisualizer.cpp
src/shared/Modules/MainStateViewer/MainStateViewer.cpp
src/shared/Modules/PayloadStateViewer/PayloadStateViewer.cpp
+ src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
src/shared/Modules/RefuelingButton/RefuelingButton.cpp
src/shared/Modules/RefuelingButton/MessageFormElementRefButton.cpp
src/shared/Modules/Tabs/TabsModule.cpp
diff --git a/src/shared/Modules/RefuelingButton/RefuelingButton.cpp b/src/shared/Modules/RefuelingButton/RefuelingButton.cpp
index 2a5583e5..165e5285 100644
--- a/src/shared/Modules/RefuelingButton/RefuelingButton.cpp
+++ b/src/shared/Modules/RefuelingButton/RefuelingButton.cpp
@@ -242,8 +242,9 @@ void RefuelingButton::setupUi()
// Once the message is created we can fill the fields
// according to the struct defined before
- mavlink_message_info_t infos[256] = MAVLINK_MESSAGE_INFO;
- mavlink_message_info_t info = infos[msg.msgid];
+ static const mavlink_message_info_t infos[256] =
+ MAVLINK_MESSAGE_INFO;
+ mavlink_message_info_t info = infos[msg.msgid];
QMap<QString, Field> fields;
for (unsigned int i = 0; i < info.num_fields; i++)
diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
index 0bf656bf..6e526e9f 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
@@ -21,6 +21,7 @@
#include <Components/FilterSelector/FilterSelector.h>
#include <Core/MessageBroker/MessageBroker.h>
+#include <QDebug>
#include <QElapsedTimer>
RefuelingVisualizer::RefuelingVisualizer(QWidget* parent)
@@ -37,7 +38,7 @@ RefuelingVisualizer::RefuelingVisualizer(QWidget* parent)
timer.start();
onMsgReceivedGSE(message);
long long int time = timer.elapsed();
- printf("GSE: %lld\n", time);
+ qDebug() << "GSE" << time;
});
getCore()->getMessageBroker()->subscribe(
@@ -48,16 +49,16 @@ RefuelingVisualizer::RefuelingVisualizer(QWidget* parent)
timer.start();
onMsgReceivedMOT(message);
long long int time = timer.elapsed();
- printf("MOTOR: %lld\n", time);
+ qDebug() << "MOTOR" << time;
});
}
RefuelingVisualizer::~RefuelingVisualizer()
{
getCore()->getMessageBroker()->unsubscribe(Filter::fromString("Mav/GSE_TM"),
- this);
- getCore()->getMessageBroker()->unsubscribe(Filter::fromString("Mav/MOTOR_TM"),
- this);
+ this);
+ getCore()->getMessageBroker()->unsubscribe(
+ Filter::fromString("Mav/MOTOR_TM"), this);
}
QWidget* RefuelingVisualizer::toWidget() { return this; }
@@ -417,7 +418,7 @@ void RefuelingVisualizer::backgroundTabs(Message msg)
"border-image:url(../skywardhub/src/shared/Modules/"
"RefuelingVisualizer/" +
actualValveVec + ".png);border:0px;";
- background->setStyleSheet(newStyle);
+ background->setStyleSheet(newStyle);
}
if (fillingValve != labelStatus[0])
--
GitLab