diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index edbfbe65d600c3d837476dbd67ae08b61105468b..903223229072b3d5a33bb59f395032282166995c 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -258,7 +258,8 @@ FORMS += src/ui/MainWindow.ui \ src/ui/configuration/AdvancedParamConfig.ui \ src/ui/configuration/ArduCopterPidConfig.ui \ src/ui/configuration/ApmPlaneLevel.ui \ - src/ui/configuration/ParamWidget.ui + src/ui/configuration/ParamWidget.ui \ + src/ui/configuration/ArduPlanePidConfig.ui INCLUDEPATH += src \ src/ui \ src/ui/linechart \ @@ -441,7 +442,8 @@ HEADERS += src/MG.h \ src/ui/configuration/AdvancedParamConfig.h \ src/ui/configuration/ArduCopterPidConfig.h \ src/ui/configuration/ApmPlaneLevel.h \ - src/ui/configuration/ParamWidget.h + src/ui/configuration/ParamWidget.h \ + src/ui/configuration/ArduPlanePidConfig.h # Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::HEADERS += src/ui/map3D/QGCGoogleEarthView.h @@ -642,7 +644,8 @@ SOURCES += src/main.cc \ src/ui/configuration/AdvancedParamConfig.cc \ src/ui/configuration/ArduCopterPidConfig.cc \ src/ui/configuration/ApmPlaneLevel.cc \ - src/ui/configuration/ParamWidget.cc + src/ui/configuration/ParamWidget.cc \ + src/ui/configuration/ArduPlanePidConfig.cc # Enable Google Earth only on Mac OS and Windows with Visual Studio compiler macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010|win32-msvc2012::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc diff --git a/src/ui/configuration/ApmSoftwareConfig.cc b/src/ui/configuration/ApmSoftwareConfig.cc index a8a2e4ddd841fa3770c69c5f178132739ed8d704..c0010ad8e0c6ba8768ad57fb930e321cf53bc650 100644 --- a/src/ui/configuration/ApmSoftwareConfig.cc +++ b/src/ui/configuration/ApmSoftwareConfig.cc @@ -17,10 +17,10 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent) ui.advParamListButton->setVisible(false); ui.arduCoperPidButton->setVisible(false); - basicPidConfig = new BasicPidConfig(this); + /*basicPidConfig = new BasicPidConfig(this); ui.stackedWidget->addWidget(basicPidConfig); buttonToConfigWidgetMap[ui.basicPidsButton] = basicPidConfig; - connect(ui.basicPidsButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + connect(ui.basicPidsButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget()));*/ flightConfig = new FlightModeConfig(this); ui.stackedWidget->addWidget(flightConfig); @@ -32,10 +32,10 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent) buttonToConfigWidgetMap[ui.standardParamButton] = standardParamConfig; connect(ui.standardParamButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); - geoFenceConfig = new GeoFenceConfig(this); + /*geoFenceConfig = new GeoFenceConfig(this); ui.stackedWidget->addWidget(geoFenceConfig); buttonToConfigWidgetMap[ui.geoFenceButton] = geoFenceConfig; - connect(ui.geoFenceButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget())); + connect(ui.geoFenceButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget()));*/ failSafeConfig = new FailSafeConfig(this); ui.stackedWidget->addWidget(failSafeConfig); diff --git a/src/ui/configuration/ArduCopterPidConfig.cc b/src/ui/configuration/ArduCopterPidConfig.cc index 1674ae23623fa0cec3ae2ac860b07215f4e71479..0a1dfc69a1846a7eedd3cbf066d9a89e7f034827 100644 --- a/src/ui/configuration/ArduCopterPidConfig.cc +++ b/src/ui/configuration/ArduCopterPidConfig.cc @@ -1,14 +1,10 @@ #include "ArduCopterPidConfig.h" -#include "ui_ArduCopterPidConfig.h" -ArduCopterPidConfig::ArduCopterPidConfig(QWidget *parent) : - QWidget(parent), - ui(new Ui::ArduCopterPidConfig) +ArduCopterPidConfig::ArduCopterPidConfig(QWidget *parent) : AP2ConfigWidget(parent) { - ui->setupUi(this); + ui.setupUi(this); } ArduCopterPidConfig::~ArduCopterPidConfig() { - delete ui; } diff --git a/src/ui/configuration/ArduCopterPidConfig.h b/src/ui/configuration/ArduCopterPidConfig.h index 6f7eae7e8545235a9f05887b4d1cb152d1f6059c..339b8c4725a7dc8f35fdd21dc498c2c9cd97fae3 100644 --- a/src/ui/configuration/ArduCopterPidConfig.h +++ b/src/ui/configuration/ArduCopterPidConfig.h @@ -2,12 +2,11 @@ #define ARDUCOPTERPIDCONFIG_H #include +#include "ui_ArduCopterPidConfig.h" -namespace Ui { -class ArduCopterPidConfig; -} +#include "AP2ConfigWidget.h" -class ArduCopterPidConfig : public QWidget +class ArduCopterPidConfig : public AP2ConfigWidget { Q_OBJECT @@ -16,7 +15,7 @@ public: ~ArduCopterPidConfig(); private: - Ui::ArduCopterPidConfig *ui; + Ui::ArduCopterPidConfig ui; }; #endif // ARDUCOPTERPIDCONFIG_H diff --git a/src/ui/configuration/ArduPlanePidConfig.cc b/src/ui/configuration/ArduPlanePidConfig.cc new file mode 100644 index 0000000000000000000000000000000000000000..276a689b49612bef400200c7d561ff1d214463b5 --- /dev/null +++ b/src/ui/configuration/ArduPlanePidConfig.cc @@ -0,0 +1,18 @@ +#include "ArduPlanePidConfig.h" + + +ArduPlanePidConfig::ArduPlanePidConfig(QWidget *parent) : AP2ConfigWidget(parent) +{ + ui.setupUi(this); +} + +ArduPlanePidConfig::~ArduPlanePidConfig() +{ +} +void ArduPlanePidconfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) +{ + if (parameterName == "") + { + + } +} diff --git a/src/ui/configuration/ArduPlanePidConfig.h b/src/ui/configuration/ArduPlanePidConfig.h new file mode 100644 index 0000000000000000000000000000000000000000..dcb75eef000855ed765d273767cbb72a22034e23 --- /dev/null +++ b/src/ui/configuration/ArduPlanePidConfig.h @@ -0,0 +1,21 @@ +#ifndef ARDUPLANEPIDCONFIG_H +#define ARDUPLANEPIDCONFIG_H + +#include +#include "ui_ArduPlanePidConfig.h" +#include "AP2ConfigWidget.h" + +class ArduPlanePidConfig : public AP2ConfigWidget +{ + Q_OBJECT + +public: + explicit ArduPlanePidConfig(QWidget *parent = 0); + ~ArduPlanePidConfig(); +private slots: + void parameterChanged(int uas, int component, QString parameterName, QVariant value); +private: + Ui::ArduPlanePidConfig ui; +}; + +#endif // ARDUPLANEPIDCONFIG_H diff --git a/src/ui/configuration/ArduPlanePidConfig.ui b/src/ui/configuration/ArduPlanePidConfig.ui new file mode 100644 index 0000000000000000000000000000000000000000..b1cb38fd2f6a7d36ba376f9c457f6d20fe4b79ab --- /dev/null +++ b/src/ui/configuration/ArduPlanePidConfig.ui @@ -0,0 +1,957 @@ + + + ArduPlanePidConfig + + + + 0 + 0 + 733 + 641 + + + + Form + + + + + 20 + 10 + 681 + 581 + + + + + + + L1 Control - Turn Control + + + + + + + + + + Period + + + + + + + Damping + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Servo Roll Pid + + + + + + + + + + P + + + + + + + I + + + + + + + D + + + + + + + INT_MAX + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 100.000000000000000 + + + + + + + + + + + + + + Nav Pitch Alt Pid + + + + + + + + + + P + + + + + + + I + + + + + + + D + + + + + + + INT_MAX + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 100.000000000000000 + + + + + + + + + + + + + + Nav Pitch AS Pid + + + + + + + + + + P + + + + + + + I + + + + + + + D + + + + + + + INT_MAX + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 100.000000000000000 + + + + + + + + + + + + + + Servo Yaw Pid + + + + + + + + + + P + + + + + + + I + + + + + + + D + + + + + + + INT_MAX + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 100.000000000000000 + + + + + + + + + + + + + + Throttle 0-100% + + + + + + + + + + Cruise + + + + + + + Min + + + + + + + Max + + + + + + + FS Value + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 100.000000000000000 + + + + + + + + + + + + + + Servo Pitch Pid + + + + + + + + + + P + + + + + + + I + + + + + + + D + + + + + + + INT_MAX + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 100.000000000000000 + + + + + + + + + + + + + + Aiespeed m/s + + + + + + + + + + Cruise + + + + + + + FBW min + + + + + + + FBW max + + + + + + + Ratio + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 100.000000000000000 + + + + + + + + + + + + + + Other Mix's + + + + + + + + + + P to T + + + + + + + Pitch Comp + + + + + + + Rudder Mix + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + + + + + + + + Navigation Angles + + + + + + + + + + Bank Max + + + + + + + Pitch Max + + + + + + + Pitch Min + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + + + + + + + + Energy/Alt Pid + + + + + + + + + + P + + + + + + + I + + + + + + + D + + + + + + + INT_MAX + + + + + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 3 + + + 100.000000000000000 + + + + + + + 100.000000000000000 + + + + + + + + + + + + + + + + 260 + 600 + 75 + 23 + + + + Write Params + + + + + + 350 + 600 + 75 + 23 + + + + Refresh Params + + + + + +