diff --git a/Modules/CommandPad/commandpadmodule.cpp b/Modules/CommandPad/commandpadmodule.cpp index 80566dcffc537e9b2eff1891e54db2e9e9d15975..531c48189c8ef14a77175dd777b0576560f491d3 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 561f33b46cfbeba3a0cc231338334661922185de..7f3283d0b75e1f4220efbc9fc52b313fd7db2081 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 4815133a6eb3c0098b93f24d1dee4e5678ccccea..f62621cb18facc43c19d1281e68e50c8d4cc2c19 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 f0b4285ffc1f8176a4a2f15f512a8476ad779aac..bfc4a996bed55463fd028e59f4d76ad52de6f2c2 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 e060e44e6022e390f581181076b75bd76f367209..66fb92c6beac15e76b651193140cafebc9fde8a8 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 5c131144431eee8983c10ed9917a77c47a33e348..7b432873183694cb6a44757ee137c3718cbe9bfe 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 9d4359699f31f3edca9fa3cfc4bf4d6166e3791c..a7f93eef6c42f654c7fdafa1f41584ab261718ee 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 f0ffb8befa8acb04c535fd7818cc7c6c4fde392c..c86aea08eedf65a3b1b00c1d594ee24df6ae6b05 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>