From 100cf3a4b7fe8f966108d569f33587e95aa2eb90 Mon Sep 17 00:00:00 2001
From: ucart <ucart_groundstation@iastate.edu>
Date: Tue, 25 Apr 2017 23:26:41 -0500
Subject: [PATCH] Yaw working
---
groundStation/gui/MicroCART/mainwindow.cpp | 5 +++--
groundStation/gui/MicroCART/mainwindow.ui | 18 +++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp
index 74b375419..04c334746 100644
--- a/groundStation/gui/MicroCART/mainwindow.cpp
+++ b/groundStation/gui/MicroCART/mainwindow.cpp
@@ -339,8 +339,9 @@ void MainWindow::sendSetpoints()
void MainWindow::on_pbAppendSetpoint_clicked()
{
QString str("[" + ui->xSetpoint->text() + ", "+
- ui->ySetpoint->text() + ", " +
- ui->zSetpoint->text() + "]");
+ ui->ySetpoint->text() + ", " +
+ ui->zSetpoint->text() + ", " +
+ ui->yawSetpoint->text() + "]");
setpointList->appendRow(new QStandardItem(str));
}
diff --git a/groundStation/gui/MicroCART/mainwindow.ui b/groundStation/gui/MicroCART/mainwindow.ui
index 097552bfb..4412aa3c3 100644
--- a/groundStation/gui/MicroCART/mainwindow.ui
+++ b/groundStation/gui/MicroCART/mainwindow.ui
@@ -154,7 +154,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>968</width>
+ <width>962</width>
<height>577</height>
</rect>
</property>
@@ -1024,6 +1024,13 @@
</item>
</layout>
</item>
+ <item>
+ <widget class="Line" name="line_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="QCheckBox" name="autonavEnabled">
<property name="text">
@@ -1081,13 +1088,6 @@
</item>
</layout>
</item>
- <item>
- <widget class="Line" name="line_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
@@ -1128,7 +1128,7 @@
<x>0</x>
<y>0</y>
<width>1004</width>
- <height>30</height>
+ <height>27</height>
</rect>
</property>
</widget>
--
GitLab