diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index aeb4612ccc40739fcd4c1e6b856eb05483b6ef4a..fd0a106ca724526bda5e447935f1cfc7531c5efc 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -124,7 +124,6 @@ HEADERS += src/MG.h \ src/ui/ObjectDetectionView.h \ src/input/JoystickInput.h \ src/ui/JoystickWidget.h \ - src/ui/PFD.h \ src/ui/DebugConsole.h \ src/ui/MapWidget.h \ src/ui/XMLCommProtocolWidget.h \ @@ -185,7 +184,6 @@ SOURCES += src/main.cc \ src/ui/ObjectDetectionView.cc \ src/input/JoystickInput.cc \ src/ui/JoystickWidget.cc \ - src/ui/PFD.cc \ src/ui/DebugConsole.cc \ src/ui/MapWidget.cc \ src/ui/XMLCommProtocolWidget.cc \ @@ -218,8 +216,9 @@ SOURCES += src/main.cc \ RESOURCES = mavground.qrc # Include RT-LAB Library -win32 { - LIBS += -LC:\OPAL-RT\RT-LAB7.2.4\Common\bin -lOpalApi +win32 { + LIBS += -LC:\OPAL-RT\RT-LAB7.2.4\Common\bin \ + -lOpalApi INCLUDEPATH += src/lib/opalrt SOURCES += src/comm/OpalLink.cc HEADERS += src/comm/OpalLink.h diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index b08c495404e2c7dc83ad9b608c3884b59eef0baf..987f4b9530552eb1ed2fa083de1426ee63accf49 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -360,7 +360,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) if (alt != alt) { alt = 0; - emit textMessageReceived(uasId, 255, "GCS ERROR: RECEIVED NaN FOR ALTITUDE"); + emit textMessageReceived(uasId, message.compid, 255, "GCS ERROR: RECEIVED NaN FOR ALTITUDE"); } emit valueChanged(uasId, "alt", pos.alt, time); // Smaller than threshold and not NaN @@ -372,7 +372,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) } else { - emit textMessageReceived(uasId, 255, QString("GCS ERROR: RECEIVED INVALID SPEED OF %1 m/s").arg(pos.v)); + emit textMessageReceived(uasId, message.compid, 255, QString("GCS ERROR: RECEIVED INVALID SPEED OF %1 m/s").arg(pos.v)); } emit globalPositionChanged(this, pos.lon, pos.lat, alt, time); } @@ -498,7 +498,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) int severity = mavlink_msg_statustext_get_severity(&message); //qDebug() << "RECEIVED STATUS:" << text;false //emit statusTextReceived(severity, text); - emit textMessageReceived(uasId, severity, text); + emit textMessageReceived(uasId, message.compid, severity, text); } break; default: diff --git a/src/uas/UASInterface.h b/src/uas/UASInterface.h index 0846b89b15a69b37a3e667ac4023731363ed17d2..ea042b9cf6bf464d9a56dd53c00033b21501802e 100644 --- a/src/uas/UASInterface.h +++ b/src/uas/UASInterface.h @@ -228,10 +228,11 @@ signals: * messages like critical errors. * * @param uasid ID of the sending system + * @param compid ID of the sending component * @param text the status text * @param severity The severity of the message, 0 for plain debug messages, 10 for very critical messages */ - void textMessageReceived(int uasid, int severity, QString text); + void textMessageReceived(int uasid, int componentid, int severity, QString text); /** * @brief Update the error count of a device * diff --git a/src/ui/AudioOutputWidget.cc b/src/ui/AudioOutputWidget.cc index 98e74882f4b237412062488c9600998da84da9e9..392daec57171dbc129877aee9df6981061fa9905 100644 --- a/src/ui/AudioOutputWidget.cc +++ b/src/ui/AudioOutputWidget.cc @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Implementation of class AudioOutputWidget + * @author Lorenz Meier + * + */ + #include "AudioOutputWidget.h" #include "ui_AudioOutputWidget.h" diff --git a/src/ui/AudioOutputWidget.h b/src/ui/AudioOutputWidget.h index 2d888ea802ced1131c090d91428f077ad2ce491c..3d89573886927458be4255ebb7b8b2b919f755c7 100644 --- a/src/ui/AudioOutputWidget.h +++ b/src/ui/AudioOutputWidget.h @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Definition of class AudioOutputWidget + * @author Lorenz Meier + * + */ + #ifndef AUDIOOUTPUTWIDGET_H #define AUDIOOUTPUTWIDGET_H @@ -7,7 +37,11 @@ namespace Ui { class AudioOutputWidget; } -class AudioOutputWidget : public QWidget { +/** + * @brief Widget to control audio/volume/mute + */ +class AudioOutputWidget : public QWidget +{ Q_OBJECT public: AudioOutputWidget(QWidget *parent = 0); diff --git a/src/ui/CommConfigurationWindow.h b/src/ui/CommConfigurationWindow.h index ab0e5100b3de9d209bbb23865d69e67cedaba02b..f190aa95694b5457750e901660bdce194e56eef4 100644 --- a/src/ui/CommConfigurationWindow.h +++ b/src/ui/CommConfigurationWindow.h @@ -1,30 +1,29 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit -Please see our website at +QGroundControl Open Source Ground Control Station -(c) 2009 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ /** * @file - * @brief Definition of configuration window for serial links + * @brief Definition of class CommConfigurationWindow * * @author Lorenz Meier * @@ -44,6 +43,9 @@ This file is part of the PIXHAWK project #include "OpalLink.h" #endif +/** + * @brief Configuration window for communication links + */ class CommConfigurationWindow : public QWidget { Q_OBJECT diff --git a/src/ui/DebugConsole.cc b/src/ui/DebugConsole.cc index 2a0199ced1ced456a1fa712f6992b46245551519..4bf1ce965b077a5adf632b28fa7050a65c48b569 100644 --- a/src/ui/DebugConsole.cc +++ b/src/ui/DebugConsole.cc @@ -33,6 +33,7 @@ This file is part of the PIXHAWK project #include "DebugConsole.h" #include "ui_DebugConsole.h" #include "LinkManager.h" +#include "UASManager.h" #include "protocol.h" #include @@ -163,9 +164,13 @@ void DebugConsole::setAutoHold(bool hold) autoHold = hold; } -void DebugConsole::receiveTextMessage(int id, int severity, QString text) +/** + * Prints the message in the UAS color + */ +void DebugConsole::receiveTextMessage(int id, int component, int severity, QString text) { - m_ui->receiveText->appendHtml(QString("(MAV" + QString::number(id) + QString(":") + QString::number(severity) + QString(") ") + text + QString(""))); + Q_UNUSED(severity); + m_ui->receiveText->appendHtml(QString("(MAV%2:%3) %4").arg(UASManager::instance()->getUASForId(id)->getColor().name(), QString::number(id), QString::number(component), text)); } void DebugConsole::updateTrafficMeasurements() diff --git a/src/ui/DebugConsole.h b/src/ui/DebugConsole.h index e423fd524f0d8b5ab60bfb8ada0ae06cae543f25..ffc97c45b7dce72ddb960f438473f7ad76d7d9cf 100644 --- a/src/ui/DebugConsole.h +++ b/src/ui/DebugConsole.h @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ @@ -43,7 +43,14 @@ namespace Ui { class DebugConsole; } -class DebugConsole : public QWidget { +/** + * @brief Shows a debug console + * + * This class shows the raw data stream of each link + * and the debug / text messages sent by all systems + */ +class DebugConsole : public QWidget +{ Q_OBJECT public: DebugConsole(QWidget *parent = 0); @@ -69,7 +76,7 @@ public slots: /** @brief Enable auto-freeze mode if traffic intensity is too high to display */ void setAutoHold(bool hold); /** @brief Receive plain text message to output to the user */ - void receiveTextMessage(int id, int severity, QString text); + void receiveTextMessage(int id, int component, int severity, QString text); protected slots: /** @brief Draw information overlay */ diff --git a/src/ui/HDDisplay.cc b/src/ui/HDDisplay.cc index dd996b640a8452f27c9e7fe7d7c4606027af27b8..68102fd16a81bb1e0272ff04ab0c90445cfb0e1b 100644 --- a/src/ui/HDDisplay.cc +++ b/src/ui/HDDisplay.cc @@ -40,7 +40,7 @@ This file is part of the PIXHAWK project #include HDDisplay::HDDisplay(QStringList* plotList, QWidget *parent) : - QWidget(parent), + QGraphicsView(parent), uas(NULL), values(QMap()), valuesDot(QMap()), @@ -109,6 +109,11 @@ HDDisplay::~HDDisplay() delete m_ui; } +void HDDisplay::enableGLRendering(bool enable) +{ + +} + void HDDisplay::triggerUpdate() { // Only repaint the regions necessary @@ -123,14 +128,10 @@ void HDDisplay::paintEvent(QPaintEvent * event) static quint64 interval = 0; //qDebug() << "INTERVAL:" << MG::TIME::getGroundTimeNow() - interval << __FILE__ << __LINE__; interval = MG::TIME::getGroundTimeNow(); - paintDisplay(); -} - -void HDDisplay::paintGL() -{ + renderOverlay(); } -void HDDisplay::paintDisplay() +void HDDisplay::renderOverlay() { quint64 refreshInterval = 100; quint64 currTime = MG::TIME::getGroundTimeNow(); @@ -148,7 +149,7 @@ void HDDisplay::paintDisplay() double scalingFactorH = this->height()/vheight; if (scalingFactorH < scalingFactor) scalingFactor = scalingFactorH; - QPainter painter(this); + QPainter painter(viewport()); painter.setRenderHint(QPainter::Antialiasing, true); painter.setRenderHint(QPainter::HighQualityAntialiasing, true); painter.fillRect(QRect(0, 0, width(), height()), backgroundColor); diff --git a/src/ui/HDDisplay.h b/src/ui/HDDisplay.h index 4b34a7e8a13ab7e82d4a72c744ec83fc65fc9dee..303ac5c83a472cac4fed1544cb6f8d9f12e7fcda 100644 --- a/src/ui/HDDisplay.h +++ b/src/ui/HDDisplay.h @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ @@ -32,7 +32,7 @@ This file is part of the PIXHAWK project #ifndef HDDISPLAY_H #define HDDISPLAY_H -#include +#include #include #include #include @@ -46,7 +46,16 @@ namespace Ui { class HDDisplay; } -class HDDisplay : public QWidget { +/** + * @brief Head Down Display Widget + * + * This widget is used for any head down display as base widget. It handles the basic widget setup + * each head down instrument has a virtual screen size in millimeters as base coordinate system + * this virtual screen size is then scaled to pixels on the screen. + * When the pixel per millimeter ratio is known, a 1:1 representation is possible on the screen + */ +class HDDisplay : public QGraphicsView +{ Q_OBJECT public: HDDisplay(QStringList* plotList, QWidget *parent = 0); @@ -60,8 +69,9 @@ public slots: void setActiveUAS(UASInterface* uas); protected slots: - void paintGL(); - void paintDisplay(); + void enableGLRendering(bool enable); + //void render(QPainter* painter, const QRectF& target = QRectF(), const QRect& source = QRect(), Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio); + void renderOverlay(); void triggerUpdate(); protected: diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc index 590ddcd9b1e142cb511dfd7fd54f167173d01dac..51761bb8097f743d29458566efbba981fe1025b6 100644 --- a/src/ui/HSIDisplay.cc +++ b/src/ui/HSIDisplay.cc @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ @@ -110,10 +110,10 @@ void HSIDisplay::paintEvent(QPaintEvent * event) static quint64 interval = 0; //qDebug() << "INTERVAL:" << MG::TIME::getGroundTimeNow() - interval << __FILE__ << __LINE__; interval = MG::TIME::getGroundTimeNow(); - paintDisplay(); + renderOverlay(); } -void HSIDisplay::paintDisplay() +void HSIDisplay::renderOverlay() { // Center location of the HSI gauge items @@ -131,7 +131,7 @@ void HSIDisplay::paintDisplay() double scalingFactorH = this->height()/vheight; if (scalingFactorH < scalingFactor) scalingFactor = scalingFactorH; - QPainter painter(this); + QPainter painter(viewport()); painter.setRenderHint(QPainter::Antialiasing, true); painter.setRenderHint(QPainter::HighQualityAntialiasing, true); diff --git a/src/ui/HSIDisplay.h b/src/ui/HSIDisplay.h index 630db5dffaa2033347bf2cee982f6e703bf593bb..f784338dccaa34c1cd3d7f4363832c8a2d381ce9 100644 --- a/src/ui/HSIDisplay.h +++ b/src/ui/HSIDisplay.h @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ @@ -81,7 +81,7 @@ public slots: void pressKey(int key); protected slots: - void paintDisplay(); + void renderOverlay(); void drawGPS(QPainter &painter); void drawObjects(QPainter &painter); void drawPositionDirection(float xRef, float yRef, float radius, const QColor& color, QPainter* painter); @@ -103,6 +103,7 @@ protected slots: void mouseDoubleClickEvent(QMouseEvent* event); protected: + /** @brief Get color from GPS signal-to-noise colormap */ static QColor getColorForSNR(float snr); /** @brief Metric world coordinates to metric body coordinates */ diff --git a/src/ui/HUD.cc b/src/ui/HUD.cc index eddc97f3e0ce2f230d4f46769421987eee346057..5a198a4a5e89957793418ffa03ee31ae6a596309 100644 --- a/src/ui/HUD.cc +++ b/src/ui/HUD.cc @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ diff --git a/src/ui/HUD.h b/src/ui/HUD.h index e599c552072b072be3fb52f8f206aad51e64a9f2..9255ac788e720d6e99e7dc92306f6267cd43ce03 100644 --- a/src/ui/HUD.h +++ b/src/ui/HUD.h @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 8c0e2470157457a7064049567dcf6fd8385b3dcb..4ce9725db610ee00599c55ae913e0c224632e79c 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -391,10 +391,10 @@ void MainWindow::addLink(LinkInterface *link) void MainWindow::UASCreated(UASInterface* uas) { // Connect the UAS to the full user interface - //ui.menuConnected_Systems->addAction(QIcon(":/images/mavs/generic.svg"), tr("View ") + uas->getUASName(), uas, SLOT(setSelected())); + ui.menuConnected_Systems->addAction(QIcon(":/images/mavs/generic.svg"), tr("View ") + uas->getUASName(), uas, SLOT(setSelected())); // FIXME Should be not inside the mainwindow - connect(uas, SIGNAL(textMessageReceived(int,int,QString)), debugConsole, SLOT(receiveTextMessage(int,int,QString))); + connect(uas, SIGNAL(textMessageReceived(int,int,int,QString)), debugConsole, SLOT(receiveTextMessage(int,int,int,QString))); // Health / System status indicator info->addUAS(uas); diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index 79b0a28ecf8e73318f33c2b07cee3c5412d1571e..1ef6f38f9a20f4849e05a7b413d76463d5dce4db 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -1,29 +1,29 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ /** * @file - * @brief Main application window + * @brief Definition of class MainWindow * @author Lorenz Meier * */ @@ -52,7 +52,6 @@ This file is part of the PIXHAWK project #include "AS4Protocol.h" #include "ObjectDetectionView.h" #include "HUD.h" -#include "PFD.h" #include "JoystickWidget.h" #include "input/JoystickInput.h" #include "DebugConsole.h" diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui index e047bd985fbaedc5b8c363ffa50ee1efa84ed660..7cf8485ae1227f81af13b7246d2b22f2a39f3eb6 100644 --- a/src/ui/MainWindow.ui +++ b/src/ui/MainWindow.ui @@ -87,8 +87,14 @@ + + + Connected Systems + + + diff --git a/src/ui/MapWidget.h b/src/ui/MapWidget.h index 21afab5eb17d4bb4be3a81ae0bf6d6b44b68c0b0..360a4df03966c9595b602cecad8bd484cc802f34 100644 --- a/src/ui/MapWidget.h +++ b/src/ui/MapWidget.h @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ @@ -26,7 +26,7 @@ This file is part of the PIXHAWK project * @brief Definition of MapWidget * * @author Lorenz Meier - * @author Mariano Lizzaraga + * @author Mariano Lizaraga * */ diff --git a/src/ui/ObjectDetectionView.h b/src/ui/ObjectDetectionView.h index 57f442996abf22fcd47fabbbd84aa23a20c88db8..d48d0945f872b89d21448589be5dc3defd73ca14 100644 --- a/src/ui/ObjectDetectionView.h +++ b/src/ui/ObjectDetectionView.h @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ diff --git a/src/ui/ParameterInterface.cc b/src/ui/ParameterInterface.cc index 33a63c74033533de57c13a0be191c518b602cb91..f44e08389301787445e07e46c16ab4da9a2b8d34 100644 --- a/src/ui/ParameterInterface.cc +++ b/src/ui/ParameterInterface.cc @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Definition of class ParameterInterface + * @author Lorenz Meier + * + */ + #include #include "ParameterInterface.h" diff --git a/src/ui/ParameterInterface.h b/src/ui/ParameterInterface.h index 84234d5537fb2df104f6467b9cc4b38278491b69..47687901f05163b4032d4b7f4e1f64b6681414f6 100644 --- a/src/ui/ParameterInterface.h +++ b/src/ui/ParameterInterface.h @@ -1,3 +1,34 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Definition of class ParameterInterface + * + * @author Lorenz Meier + * + */ + #ifndef PARAMETERINTERFACE_H #define PARAMETERINTERFACE_H @@ -11,7 +42,13 @@ namespace Ui { class ParameterInterface; } -class ParameterInterface : public QWidget { +/** + * @brief Container class for onboard parameter widgets + * + * @see QGCParamWidget + */ +class ParameterInterface : public QWidget +{ Q_OBJECT public: explicit ParameterInterface(QWidget *parent = 0); diff --git a/src/ui/QGCParamWidget.h b/src/ui/QGCParamWidget.h index 66ca255fc73652291e4d3c229d36fb28f617ed39..cf38850baca1be3986d8eccb17e59643e208c79b 100644 --- a/src/ui/QGCParamWidget.h +++ b/src/ui/QGCParamWidget.h @@ -2,9 +2,7 @@ QGroundControl Open Source Ground Control Station -(c) 2009, 2010 QGROUNDCONTROL/PIXHAWK PROJECT - - +(c) 2009, 2010 QGROUNDCONTROL PROJECT This file is part of the QGROUNDCONTROL project diff --git a/src/ui/QGCPxImuFirmwareUpdate.cc b/src/ui/QGCPxImuFirmwareUpdate.cc index 91a9e3466ef3896d49b25c7716f21b49cae51076..eed713e754b25ac5f13841656d3a796e7fda0ddb 100644 --- a/src/ui/QGCPxImuFirmwareUpdate.cc +++ b/src/ui/QGCPxImuFirmwareUpdate.cc @@ -1,3 +1,26 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + #include "QGCPxImuFirmwareUpdate.h" #include "ui_QGCPxImuFirmwareUpdate.h" diff --git a/src/ui/QGCPxImuFirmwareUpdate.h b/src/ui/QGCPxImuFirmwareUpdate.h index c48ce1763cec72551e02a9ad1edfc52a9340bb85..559b5152e863add535635b53a93b682941a3a9e5 100644 --- a/src/ui/QGCPxImuFirmwareUpdate.h +++ b/src/ui/QGCPxImuFirmwareUpdate.h @@ -1,3 +1,32 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Declaration of class QGCPxImuFirmwareUpdate + * @author Lorenz Meier + */ + #ifndef QGCPXIMUFIRMWAREUPDATE_H #define QGCPXIMUFIRMWAREUPDATE_H diff --git a/src/ui/QGCSensorSettingsWidget.cc b/src/ui/QGCSensorSettingsWidget.cc index 7b9678cf5bd0e3b25fc5fdcd654f86e964058a3e..f00bb98cda14b046d34ca19915a5e32ab8c86f83 100644 --- a/src/ui/QGCSensorSettingsWidget.cc +++ b/src/ui/QGCSensorSettingsWidget.cc @@ -1,3 +1,26 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + #include "QGCSensorSettingsWidget.h" #include "ui_QGCSensorSettingsWidget.h" diff --git a/src/ui/QGCSensorSettingsWidget.h b/src/ui/QGCSensorSettingsWidget.h index d19c12945449db87438fb288bb6a0c1b2ce90c1f..76d2833a399f35f7601008c09f4be6d6a43e1011 100644 --- a/src/ui/QGCSensorSettingsWidget.h +++ b/src/ui/QGCSensorSettingsWidget.h @@ -1,3 +1,32 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Declaration of class QGCSensorSettingsWidget + * @author Lorenz Meier + */ + #ifndef QGCSENSORSETTINGSWIDGET_H #define QGCSENSORSETTINGSWIDGET_H diff --git a/src/ui/SerialConfigurationWindow.cc b/src/ui/SerialConfigurationWindow.cc index a8ad94491eedc912418c83129acc5b03aaaade15..d3bd9310cd4c73d5cea9ad328157ab36672d6571 100644 --- a/src/ui/SerialConfigurationWindow.cc +++ b/src/ui/SerialConfigurationWindow.cc @@ -1,24 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit -Please see our website at +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ diff --git a/src/ui/SerialConfigurationWindow.h b/src/ui/SerialConfigurationWindow.h index 3ca74150d4d1b3e644e73702bc73fdfc8104c046..d71fb95e2aa5f415f1033c93cab511fa66e07805 100644 --- a/src/ui/SerialConfigurationWindow.h +++ b/src/ui/SerialConfigurationWindow.h @@ -1,24 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit -Please see our website at +QGroundControl Open Source Ground Control Station -(c) 2009 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ diff --git a/src/ui/WaypointList.h b/src/ui/WaypointList.h index defa1edfac21fe513f60b7467d22ffae0bce627d..148749fcf7b8b8626d50646c22be72c77800f83e 100644 --- a/src/ui/WaypointList.h +++ b/src/ui/WaypointList.h @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009, 2010 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ diff --git a/src/ui/WaypointView.h b/src/ui/WaypointView.h index 1db39bc88a6dfa12c3d7732331c0def3afaf518e..e293064d2c8270e3a4b90bdbeb206ec963cc766e 100644 --- a/src/ui/WaypointView.h +++ b/src/ui/WaypointView.h @@ -1,23 +1,23 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ diff --git a/src/ui/XMLCommProtocolWidget.h b/src/ui/XMLCommProtocolWidget.h index ecb5e25215d76f67cfb5af8447fc3eac81ab68df..3a7266fdb1f5c81cbf0c439de061a37db99c1197 100644 --- a/src/ui/XMLCommProtocolWidget.h +++ b/src/ui/XMLCommProtocolWidget.h @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Definition of class XMLCommProtocolWidget + * @author Lorenz Meier + * + */ + #ifndef XMLCOMMPROTOCOLWIDGET_H #define XMLCOMMPROTOCOLWIDGET_H diff --git a/src/ui/uas/UASControlWidget.cc b/src/ui/uas/UASControlWidget.cc index 0ac7a740a5b6da061d302b96b52b647bd8a8e53d..700b7a3ccb2b5c8ff23c63324fd83e1d38ae6c7d 100644 --- a/src/ui/uas/UASControlWidget.cc +++ b/src/ui/uas/UASControlWidget.cc @@ -59,8 +59,8 @@ This file is part of the PIXHAWK project #define CONTROL_MODE_TEST3_INDEX 8 UASControlWidget::UASControlWidget(QWidget *parent) : QWidget(parent), - uas(NULL), - engineOn(false) +uas(NULL), +engineOn(false) { ui.setupUi(this); @@ -88,25 +88,27 @@ void UASControlWidget::setUAS(UASInterface* uas) disconnect(ui.shutdownButton, SIGNAL(clicked()), uas, SLOT(shutdown())); disconnect(ui.modeComboBox, SIGNAL(activated(int)), this, SLOT(setMode(int))); disconnect(ui.setModeButton, SIGNAL(clicked()), this, SLOT(transmitMode())); + ui.modeComboBox->clear(); + + disconnect(uas, SIGNAL(modeChanged(int,QString,QString)), this, SLOT(updateMode(int,QString,QString))); + disconnect(uas, SIGNAL(statusChanged(int)), this, SLOT(updateState(int))); } - else - { - // Connect user interface controls - connect(ui.controlButton, SIGNAL(clicked()), this, SLOT(cycleContextButton())); - connect(ui.liftoffButton, SIGNAL(clicked()), uas, SLOT(launch())); - connect(ui.landButton, SIGNAL(clicked()), uas, SLOT(home())); - connect(ui.shutdownButton, SIGNAL(clicked()), uas, SLOT(shutdown())); - connect(ui.modeComboBox, SIGNAL(activated(int)), this, SLOT(setMode(int))); - connect(ui.setModeButton, SIGNAL(clicked()), this, SLOT(transmitMode())); - ui.modeComboBox->insertItem(0, "Select.."); - ui.controlStatusLabel->setText(tr("Connected to ") + uas->getUASName()); + // Connect user interface controls + connect(ui.controlButton, SIGNAL(clicked()), this, SLOT(cycleContextButton())); + connect(ui.liftoffButton, SIGNAL(clicked()), uas, SLOT(launch())); + connect(ui.landButton, SIGNAL(clicked()), uas, SLOT(home())); + connect(ui.shutdownButton, SIGNAL(clicked()), uas, SLOT(shutdown())); + connect(ui.modeComboBox, SIGNAL(activated(int)), this, SLOT(setMode(int))); + connect(ui.setModeButton, SIGNAL(clicked()), this, SLOT(transmitMode())); + ui.modeComboBox->insertItem(0, "Select.."); - connect(uas, SIGNAL(modeChanged(int,QString,QString)), this, SLOT(updateMode(int,QString,QString))); - connect(uas, SIGNAL(statusChanged(int)), this, SLOT(updateState(int))); + ui.controlStatusLabel->setText(tr("Connected to ") + uas->getUASName()); - this->uas = uas; - } + connect(uas, SIGNAL(modeChanged(int,QString,QString)), this, SLOT(updateMode(int,QString,QString))); + connect(uas, SIGNAL(statusChanged(int)), this, SLOT(updateState(int))); + + this->uas = uas; } UASControlWidget::~UASControlWidget() { @@ -210,8 +212,8 @@ void UASControlWidget::cycleContextButton() mav->disable_motors(); ui.lastActionLabel->setText(QString("Attempted to disable motors on %1").arg(uas->getUASName())); } - //ui.controlButton->setText(tr("Force Landing")); - //ui.controlButton->setText(tr("KILL VEHICLE")); + //ui.controlButton->setText(tr("Force Landing")); + //ui.controlButton->setText(tr("KILL VEHICLE")); } } diff --git a/src/ui/uas/UASControlWidget.h b/src/ui/uas/UASControlWidget.h index e5d1609c30290ed9f30c99ebbcea9ba7d37081d5..5f8f236268bac90d33aa8a7b734d86f94e3fd777 100644 --- a/src/ui/uas/UASControlWidget.h +++ b/src/ui/uas/UASControlWidget.h @@ -1,29 +1,29 @@ /*===================================================================== -PIXHAWK Micro Air Vehicle Flying Robotics Toolkit +QGroundControl Open Source Ground Control Station -(c) 2009 PIXHAWK PROJECT +(c) 2009, 2010 QGROUNDCONTROL PROJECT -This file is part of the PIXHAWK project +This file is part of the QGROUNDCONTROL project - PIXHAWK is free software: you can redistribute it and/or modify + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - PIXHAWK is distributed in the hope that it will be useful, + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with PIXHAWK. If not, see . + along with QGROUNDCONTROL. If not, see . ======================================================================*/ /** * @file - * @brief Definition of widget controlling one MAV + * @brief Definition of class UASControlWidget * * @author Lorenz Meier * @@ -39,7 +39,11 @@ This file is part of the PIXHAWK project #include #include -class UASControlWidget : public QWidget { +/** + * @brief Widget controlling one MAV + */ +class UASControlWidget : public QWidget +{ Q_OBJECT public: diff --git a/src/ui/watchdog/WatchdogControl.cc b/src/ui/watchdog/WatchdogControl.cc index 50cde8fed94d88f126408a79e99f881619fc31af..7e4b1fdc49e8070bc38cf1815ef684206f626730 100644 --- a/src/ui/watchdog/WatchdogControl.cc +++ b/src/ui/watchdog/WatchdogControl.cc @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Implementation of class WatchdogControl + * @author Lorenz Meier + * + */ + #include "WatchdogControl.h" #include "WatchdogView.h" #include "WatchdogProcessView.h" diff --git a/src/ui/watchdog/WatchdogControl.h b/src/ui/watchdog/WatchdogControl.h index 544c341211f77aec0edf9c2e3968300739adea35..b662eeb412157950da761707d5969f8f40eeeab2 100644 --- a/src/ui/watchdog/WatchdogControl.h +++ b/src/ui/watchdog/WatchdogControl.h @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Definition of class WatchdogControl + * @author Lorenz Meier + * + */ + #ifndef WATCHDOGCONTROL_H #define WATCHDOGCONTROL_H @@ -19,6 +49,9 @@ namespace Ui { class WatchdogControl; } +/** + * @brief Overall widget for controlling all watchdogs of all connected MAVs + */ class WatchdogControl : public QWidget { Q_OBJECT public: diff --git a/src/ui/watchdog/WatchdogProcessView.cc b/src/ui/watchdog/WatchdogProcessView.cc index f1fccbda5ecfed76f8a3713f6b2a85c92adca80e..e9c3c1205875559ce1c7917fd23f9b22765149d0 100644 --- a/src/ui/watchdog/WatchdogProcessView.cc +++ b/src/ui/watchdog/WatchdogProcessView.cc @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Implementation of class WatchdogControl + * @author Lorenz Meier + * + */ + #include "WatchdogProcessView.h" #include "ui_WatchdogProcessView.h" diff --git a/src/ui/watchdog/WatchdogProcessView.h b/src/ui/watchdog/WatchdogProcessView.h index 59a7d89251d9545a819f13f25198ce03fdf241f7..1b4a949ae216155d5eaca811278c706da543ced0 100644 --- a/src/ui/watchdog/WatchdogProcessView.h +++ b/src/ui/watchdog/WatchdogProcessView.h @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Definition of class WatchdogProcessView + * @author Lorenz Meier + * + */ + #ifndef WATCHDOGPROCESSVIEW_H #define WATCHDOGPROCESSVIEW_H @@ -8,6 +38,9 @@ namespace Ui { class WatchdogProcessView; } +/** + * @brief Represents one process monitored by the linux onboard watchdog + */ class WatchdogProcessView : public QWidget { Q_OBJECT public: diff --git a/src/ui/watchdog/WatchdogView.cc b/src/ui/watchdog/WatchdogView.cc index 28f8a540bd2b0d7731fdde126f7f4c27b05491d1..60585a6eb0a71e7b8dcdf45d4078ef4bb486b1a6 100644 --- a/src/ui/watchdog/WatchdogView.cc +++ b/src/ui/watchdog/WatchdogView.cc @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Implementation of class WatchdogControl + * @author Lorenz Meier + * + */ + #include "WatchdogView.h" #include "ui_WatchdogView.h" diff --git a/src/ui/watchdog/WatchdogView.h b/src/ui/watchdog/WatchdogView.h index fd1203f911d7599d63d8399af546adf8834a715e..5f53fb3b0a612321c1709a6ba02cdc26e656707b 100644 --- a/src/ui/watchdog/WatchdogView.h +++ b/src/ui/watchdog/WatchdogView.h @@ -1,3 +1,33 @@ +/*===================================================================== + +QGroundControl Open Source Ground Control Station + +(c) 2009, 2010 QGROUNDCONTROL PROJECT + +This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + +======================================================================*/ + +/** + * @file + * @brief Definition of class WatchdogView + * @author Lorenz Meier + * + */ + #ifndef WATCHDOGVIEW_H #define WATCHDOGVIEW_H @@ -7,6 +37,9 @@ namespace Ui { class WatchdogView; } +/** + * @brief Represents one onboard watchdog + */ class WatchdogView : public QWidget { Q_OBJECT public: