rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

Create airspeed page

Browse Source
This commit is contained in:
Fredrik Larson 2014-09-03 02:19:15 +10:00
parent 4bf932d36b
commit 82a32a5d8e
7 changed files with 57 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp
View File

@ -26,109 +26,44 @@
*/ */
#include "airspeedpage.h" #include "airspeedpage.h"
#include "ui_airspeed.h"
#include "setupwizard.h" #include "setupwizard.h"
AirSpeedPage::AirSpeedPage(SetupWizard *wizard, QWidget *parent) : AirSpeedPage::AirSpeedPage(SetupWizard *wizard, QWidget *parent) :
AbstractWizardPage(wizard, parent), SelectionPage(wizard, QString(":/setupwizard/resources/fixedwing-shapes-wizard-no-numbers.svg"), parent)
ui(new Ui::AirSpeedPage) {}
{
ui->setupUi(this);
QSvgRenderer *renderer = new QSvgRenderer();
renderer->load(QString(":/configgadget/images/fixedwing-shapes.svg"));
m_airspeedPic = new QGraphicsSvgItem();
m_airspeedPic->setSharedRenderer(renderer);
QGraphicsScene *scene = new QGraphicsScene(this);
scene->addItem(m_airspeedPic);
ui->typeGraphicsView->setScene(scene);
setupAirSpeedPageTypesCombo();
// Default to Software Estimation
connect(ui->typeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateImageAndDescription()));
ui->typeCombo->setCurrentIndex(0);
}
AirSpeedPage::~AirSpeedPage() AirSpeedPage::~AirSpeedPage()
{ {}
delete ui;
}
void AirSpeedPage::initializePage() bool AirSpeedPage::validatePage(SelectionItem *seletedItem)
{ {
updateAvailableTypes(); getWizard()->setAirspeedType((SetupWizard::AIRSPEED_TYPE)seletedItem->id());
updateImageAndDescription();
}
// TODO
bool AirSpeedPage::validatePage()
{
SetupWizard::VEHICLE_SUB_TYPE type = (SetupWizard::VEHICLE_SUB_TYPE)ui->typeCombo->itemData(ui->typeCombo->currentIndex()).toInt();
getWizard()->setVehicleSubType(type);
return true; return true;
} }
void AirSpeedPage::fitInView() void AirSpeedPage::setupSelection(Selection *selection)
{ {
if (m_airspeedPic) { selection->setTitle(tr("OpenPilot Airspeed Sensor Selection"));
ui->typeGraphicsView->setSceneRect(m_airspeedPic->boundingRect()); selection->setText(tr("This part of the wizard will help you select and configure "
ui->typeGraphicsView->fitInView(m_airspeedPic, Qt::KeepAspectRatio); "flying aircraft utilizing servos. The wizard supports the most common types of fixed-wing "
} "aircraft, other variants of fixed-wing aircraft can be configured by using custom "
} "configuration options in the Configuration plugin in the GCS.\n\n"
"Please select the type of fixed-wing you want to create a configuration for below:"));
void AirSpeedPage::resizeEvent(QResizeEvent *event) selection->addItem(tr("Estimated"),
{ tr("This setup expects a traditional airframe using two independent aileron servos "
Q_UNUSED(event); "on their own channel (not connected by Y adapter) plus an elevator and a rudder."),
fitInView(); "aileron",
} SetupWizard::ESTIMATE);
void AirSpeedPage::showEvent(QShowEvent *event) selection->addItem(tr("EagleTree"),
{ tr("This setup expects a traditional airframe using a single alieron servo or two servos "
Q_UNUSED(event); "connected by a Y adapter plus an elevator and a rudder."),
fitInView(); "aileron-single",
} SetupWizard::EAGLETREE);
// TODO selection->addItem(tr("MS4525 Based"),
void AirSpeedPage::setupAirSpeedPageTypesCombo() tr("This setup currently expects a flying-wing setup, an elevon plus rudder setup is not yet "
{ "supported. Setup should include only two elevons, and should explicitly not include a rudder."),
ui->typeCombo->addItem(tr("Aileron Dual Servos"), SetupWizard::FIXED_WING_DUAL_AILERON); "elevon",
m_descriptions << tr("This setup expects a traditional airframe using two independent aileron servos on their own channel (not connected by Y adapter) plus an elevator and a rudder. "); SetupWizard::MS4525);
ui->typeCombo->addItem(tr("Aileron Single Servo"), SetupWizard::FIXED_WING_AILERON);
m_descriptions << tr("This setup expects a traditional airframe using a single alieron servo or two servos connected by a Y adapter plus an elevator and a rudder. ");
ui->typeCombo->addItem(tr("Elevon"), SetupWizard::FIXED_WING_ELEVON);
m_descriptions << tr("This setup currently expects a flying-wing setup, an elevon plus rudder setup is not yet supported. Setup should include only two elevons, and should explicitly not include a rudder.");
}
void AirSpeedPage::updateAvailableTypes()
{}
// TODO
void AirSpeedPage::updateImageAndDescription()
{
SetupWizard::VEHICLE_SUB_TYPE type = (SetupWizard::VEHICLE_SUB_TYPE)ui->typeCombo->itemData(ui->typeCombo->currentIndex()).toInt();
QString elementId = "";
QString description = m_descriptions.at(ui->typeCombo->currentIndex());
switch (type) {
case SetupWizard::FIXED_WING_DUAL_AILERON:
elementId = "aileron";
break;
case SetupWizard::FIXED_WING_AILERON:
elementId = "aileron-single";
break;
case SetupWizard::FIXED_WING_ELEVON:
elementId = "elevon";
break;
default:
elementId = "";
break;
}
m_airspeedPic->setElementId(elementId);
ui->typeGraphicsView->setSceneRect(m_airspeedPic->boundingRect());
ui->typeGraphicsView->fitInView(m_airspeedPic, Qt::KeepAspectRatio);
ui->typeDescription->setText(description);
} }

32
ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.h
View File

@ -28,40 +28,18 @@
#ifndef AIRSPEEDPAGE_H #ifndef AIRSPEEDPAGE_H
#define AIRSPEEDPAGE_H #define AIRSPEEDPAGE_H
#include <QtSvg/QGraphicsSvgItem> #include "selectionpage.h"
#include <QtSvg/QSvgRenderer>
#include <QList>
#include "abstractwizardpage.h" class AirSpeedPage : public SelectionPage {
namespace Ui {
class AirSpeedPage;
}
class AirSpeedPage : public AbstractWizardPage {
Q_OBJECT Q_OBJECT
public: public:
explicit AirSpeedPage(SetupWizard *wizard, QWidget *parent = 0); explicit AirSpeedPage(SetupWizard *wizard, QWidget *parent = 0);
~AirSpeedPage(); ~AirSpeedPage();
void initializePage(); public:
bool validatePage(); bool validatePage(SelectionItem *seletedItem);
void setupSelection(Selection *selection);
void fitInView();
protected:
void resizeEvent(QResizeEvent *event);
void showEvent(QShowEvent *event);
private:
Ui::AirSpeedPage *ui;
void setupAirSpeedPageTypesCombo();
QGraphicsSvgItem *m_fixedwingPic;
void updateAvailableTypes();
QList<QString> m_descriptions;
private slots:
void updateImageAndDescription();
}; };
#endif // AIRSPEEDPAGE_H #endif // AIRSPEEDPAGE_H

164
ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.ui
View File

@ -1,164 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FixedWingPage</class>
<widget class="QWizardPage" name="FixedWingPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>600</width>
<height>400</height>
</rect>
</property>
<property name="windowTitle">
<string>WizardPage</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;OpenPilot Airspeed Sensor Configuration&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;This part of the wizard will set up the OpenPilot controller for use with an airspeed sensor also commonly called a Pitot tube. The OpenPilot Platform supports multiple types of hardware airspeed sensors as well as an advanced software based wind speed estimation algorthym which requires no additional hardware although this is slightly less accurate than using a dedicated hardware sensor. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Please select the type of airspeed sensor you wish to use below:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="topMargin">
<number>4</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="rightMargin">
<number>4</number>
</property>
<item>
<widget class="QLabel" name="label_2">
<property name="minimumSize">
<size>
<width>125</width>
<height>36</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Airspeed type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="typeCombo">
<property name="minimumSize">
<size>
<width>125</width>
<height>20</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTextEdit" name="typeDescription">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGraphicsView" name="typeGraphicsView">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>200</height>
</size>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="midLineWidth">
<number>0</number>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="backgroundBrush">
<brush brushstyle="NoBrush">
<color alpha="0">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</property>
<property name="foregroundBrush">
<brush brushstyle="NoBrush">
<color alpha="0">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</property>
<property name="interactive">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

7
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
View File

@ -32,6 +32,7 @@
#include "pages/vehiclepage.h" #include "pages/vehiclepage.h"
#include "pages/multipage.h" #include "pages/multipage.h"
#include "pages/fixedwingpage.h" #include "pages/fixedwingpage.h"
#include "pages/airspeedpage.h"
#include "pages/helipage.h" #include "pages/helipage.h"
#include "pages/surfacepage.h" #include "pages/surfacepage.h"
#include "pages/inputpage.h" #include "pages/inputpage.h"
@ -147,7 +148,7 @@ int SetupWizard::nextId() const
{ {
switch (getVehicleType()) { switch (getVehicleType()) {
case VEHICLE_FIXEDWING: case VEHICLE_FIXEDWING:
return PAGE_AIRFRAMESTAB_FIXEDWING; return PAGE_AIRSPEED;
// TODO: Pages for Multi and heli // TODO: Pages for Multi and heli
case VEHICLE_MULTI: case VEHICLE_MULTI:
@ -158,6 +159,9 @@ int SetupWizard::nextId() const
} }
} }
case PAGE_AIRSPEED:
return PAGE_AIRFRAMESTAB_FIXEDWING;
case PAGE_AIRFRAMESTAB_FIXEDWING: case PAGE_AIRFRAMESTAB_FIXEDWING:
return PAGE_SAVE; return PAGE_SAVE;
@ -355,6 +359,7 @@ void SetupWizard::createPages()
setPage(PAGE_VEHICLES, new VehiclePage(this)); setPage(PAGE_VEHICLES, new VehiclePage(this));
setPage(PAGE_MULTI, new MultiPage(this)); setPage(PAGE_MULTI, new MultiPage(this));
setPage(PAGE_FIXEDWING, new FixedWingPage(this)); setPage(PAGE_FIXEDWING, new FixedWingPage(this));
setPage(PAGE_AIRSPEED, new AirSpeedPage(this));
setPage(PAGE_HELI, new HeliPage(this)); setPage(PAGE_HELI, new HeliPage(this));
setPage(PAGE_SURFACE, new SurfacePage(this)); setPage(PAGE_SURFACE, new SurfacePage(this));
setPage(PAGE_INPUT, new InputPage(this)); setPage(PAGE_INPUT, new InputPage(this));

14
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
View File

@ -96,6 +96,16 @@ public:
return m_servoType; return m_servoType;
} }
void setAirspeedType(SetupWizard::AIRSPEED_TYPE setting)
{
m_airspeedType = setting;
}
SetupWizard::AIRSPEED_TYPE getAirspeedType() const
{
return m_airspeedType;
}
void setGPSSetting(SetupWizard::GPS_SETTING setting) void setGPSSetting(SetupWizard::GPS_SETTING setting)
{ {
m_gpsSetting = setting; m_gpsSetting = setting;
@ -165,7 +175,7 @@ private slots:
void pageChanged(int currId); void pageChanged(int currId);
private: private:
enum { PAGE_START, PAGE_CONTROLLER, PAGE_VEHICLES, PAGE_MULTI, PAGE_FIXEDWING, enum { PAGE_START, PAGE_CONTROLLER, PAGE_VEHICLES, PAGE_MULTI, PAGE_FIXEDWING,
PAGE_HELI, PAGE_SURFACE, PAGE_INPUT, PAGE_ESC, PAGE_SERVO, PAGE_AIRSPEED, PAGE_HELI, PAGE_SURFACE, PAGE_INPUT, PAGE_ESC, PAGE_SERVO,
PAGE_BIAS_CALIBRATION, PAGE_REVO_CALIBRATION, PAGE_OUTPUT_CALIBRATION, PAGE_BIAS_CALIBRATION, PAGE_REVO_CALIBRATION, PAGE_OUTPUT_CALIBRATION,
PAGE_SAVE, PAGE_SUMMARY, PAGE_NOTYETIMPLEMENTED, PAGE_AIRFRAMESTAB_FIXEDWING, PAGE_SAVE, PAGE_SUMMARY, PAGE_NOTYETIMPLEMENTED, PAGE_AIRFRAMESTAB_FIXEDWING,
PAGE_REBOOT, PAGE_END, PAGE_UPDATE }; PAGE_REBOOT, PAGE_END, PAGE_UPDATE };
@ -179,7 +189,7 @@ private:
INPUT_TYPE m_inputType; INPUT_TYPE m_inputType;
ESC_TYPE m_escType; ESC_TYPE m_escType;
SERVO_TYPE m_servoType; SERVO_TYPE m_servoType;
AIRSPEED_TYPE m_airspeedType;
GPS_SETTING m_gpsSetting; GPS_SETTING m_gpsSetting;
RADIO_SETTING m_radioSetting; RADIO_SETTING m_radioSetting;

2
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
View File

@ -19,6 +19,7 @@ HEADERS += setupwizardplugin.h \
pages/notyetimplementedpage.h \ pages/notyetimplementedpage.h \
pages/multipage.h \ pages/multipage.h \
pages/fixedwingpage.h \ pages/fixedwingpage.h \
pages/airspeedpage.h \
pages/helipage.h \ pages/helipage.h \
pages/surfacepage.h \ pages/surfacepage.h \
pages/abstractwizardpage.h \ pages/abstractwizardpage.h \
@ -49,6 +50,7 @@ SOURCES += setupwizardplugin.cpp \
pages/notyetimplementedpage.cpp \ pages/notyetimplementedpage.cpp \
pages/multipage.cpp \ pages/multipage.cpp \
pages/fixedwingpage.cpp \ pages/fixedwingpage.cpp \
pages/airspeedpage.cpp \
pages/helipage.cpp \ pages/helipage.cpp \
pages/surfacepage.cpp \ pages/surfacepage.cpp \
pages/abstractwizardpage.cpp \ pages/abstractwizardpage.cpp \

6
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
View File

@ -64,8 +64,8 @@ public:
enum ESC_TYPE { ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN }; enum ESC_TYPE { ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN };
enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN }; enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN };
enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSMX10, INPUT_DSMX11, INPUT_DSM2, INPUT_UNKNOWN }; enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSMX10, INPUT_DSMX11, INPUT_DSM2, INPUT_UNKNOWN };
enum AIRSPEED_TYPE { ESTIMATE, EAGLETREE, MS4525 };
enum GPS_SETTING { GPS_UBX, GPS_NMEA, GPS_DISABLED }; enum GPS_SETTING { GPS_PLAT, GPS_UBX, GPS_NMEA, GPS_DISABLED };
enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED }; enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED };
virtual VehicleConfigurationSource::CONTROLLER_TYPE getControllerType() const = 0; virtual VehicleConfigurationSource::CONTROLLER_TYPE getControllerType() const = 0;
@ -74,7 +74,7 @@ public:
virtual VehicleConfigurationSource::INPUT_TYPE getInputType() const = 0; virtual VehicleConfigurationSource::INPUT_TYPE getInputType() const = 0;
virtual VehicleConfigurationSource::ESC_TYPE getEscType() const = 0; virtual VehicleConfigurationSource::ESC_TYPE getEscType() const = 0;
virtual VehicleConfigurationSource::SERVO_TYPE getServoType() const = 0; virtual VehicleConfigurationSource::SERVO_TYPE getServoType() const = 0;
virtual VehicleConfigurationSource::AIRSPEED_TYPE getAirspeedType() const = 0;
virtual VehicleConfigurationSource::GPS_SETTING getGPSSetting() const = 0; virtual VehicleConfigurationSource::GPS_SETTING getGPSSetting() const = 0;
virtual VehicleConfigurationSource::RADIO_SETTING getRadioSetting() const = 0; virtual VehicleConfigurationSource::RADIO_SETTING getRadioSetting() const = 0;