diff --git a/groundStation/gui/MicroCART/main.o b/groundStation/gui/MicroCART/main.o deleted file mode 100644 index 767107db444ece37a4d56aad6d9d10efca2043cd..0000000000000000000000000000000000000000 Binary files a/groundStation/gui/MicroCART/main.o and /dev/null differ diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp index d5cec6ce48fe0faa1308683dc46888b9497f502f..28846792e8ea260db53deaa2a83f160fd1fc7287 100644 --- a/groundStation/gui/MicroCART/mainwindow.cpp +++ b/groundStation/gui/MicroCART/mainwindow.cpp @@ -261,7 +261,6 @@ void MainWindow::newNodes(QStringList blocks) this->ui->noGraphWarningLine->setVisible(false); } - void MainWindow::newConstantBlocks(QStringList blocks) { ui->xSetpointSelect->clear(); @@ -539,7 +538,9 @@ void MainWindow::on_pbSaveWaypoints_clicked() void MainWindow::on_pbLoadWaypoints_clicked() { - QString openPath = QFileDialog::getOpenFileName(this); + + QString filter = "Waypoints (*.wpt)"; + QString openPath = QFileDialog::getOpenFileName(this, tr("Open Waypoint File"), QString(),filter); if (!openPath.isEmpty()) { QFile f(openPath); @@ -590,5 +591,5 @@ void MainWindow::on_posattSrcVrpn_clicked() void MainWindow::on_posattSrcQuad_clicked() { - trackerTimer->setInterval(500); + trackerTimer->setInterval(750); } diff --git a/groundStation/gui/MicroCART/mainwindow.o b/groundStation/gui/MicroCART/mainwindow.o deleted file mode 100644 index 985ac913b4e916fffcc7636ae78997bb9533cbb3..0000000000000000000000000000000000000000 Binary files a/groundStation/gui/MicroCART/mainwindow.o and /dev/null differ diff --git a/groundStation/gui/MicroCART/qFlightInstruments.o b/groundStation/gui/MicroCART/qFlightInstruments.o deleted file mode 100644 index 72a0edc52d0931ab8d33781a4c0b2ba0e84619b9..0000000000000000000000000000000000000000 Binary files a/groundStation/gui/MicroCART/qFlightInstruments.o and /dev/null differ diff --git a/groundStation/scripts/touch_down.sh b/groundStation/scripts/touch_down.sh index ff4eb129c7de842334db000ee87dffb7a55cf60f..2fd464237f6f47cf80b4f9d92d86c0039abb158b 100755 --- a/groundStation/scripts/touch_down.sh +++ b/groundStation/scripts/touch_down.sh @@ -1,6 +1,6 @@ #! /bin/bash -cut_off="-0.17" +cut_off="-0.20" regex='[+-]?[0-9]+\.?[0-9]*$'