diff --git a/Modules/CommandPad/commandpadmodule.cpp b/Modules/CommandPad/commandpadmodule.cpp
index 531c48189c8ef14a77175dd777b0576560f491d3..243165cfb863bd7ee8d1dae4dc9ae84f5194f544 100644
--- a/Modules/CommandPad/commandpadmodule.cpp
+++ b/Modules/CommandPad/commandpadmodule.cpp
@@ -36,9 +36,6 @@ void CommandPadModule::fromXmlObject(const XmlObject &xmlObject)
void CommandPadModule::buildUI()
{
- ui->toggle_button_layout->insertWidget(0, &logToggleButton);
- connect(&logToggleButton, &ToggleButton::toggled, this, &CommandPadModule::onLogButtonToggled);
-
connect(ui->closeLog_button, &QPushButton::clicked, this, &CommandPadModule::onCloseLogClicked);
connect(ui->wiggleARBServo_button, &QPushButton::clicked, this, &CommandPadModule::onWiggleARBServoClicked);
connect(ui->resetARBServo_button, &QPushButton::clicked, this, &CommandPadModule::onResetARBServoClicked);
@@ -64,6 +61,7 @@ void CommandPadModule::buildUI()
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->startLog_button, &QPushButton::clicked, this, &CommandPadModule::onStartLogClicked);
connect(ui->cutDrogue_button, &QPushButton::clicked, this, &CommandPadModule::onCutDrogueClicked);
connect(ui->primaryCut_button, &QPushButton::clicked, this, &CommandPadModule::onPrimaryCutClicked);
@@ -132,16 +130,17 @@ void CommandPadModule::send(const ModuleMessage &msg)
}
-void CommandPadModule::onLogButtonToggled(bool val)
+void CommandPadModule::onStartLogClicked()
{
- if(val){
- // Start logging
- send(createCommandMsg("MAV_CMD_START_LOGGING"));
- }
- else{
- // Stop logging
- send(createCommandMsg("MAV_CMD_STOP_LOGGING"));
- }
+ send(createCommandMsg("MAV_CMD_START_LOGGING"));
+// if(val){
+// // Start logging
+// send(createCommandMsg("MAV_CMD_START_LOGGING"));
+// }
+// else{
+// // Stop logging
+// send(createCommandMsg("MAV_CMD_STOP_LOGGING"));
+// }
}
void CommandPadModule::onCloseLogClicked()
diff --git a/Modules/CommandPad/commandpadmodule.h b/Modules/CommandPad/commandpadmodule.h
index 7f3283d0b75e1f4220efbc9fc52b313fd7db2081..c154aef1f77af96ae19378b6d43fc93be1acd7ca 100644
--- a/Modules/CommandPad/commandpadmodule.h
+++ b/Modules/CommandPad/commandpadmodule.h
@@ -2,7 +2,6 @@
#define COMMANDPADMODULE_H
#include "Core/modulemessage.h"
-#include "Modules/Utility/togglebutton.h"
#include "Modules/DefaultModule/defaultmodule.h"
namespace Ui {
@@ -28,7 +27,7 @@ protected:
ModuleMessage createRawEventMsg(const QString &msgKey, int event_id, int topic_id) const;
void send(const ModuleMessage &msg);
- void onLogButtonToggled(bool val);
+ void onStartLogClicked();
void onCloseLogClicked();
void onWiggleARBServoClicked();
void onResetARBServoClicked();
@@ -60,8 +59,6 @@ protected:
private:
Ui::CommandPadModule *ui;
-
- ToggleButton logToggleButton;
};
#endif // COMMANDPADMODULE_H
diff --git a/Modules/CommandPad/commandpadmodule.ui b/Modules/CommandPad/commandpadmodule.ui
index 22df552507e82400f9cef6d186a5c3087f5bee24..9730447c1935d7689dd968910072cc2f66ade627 100644
--- a/Modules/CommandPad/commandpadmodule.ui
+++ b/Modules/CommandPad/commandpadmodule.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>457</width>
+ <width>509</width>
<height>980</height>
</rect>
</property>
@@ -27,11 +27,11 @@
<rect>
<x>0</x>
<y>0</y>
- <width>435</width>
- <height>958</height>
+ <width>472</width>
+ <height>992</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,1,1,1,3,1,1,1">
+ <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1,1,1,1,3,1,1,1">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -88,82 +88,95 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_4">
- <property name="title">
- <string>Log</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <layout class="QHBoxLayout" name="toggle_button_layout">
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <item>
+ <widget class="QGroupBox" name="groupBox_10">
+ <property name="title">
+ <string>Log</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
- <widget class="QLabel" name="label_4">
+ <widget class="QPushButton" name="startLog_button">
<property name="text">
- <string>Start/Stop</string>
+ <string>START</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <widget class="QPushButton" name="closeLog_button">
+ <property name="text">
+ <string>CLOSE</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_7">
+ <property name="title">
+ <string>Deployment</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QPushButton" name="wiggleDPLServo_button">
+ <property name="text">
+ <string>WIGGLE DPL SERVO</string>
</property>
- </spacer>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QPushButton" name="resetDPLServo_button">
+ <property name="text">
+ <string>RESET DPL SERVO</string>
+ </property>
+ </widget>
</item>
</layout>
- </item>
- <item>
- <widget class="QPushButton" name="closeLog_button">
- <property name="text">
- <string>CLOSE LOG</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_7">
+ <widget class="QGroupBox" name="groupBox_4">
<property name="title">
- <string>Deployment</string>
+ <string>Testing</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="1">
- <widget class="QPushButton" name="boardReset_button">
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="3">
+ <widget class="QPushButton" name="testMode_button">
<property name="text">
- <string>BOARD RESET</string>
+ <string>TEST MODE</string>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QPushButton" name="resetDPLServo_button">
+ <item row="0" column="2">
+ <widget class="QPushButton" name="stopTelemetry_button">
<property name="text">
- <string>RESET DPL SERVO</string>
+ <string>STOP TELEMETRY</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QPushButton" name="wiggleDPLServo_button">
+ <item row="1" column="3">
+ <widget class="QPushButton" name="startTelemetry_button">
<property name="text">
- <string>WIGGLE DPL SERVO</string>
+ <string>START TELEMETRY</string>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QPushButton" name="testMode_button">
+ <item row="1" column="2">
+ <widget class="QPushButton" name="boardReset_button">
<property name="text">
- <string>TEST MODE</string>
+ <string>BOARD RESET</string>
</property>
</widget>
</item>
@@ -171,39 +184,39 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_9">
+ <widget class="QGroupBox" name="groupBox_5">
<property name="title">
- <string>Cutter</string>
+ <string>Aerobrakes</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="0">
- <widget class="QPushButton" name="testBackupCut_button">
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="3" column="2">
+ <widget class="QPushButton" name="disableAerobrakes_button">
<property name="text">
- <string>TEST BACKUP CUT</string>
+ <string>Disable</string>
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QPushButton" name="testPrimaryCut_button">
+ <item row="0" column="2">
+ <widget class="QPushButton" name="testAerobrakest_button">
<property name="text">
- <string>TEST PRIMARY CUT</string>
+ <string>TEST</string>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QPushButton" name="primaryCut_button">
+ <item row="0" column="3">
+ <widget class="QPushButton" name="wiggleARBServo_button">
<property name="text">
- <string>CUT PRIMARY</string>
+ <string>WIGGLE ARB SERVO</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QPushButton" name="backupCut_button">
+ <item row="3" column="3">
+ <widget class="QPushButton" name="resetARBServo_button">
<property name="text">
- <string>CUT BACKUP</string>
+ <string>RESET ARB SERVO</string>
</property>
</widget>
</item>
@@ -211,39 +224,39 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_5">
+ <widget class="QGroupBox" name="groupBox_9">
<property name="title">
- <string>Aerobrakes</string>
+ <string>Cutter</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
- <widget class="QPushButton" name="testAerobrakest_button">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="5" column="1">
+ <widget class="QPushButton" name="backupCut_button">
<property name="text">
- <string>TEST</string>
+ <string>CUT BACKUP</string>
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QPushButton" name="wiggleARBServo_button">
+ <item row="2" column="1">
+ <widget class="QPushButton" name="testBackupCut_button">
<property name="text">
- <string>WIGGLE ARB SERVO</string>
+ <string>TEST BACKUP CUT</string>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QPushButton" name="disableAerobrakes_button">
+ <item row="2" column="0">
+ <widget class="QPushButton" name="testPrimaryCut_button">
<property name="text">
- <string>Disable</string>
+ <string>TEST PRIMARY CUT</string>
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QPushButton" name="resetARBServo_button">
+ <item row="5" column="0">
+ <widget class="QPushButton" name="primaryCut_button">
<property name="text">
- <string>RESET ARB SERVO</string>
+ <string>CUT PRIMARY</string>
</property>
</widget>
</item>
@@ -534,13 +547,6 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QPushButton" name="forceLaunch_button">
- <property name="text">
- <string>FORCE LAUNCH</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -606,8 +612,8 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="0">
- <widget class="QPushButton" name="endMission_button">
+ <item row="3" column="1">
+ <widget class="QPushButton" name="cutDrogue_button">
<property name="minimumSize">
<size>
<width>20</width>
@@ -615,11 +621,11 @@
</size>
</property>
<property name="text">
- <string>END MISSION</string>
+ <string>CUT DROGUE</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="3" column="0">
<widget class="QPushButton" name="noseconeOpen_button">
<property name="minimumSize">
<size>
@@ -632,8 +638,8 @@
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QPushButton" name="cutDrogue_button">
+ <item row="1" column="0">
+ <widget class="QPushButton" name="endMission_button">
<property name="minimumSize">
<size>
<width>20</width>
@@ -641,7 +647,20 @@
</size>
</property>
<property name="text">
- <string>CUT DROGUE</string>
+ <string>END MISSION</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="forceLaunch_button">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>FORCE LAUNCH</string>
</property>
</widget>
</item>
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index 50d9fc9941b2b0183a8fe5b96a64bb838e6fd46b..545ea93a6e0d53feb266adfcc0e10d777c24893f 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-28T17:18:26. -->
+<!-- Written by QtCreator 4.14.2, 2021-07-28T20:19:49. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>