From 3fc696e676b4ecbd8d84b695beb8e81406615054 Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <nidasioalberto@gmail.com>
Date: Fri, 4 Oct 2024 17:16:39 +0200
Subject: [PATCH] [OutgoingMessageViewer] Fixed ACK, NACK and WACK
---
.../OutgoingMessagesViewerModule.cpp | 6 +++---
src/shared/Modules/SkywardHubStrings.h | 9 +++------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
index 82798be7..29f438a9 100644
--- a/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
+++ b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
@@ -228,7 +228,7 @@ void OutgoingMessagesViewerModule::handleAck(const Message& ack)
{
if (table->rowCount() > i)
{
- table->item(i, 1)->setBackground(QBrush(QColor(0, 255, 0)));
+ table->item(i, 2)->setBackground(QBrush(QColor(0, 255, 0)));
}
}
}
@@ -246,7 +246,7 @@ void OutgoingMessagesViewerModule::handleNack(const Message& nack)
{
if (table->rowCount() > i)
{
- table->item(i, 1)->setBackground(QBrush(QColor(255, 0, 0)));
+ table->item(i, 2)->setBackground(QBrush(QColor(255, 0, 0)));
}
}
}
@@ -264,7 +264,7 @@ void OutgoingMessagesViewerModule::handleWack(const Message& nack)
{
if (table->rowCount() > i)
{
- table->item(i, 1)->setBackground(QBrush(QColor(255, 255, 255)));
+ table->item(i, 1)->setBackground(QBrush(QColor(255, 255, 0)));
}
}
}
diff --git a/src/shared/Modules/SkywardHubStrings.h b/src/shared/Modules/SkywardHubStrings.h
index 1742e907..d1e35ffb 100644
--- a/src/shared/Modules/SkywardHubStrings.h
+++ b/src/shared/Modules/SkywardHubStrings.h
@@ -70,12 +70,9 @@ static const QString mavlink_initial_coordinates_tc_latitude_name = "latitude";
static const QString mavlink_initial_coordinates_tc_longitude_name =
"longitude";
-static const QString mavlink_received_msg_ACK_topic =
- mavlink_received_msg_topic + "/ACK_TM";
-static const QString mavlink_received_msg_NACK_topic =
- mavlink_received_msg_topic + "/NACK_TM";
-static const QString mavlink_received_msg_WACK_topic =
- mavlink_received_msg_topic + "/WACK_TM";
+static const QString mavlink_received_msg_ACK_topic = "*/In/ACK_TM";
+static const QString mavlink_received_msg_NACK_topic = "*/In/NACK_TM";
+static const QString mavlink_received_msg_WACK_topic = "*/In/WACK_TM";
static const QString mavlink_system_id_name = "system_id";
static const QString mavlink_component_id_name = "component_id";
--
GitLab