From 89056b9e9ded63366c900c2229d6236a9269a260 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 14 Apr 2015 14:30:16 -0700 Subject: [PATCH] Stream rate widget no longer supported --- src/ui/QGCSensorSettingsWidget.cc | 190 -------------------------- src/ui/QGCSensorSettingsWidget.h | 85 ------------ src/ui/QGCSensorSettingsWidget.ui | 218 ------------------------------ 3 files changed, 493 deletions(-) delete mode 100644 src/ui/QGCSensorSettingsWidget.cc delete mode 100644 src/ui/QGCSensorSettingsWidget.h delete mode 100644 src/ui/QGCSensorSettingsWidget.ui diff --git a/src/ui/QGCSensorSettingsWidget.cc b/src/ui/QGCSensorSettingsWidget.cc deleted file mode 100644 index 92307dab2..000000000 --- a/src/ui/QGCSensorSettingsWidget.cc +++ /dev/null @@ -1,190 +0,0 @@ -/*===================================================================== - -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 QGCSensorSettingsWidget - * @author Lorenz Meier - * - */ - -#include "QGCSensorSettingsWidget.h" -#include "ui_QGCSensorSettingsWidget.h" - -QGCSensorSettingsWidget::QGCSensorSettingsWidget(UASInterface* uas, QWidget *parent) : - QWidget(parent), - mav(uas), - ui(new Ui::QGCSensorSettingsWidget) -{ - ui->setupUi(this); - // Set up delay timers - delayedSendRawSensorTimer.setInterval(800); - delayedSendControllerTimer.setInterval(800); - delayedSendExtendedTimer.setInterval(800); - delayedSendRCTimer.setInterval(800); - delayedSendPositionTimer.setInterval(800); - delayedSendExtra1Timer.setInterval(800); - delayedSendExtra2Timer.setInterval(800); - delayedSendExtra3Timer.setInterval(800); - - connect(&delayedSendRawSensorTimer, SIGNAL(timeout()), this, SLOT(sendRawSensor())); - connect(&delayedSendControllerTimer, SIGNAL(timeout()), this, SLOT(sendController())); - connect(&delayedSendExtendedTimer, SIGNAL(timeout()), this, SLOT(sendExtended())); - connect(&delayedSendRCTimer, SIGNAL(timeout()), this, SLOT(sendRC())); - connect(&delayedSendPositionTimer, SIGNAL(timeout()), this, SLOT(sendPosition())); - connect(&delayedSendExtra1Timer, SIGNAL(timeout()), this, SLOT(sendExtra1())); - connect(&delayedSendExtra2Timer, SIGNAL(timeout()), this, SLOT(sendExtra2())); - connect(&delayedSendExtra3Timer, SIGNAL(timeout()), this, SLOT(sendExtra3())); - - // Connect UI - connect(ui->spinBox_rawSensor, SIGNAL(valueChanged(int)), this, SLOT(delayedSendRawSensor(int)));//mav, SLOT(enableRawSensorDataTransmission(int))); - connect(ui->spinBox_controller, SIGNAL(valueChanged(int)), this, SLOT(delayedSendController(int))); - connect(ui->spinBox_extended, SIGNAL(valueChanged(int)), this, SLOT(delayedSendExtended(int))); - connect(ui->spinBox_rc, SIGNAL(valueChanged(int)), this, SLOT(delayedSendRC(int))); - connect(ui->spinBox_position, SIGNAL(valueChanged(int)), this, SLOT(delayedSendPosition(int))); - connect(ui->spinBox_extra1, SIGNAL(valueChanged(int)), this, SLOT(delayedSendExtra1(int))); - connect(ui->spinBox_extra2, SIGNAL(valueChanged(int)), this, SLOT(delayedSendExtra2(int))); - connect(ui->spinBox_extra3, SIGNAL(valueChanged(int)), this, SLOT(delayedSendExtra3(int))); - - // Calibration - connect(ui->rcCalButton, SIGNAL(clicked()), mav, SLOT(startRadioControlCalibration())); - connect(ui->magCalButton, SIGNAL(clicked()), mav, SLOT(startMagnetometerCalibration())); - connect(ui->pressureCalButton, SIGNAL(clicked()), mav, SLOT(startPressureCalibration())); - connect(ui->gyroCalButton, SIGNAL(clicked()), mav, SLOT(startGyroscopeCalibration())); - - // Hide the calibration stuff - done in custom widgets anyway - ui->groupBox_3->hide(); -} - -void QGCSensorSettingsWidget::delayedSendRawSensor(int rate) -{ - Q_UNUSED(rate); - delayedSendRawSensorTimer.start(); -} - -void QGCSensorSettingsWidget::delayedSendController(int rate) -{ - Q_UNUSED(rate); - delayedSendControllerTimer.start(); -} - -void QGCSensorSettingsWidget::delayedSendExtended(int rate) -{ - Q_UNUSED(rate); - delayedSendExtendedTimer.start(); -} - -void QGCSensorSettingsWidget::delayedSendRC(int rate) -{ - Q_UNUSED(rate); - delayedSendRCTimer.start(); -} - -void QGCSensorSettingsWidget::delayedSendPosition(int rate) -{ - Q_UNUSED(rate); - delayedSendPositionTimer.start(); -} - -void QGCSensorSettingsWidget::delayedSendExtra1(int rate) -{ - Q_UNUSED(rate); - delayedSendExtra1Timer.start(); -} - -void QGCSensorSettingsWidget::delayedSendExtra2(int rate) -{ - Q_UNUSED(rate); - delayedSendExtra2Timer.start(); -} - -void QGCSensorSettingsWidget::delayedSendExtra3(int rate) -{ - Q_UNUSED(rate); - delayedSendExtra3Timer.start(); -} - -void QGCSensorSettingsWidget::sendRawSensor() -{ - delayedSendRawSensorTimer.stop(); - mav->enableRawSensorDataTransmission(ui->spinBox_rawSensor->value()); -} - -void QGCSensorSettingsWidget::sendController() -{ - delayedSendControllerTimer.stop(); - mav->enableRawControllerDataTransmission(ui->spinBox_controller->value()); -} - -void QGCSensorSettingsWidget::sendExtended() -{ - delayedSendExtendedTimer.stop(); - mav->enableExtendedSystemStatusTransmission(ui->spinBox_extended->value()); -} - -void QGCSensorSettingsWidget::sendRC() -{ - delayedSendRCTimer.stop(); - mav->enableRCChannelDataTransmission(ui->spinBox_rc->value()); -} - -void QGCSensorSettingsWidget::sendPosition() -{ - delayedSendPositionTimer.stop(); - mav->enablePositionTransmission(ui->spinBox_position->value()); -} - -void QGCSensorSettingsWidget::sendExtra1() -{ - delayedSendExtra1Timer.stop(); - mav->enableExtra1Transmission(ui->spinBox_extra1->value()); -} - -void QGCSensorSettingsWidget::sendExtra2() -{ - delayedSendExtra2Timer.stop(); - mav->enableExtra2Transmission(ui->spinBox_extra2->value()); -} - -void QGCSensorSettingsWidget::sendExtra3() -{ - delayedSendExtra3Timer.stop(); - mav->enableExtra3Transmission(ui->spinBox_extra3->value()); -} - -QGCSensorSettingsWidget::~QGCSensorSettingsWidget() -{ - delete ui; -} - -void QGCSensorSettingsWidget::changeEvent(QEvent *e) -{ - QWidget::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - ui->retranslateUi(this); - break; - default: - break; - } -} diff --git a/src/ui/QGCSensorSettingsWidget.h b/src/ui/QGCSensorSettingsWidget.h deleted file mode 100644 index 1f78fa795..000000000 --- a/src/ui/QGCSensorSettingsWidget.h +++ /dev/null @@ -1,85 +0,0 @@ -/*===================================================================== - -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 - -#include - -#include "UASInterface.h" - -namespace Ui -{ -class QGCSensorSettingsWidget; -} - -class QGCSensorSettingsWidget : public QWidget -{ - Q_OBJECT -public: - QGCSensorSettingsWidget(UASInterface* uas, QWidget *parent = 0); - ~QGCSensorSettingsWidget(); - -public slots: - void delayedSendRawSensor(int rate); - void delayedSendController(int rate); - void delayedSendExtended(int rate); - void delayedSendRC(int rate); - void delayedSendPosition(int rate); - void delayedSendExtra1(int rate); - void delayedSendExtra2(int rate); - void delayedSendExtra3(int rate); - -protected: - UASInterface* mav; - QTimer delayedSendRawSensorTimer; - QTimer delayedSendControllerTimer; - QTimer delayedSendExtendedTimer; - QTimer delayedSendRCTimer; - QTimer delayedSendPositionTimer; - QTimer delayedSendExtra1Timer; - QTimer delayedSendExtra2Timer; - QTimer delayedSendExtra3Timer; - void changeEvent(QEvent *e); - -protected slots: - void sendRawSensor(); - void sendController(); - void sendExtended(); - void sendRC(); - void sendPosition(); - void sendExtra1(); - void sendExtra2(); - void sendExtra3(); - -private: - Ui::QGCSensorSettingsWidget *ui; -}; - -#endif // QGCSENSORSETTINGSWIDGET_H diff --git a/src/ui/QGCSensorSettingsWidget.ui b/src/ui/QGCSensorSettingsWidget.ui deleted file mode 100644 index 9c8267b99..000000000 --- a/src/ui/QGCSensorSettingsWidget.ui +++ /dev/null @@ -1,218 +0,0 @@ - - - QGCSensorSettingsWidget - - - - 0 - 0 - 307 - 221 - - - - Form - - - - 0 - - - - - Calibration Wizards - - - - 6 - - - 2 - - - 6 - - - 2 - - - 12 - - - 6 - - - - - RC Cal. - - - - - - - Mag. Cal. - - - - - - - Gyro Cal. - - - - - - - Pressure Cal. - - - - - - - - - - Data Stream Rates (Hz) - - - - 6 - - - 2 - - - 6 - - - 2 - - - 5 - - - 2 - - - - - 10000 - - - - - - - Raw Sensor - - - - - - - 10000 - - - - - - - 10000 - - - - - - - 10000 - - - - - - - Ext. Status - - - - - - - Position - - - - - - - Raw Contr. - - - - - - - 10000 - - - - - - - 10000 - - - - - - - 10000 - - - - - - - 10000 - - - - - - - RC Chan. - - - - - - - Extra 1 - - - - - - - Extra 2 - - - - - - - Extra 3 - - - - - - - - - - - -- 2.22.0