From cc59e6df8bb97f9a09804986b9350ea279b27cec Mon Sep 17 00:00:00 2001
From: Pos <pierpaolo.mancini@mail.polimi.it>
Date: Tue, 20 Jul 2021 21:49:47 +0200
Subject: [PATCH] Small fix
---
Modules/CommandPad/commandpadmodule.cpp | 12 ++++++++
Modules/CommandPad/commandpadmodule.h | 2 ++
Modules/CommandPad/commandpadmodule.ui | 30 ++++++--------------
Modules/Mavlink/mavlink_skyward_lib | 2 +-
Modules/MessageViewer/messagesviewermodule.h | 2 +-
Modules/skywardhubstrings.cpp | 3 +-
Modules/skywardhubstrings.h | 1 +
SkywardHub.pro.user | 2 +-
8 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/Modules/CommandPad/commandpadmodule.cpp b/Modules/CommandPad/commandpadmodule.cpp
index 80566dcf..531c4818 100644
--- a/Modules/CommandPad/commandpadmodule.cpp
+++ b/Modules/CommandPad/commandpadmodule.cpp
@@ -62,6 +62,8 @@ void CommandPadModule::buildUI()
connect(ui->noseconeOpen_button, &QPushButton::clicked, this, &CommandPadModule::onNoseconeOpenClicked);
connect(ui->endMission_button, &QPushButton::clicked, this, &CommandPadModule::onEndMissionClicked);
connect(ui->rawEventSend_button, &QPushButton::clicked, this, &CommandPadModule::onRawEventSendClicked);
+ connect(ui->calibrateAlgos_button, &QPushButton::clicked, this, &CommandPadModule::onCalibrateALGOSClicked);
+ connect(ui->calibrateSensors_button, &QPushButton::clicked, this, &CommandPadModule::onCalibrateSENSORSClicked);
connect(ui->cutDrogue_button, &QPushButton::clicked, this, &CommandPadModule::onCutDrogueClicked);
connect(ui->primaryCut_button, &QPushButton::clicked, this, &CommandPadModule::onPrimaryCutClicked);
@@ -187,6 +189,16 @@ void CommandPadModule::onBoardResetClicked()
send(createCommandMsg("MAV_CMD_BOARD_RESET"));
}
+void CommandPadModule::onCalibrateALGOSClicked()
+{
+ send(createCommandMsg("MAV_CMD_CALIBRATE_ALGOS"));
+}
+
+void CommandPadModule::onCalibrateSENSORSClicked()
+{
+ send(createCommandMsg("MAV_CMD_CALIBRATE_SENSORS"));
+}
+
void CommandPadModule::onTestAerobrakesClicked()
{
send(createCommandMsg("MAV_CMD_TEST_AEROBRAKES"));
diff --git a/Modules/CommandPad/commandpadmodule.h b/Modules/CommandPad/commandpadmodule.h
index 561f33b4..7f3283d0 100644
--- a/Modules/CommandPad/commandpadmodule.h
+++ b/Modules/CommandPad/commandpadmodule.h
@@ -38,6 +38,8 @@ protected:
void onTestModeClicked();
void onTestBackupCutClicked();
void onBoardResetClicked();
+ void onCalibrateALGOSClicked();
+ void onCalibrateSENSORSClicked();
void onTestAerobrakesClicked();
void onDisableAerobrakesClicked();
void onDeploymentAltitudeSetClicked();
diff --git a/Modules/CommandPad/commandpadmodule.ui b/Modules/CommandPad/commandpadmodule.ui
index 4815133a..f62621cb 100644
--- a/Modules/CommandPad/commandpadmodule.ui
+++ b/Modules/CommandPad/commandpadmodule.ui
@@ -402,19 +402,13 @@
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <widget class="QPushButton" name="calibrateSensors_button">
+ <property name="text">
+ <string>SENSORS</string>
</property>
- </spacer>
+ </widget>
</item>
<item>
<widget class="QPushButton" name="initialOrientationSet_pushButton">
@@ -424,17 +418,11 @@
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <widget class="QPushButton" name="calibrateAlgos_button">
+ <property name="text">
+ <string>ALGOS</string>
</property>
- </spacer>
+ </widget>
</item>
</layout>
</item>
diff --git a/Modules/Mavlink/mavlink_skyward_lib b/Modules/Mavlink/mavlink_skyward_lib
index f0b4285f..bfc4a996 160000
--- a/Modules/Mavlink/mavlink_skyward_lib
+++ b/Modules/Mavlink/mavlink_skyward_lib
@@ -1 +1 @@
-Subproject commit f0b4285ffc1f8176a4a2f15f512a8476ad779aac
+Subproject commit bfc4a996bed55463fd028e59f4d76ad52de6f2c2
diff --git a/Modules/MessageViewer/messagesviewermodule.h b/Modules/MessageViewer/messagesviewermodule.h
index e060e44e..66fb92c6 100644
--- a/Modules/MessageViewer/messagesviewermodule.h
+++ b/Modules/MessageViewer/messagesviewermodule.h
@@ -53,7 +53,7 @@ protected:
private:
Ui::MessagesViewerModule *ui;
QList<MessageLog> messages;
- QString ackTopic = "ACK";
+ QString ackTopic = SkywardHubStrings::mavlink_received_msg_ACK_topic;
int maxSize = 10;
};
diff --git a/Modules/skywardhubstrings.cpp b/Modules/skywardhubstrings.cpp
index 5c131144..7b432873 100644
--- a/Modules/skywardhubstrings.cpp
+++ b/Modules/skywardhubstrings.cpp
@@ -40,7 +40,8 @@ const QString SkywardHubStrings::mavlink_orientation_tc_roll_name = "roll";
const QString SkywardHubStrings::msgIdField = "id";
const QString SkywardHubStrings::msgSequenceNumberField = "sequenceNumber";
const QString SkywardHubStrings::mavlink_quality_link_topic = "MavlinkLinkQuality";
-const QString SkywardHubStrings::mavlink_received_msg_topic = "MavlinkMessages";
+const QString SkywardHubStrings::mavlink_received_msg_topic = "Mav";
+const QString SkywardHubStrings::mavlink_received_msg_ACK_topic = mavlink_received_msg_topic + "/ACK_TM";
SkywardHubStrings::SkywardHubStrings()
diff --git a/Modules/skywardhubstrings.h b/Modules/skywardhubstrings.h
index 9d435969..a7f93eef 100644
--- a/Modules/skywardhubstrings.h
+++ b/Modules/skywardhubstrings.h
@@ -49,6 +49,7 @@ public:
static const QString mavlink_quality_link_topic;
static const QString mavlink_received_msg_topic;
+ static const QString mavlink_received_msg_ACK_topic;
};
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index f0ffb8be..c86aea08 100644
--- a/SkywardHub.pro.user
+++ b/SkywardHub.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2021-07-14T18:16:08. -->
+<!-- Written by QtCreator 4.14.2, 2021-07-20T21:19:28. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
--
GitLab