-
- ScopeGadget
-
- Attitude
-
- uavGadget
-
-
- ScopeGadget
-
- Uptimes
-
- uavGadget
-
- 2
- @Variant(AAAACQAAAAIAAAACAAABhgAAAAIAAAEO)
- splitter
+ ScopeGadget
+
+ Attitude
+
+ uavGadget
- LoggingGadget
+ ScopeGadget
+
+ Uptimes
+
uavGadget
2
diff --git a/ground/openpilotgcs/src/plugins/config/ccattitude.ui b/ground/openpilotgcs/src/plugins/config/ccattitude.ui
index 16823c628..afe6965a2 100755
--- a/ground/openpilotgcs/src/plugins/config/ccattitude.ui
+++ b/ground/openpilotgcs/src/plugins/config/ccattitude.ui
@@ -497,12 +497,6 @@ arming it in that case!
Save
-
-
- 25
- 25
-
-
diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
index a390eca95..ffceaed18 100644
--- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
@@ -579,14 +579,14 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
if (channel > -1)
{
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( value/1.27 );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( 1-value/1.27 );
+ setYawMixLevel( -qRound(value/1.27) );
channel = m_aircraft->multiMotorChannelBox2->currentIndex() - 1;
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( -value/1.27);
+ m_aircraft->mrRollMixLevel->setValue( -qRound(value/1.27));
}
}
@@ -605,13 +605,13 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
if (channel > -1)
{
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( value/1.27 );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( 1-value/1.27 );
+ setYawMixLevel( -qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( value/1.27);
+ m_aircraft->mrRollMixLevel->setValue( qRound(value/1.27));
}
@@ -635,15 +635,15 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
if (channel > -1)
{
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( floor(value/1.27) );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( floor(-value/1.27) );
+ setYawMixLevel( -qRound(value/1.27) );
//change channels
channel = m_aircraft->multiMotorChannelBox2->currentIndex() - 1;
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( floor(1-value/1.27) );
+ m_aircraft->mrRollMixLevel->setValue( -qRound(value/1.27) );
}
@@ -668,14 +668,14 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
if (channel > -1)
{
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( floor(value/1.27) );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( floor(-value/1.27) );
+ setYawMixLevel( -qRound(value/1.27) );
channel = m_aircraft->multiMotorChannelBox2->currentIndex() - 1;
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( floor(1-value/1.27) );
+ m_aircraft->mrRollMixLevel->setValue( -qRound(value/1.27) );
}
}
else if (frameType == "HexaCoax")
@@ -696,14 +696,14 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
if (channel > -1)
{
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( value/1.27 );
-
- value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( value/1.27 );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(2*value/1.27) );
channel = m_aircraft->multiMotorChannelBox2->currentIndex() - 1;
+ value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
+ setYawMixLevel( qRound(value/1.27) );
+
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( value/1.27);
+ m_aircraft->mrRollMixLevel->setValue( qRound(value/1.27) );
}
}
else if (frameType == "Octo" || frameType == "OctoV" || frameType == "OctoCoaxP")
@@ -727,39 +727,39 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
{
if (frameType == "Octo") {
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( floor(value/1.27) );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( floor(-value/1.27) );
+ setYawMixLevel( -qRound(value/1.27) );
//change channels
channel = m_aircraft->multiMotorChannelBox2->currentIndex() - 1;
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( floor(-value/1.27) );
+ m_aircraft->mrRollMixLevel->setValue( -qRound(value/1.27) );
}
else if (frameType == "OctoV") {
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( floor(value/1.27) );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( floor(-value/1.27) );
+ setYawMixLevel( -qRound(value/1.27) );
//change channels
channel = m_aircraft->multiMotorChannelBox2->currentIndex() - 1;
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( floor(-value/1.27) );
+ m_aircraft->mrRollMixLevel->setValue( -qRound(value/1.27) );
}
else if (frameType == "OctoCoaxP") {
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( floor(value/1.27) );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( floor(-value/1.27) );
+ setYawMixLevel( -qRound(value/1.27) );
//change channels
channel = m_aircraft->multiMotorChannelBox3->currentIndex() - 1;
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( floor(-value/1.27) );
+ m_aircraft->mrRollMixLevel->setValue( -qRound(value/1.27) );
}
}
@@ -784,13 +784,13 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
if (channel > -1)
{
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( floor(value/1.27) );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW);
- setYawMixLevel( floor(-value/1.27) );
+ setYawMixLevel( -qRound(value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( floor(value/1.27) );
+ m_aircraft->mrRollMixLevel->setValue( qRound(value/1.27) );
}
}
else if (frameType == "Tri")
@@ -807,10 +807,10 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
if (channel > -1)
{
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH);
- m_aircraft->mrPitchMixLevel->setValue( floor(2*value/1.27) );
+ m_aircraft->mrPitchMixLevel->setValue( qRound(2*value/1.27) );
value = getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL);
- m_aircraft->mrRollMixLevel->setValue( floor(value/1.27) );
+ m_aircraft->mrRollMixLevel->setValue( qRound(value/1.27) );
}
}
diff --git a/ground/openpilotgcs/src/plugins/config/configgadget.qrc b/ground/openpilotgcs/src/plugins/config/configgadget.qrc
index 532ed8b95..ff81d79fb 100644
--- a/ground/openpilotgcs/src/plugins/config/configgadget.qrc
+++ b/ground/openpilotgcs/src/plugins/config/configgadget.qrc
@@ -28,5 +28,7 @@
images/txpid_normal.png
images/camstab_selected.png
images/camstab_normal.png
+ images/pipx-selected.png
+ images/pipx-normal.png
diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
index 12276bbca..d73bee4c4 100644
--- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
@@ -278,9 +278,14 @@ void ConfigGadgetWidget::updatePipXStatus(UAVObject *object)
pipxTimeout->start(5000);
if (!pipxConnected)
{
- qDebug()<<"ConfigGadgetWidget onPipxtremeConnect";
+ qDebug() << "ConfigGadgetWidget onPipxtremeConnect";
+
+ QIcon *icon = new QIcon();
+ icon->addFile(":/configgadget/images/pipx_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+ icon->addFile(":/configgadget/images/pipx_selected.png", QSize(), QIcon::Selected, QIcon::Off);
+
QWidget *qwd = new ConfigPipXtremeWidget(this);
- ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme"));
+ ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, *icon, QString("PipXtreme"));
pipxConnected = true;
}
}
diff --git a/ground/openpilotgcs/src/plugins/config/images/pipx-normal.png b/ground/openpilotgcs/src/plugins/config/images/pipx-normal.png
new file mode 100644
index 000000000..ef9818a83
Binary files /dev/null and b/ground/openpilotgcs/src/plugins/config/images/pipx-normal.png differ
diff --git a/ground/openpilotgcs/src/plugins/config/images/pipx-selected.png b/ground/openpilotgcs/src/plugins/config/images/pipx-selected.png
new file mode 100644
index 000000000..74f074689
Binary files /dev/null and b/ground/openpilotgcs/src/plugins/config/images/pipx-selected.png differ
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/CREDITS.html b/ground/openpilotgcs/src/plugins/coreplugin/CREDITS.html
index 2f3f2bc5b..cd1c8661d 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/CREDITS.html
+++ b/ground/openpilotgcs/src/plugins/coreplugin/CREDITS.html
@@ -2,209 +2,76 @@
This is a credits file of people that are or have been key contributors to the OpenPilot project.
Without the work of the people in this file OpenPilot would not be what it is today.
-It is sorted alphabetically by name and formatted so that it allows for easy grepping and beautification by scripts.
+It is sorted alphabetically by name
-The fields are:
-
-Name (N)
-Email (E),
-Description of work (D)
-Current maintainer function (M)
-
-----------
-
-N: Connor Abbott
-E: connor (at) abbott (dot) cx
-D: Win32 OpenPilot port
-M: SITL Win32
-
-N: David Ankers
-E: david (at) openpilot (dot) org
-D: Co-founder, Project Coordination
-D: Minor GCS infrastructure, updating the credit file
-M: Admin
-
-N: Pedro Assuncao
-E: pedro (dot) agda (plus) openpilot (at) gmail (dot) com
-D: Initial GCS Settings Gadget work
-
-N: Jose Barros
-E: josembarros (at) hotmail (dot) com
-D: Next-Gen OP Map Lib, Y-Modem Library, Uploader Plugin
-D: OP Bootloader, AHRS Bootloader, OPUploadTool
-M: Bootloader, OP MAP Lib
-
-N: David "Buzz" Carlson
-E: chebuzz (plus) openpilot (at) gmail (dot) com
-D: 3D ModelView GCS Plugin, sponsor of HITL merge work and XPlane addition
-M: 3D Modelview
-
-N: James Cotton
-E: peabody124 (plus) openpilot (at) gmail (dot) com
-D: Multiplatform HID implementation (firmware & GCS), GCS Joystick control
-D: Posix OpenPilot work and Mac implementation
-D: Firmware implementation of Professor Schinstock's INS/GPS
-M: Architecture co-lead
-
-N: Piotr Esden-Tempski
-E: esden (at) esden (dot) net
-D: Floss-JTAG Rev A, 4-layer initial design
-
-N: Frederic Goddeeris
-E: fredericgoddeeris (at) hotmail (dot) com
-D: I2C work and FreeRTOS work, MK integration
-D: EagleTree OSD implementation
-M: OSD Module
-
-N: Daniel Godin
-E: dgodin (at) dnsct (dot) com
-W: Sponsor: Notify Plugin for the GCS
-
-N: Bani Greyling
-E: bani (dot) greyling (plus) openpilot (at) gmail (dot) com
-D: GCS Scope plugin
-
-N: Nuno Guedes
-E: muralha (plus) openpilot (at) gmail (dot) com
-D: 3D artwork, moving surfaces and work on ModelView
-
-N: Peter Gunnarsson
-E: peter (at) pyne (dot) se
-D: GCS Core Developer
-D: Multiple GCS plugins, Gadget foundations, UAVObject viewer
-
-N: Dean Hall
-E: dwhall256 (plus) openpilot (at) gmail (dot) com
-D: Creator of http://pythononachip.org
-
-N: Joe Hlebasko
-E: joe (dot) hlebasko(plus) openpilot (at) gmail (dot) com
-D: Production Main Board & Production OP GPS
-M: Hardware Architecture Team
-
-N: Mark James
-E: mjames (plus) openpilot (at) gmail (dot) com
-D: Some of Silk Icon set used in GCS - http://www.famfamfam.com/lab/icons/silk
-
-N: Sami Korhonen
-E: samik (dot) korhonen (plus) openpilot (at) gmail (dot) com
-D: GPS Module, Spektrum RC Module, OSD work
-
-N: Thorsten Klose
-E: thorsten (dot) klose (at) dmx (dot) de
-D: Embedded STM32 infrastructure
-
-N: Hallvard Kristiansen
-E: hal (at) fleshmx (dot) com
-D: GCS Artwork, Quad layout diagrams
-
-N: Edouard Lafargue
-E: edouard (at) lafargue (dot) name
-D: GCS Dial Plugins, GCS PFD Plugin, GCS GPS plugin, GCS Config plugin
-D: Artwork including standard display dials
-M: GCS Core
-
-N: Matt Lipski
-E: mattlipski (plus) openpilot (at) gmail (dot) com
-D: Deluxe Dials Set artwork, (Artificial Horizon, Compass, Turn Indicator)
-
-N: Les Newell
-E: les (dot) newell (at) fastmail (dot) co (dot) uk
-D: Advanced mixer matrix, SPI protocol based on UAVObjects
-
-N: Ken Northup
-E: helos360 (at) bellsouth (dot) net
-D: 3D Modelling, Easystar adaption from FMS
-
-N: Guy McCaldin
-E: guymcc (at) gmail (dot) com
-D: Artwork and design including work on the Deluxe Dial Set
-
-N: Cathy Moss
-E: cmoss296 (at) blueyonder (dot) co (dot) uk
-D: Hardware design Lead: Gen 2 Mainboard, PipXtreme, Current Sensor
-D: Lead dev PipXtreme, creator OP Map Plugin
-M: Hardware Architecture Team / PipX Modem
-
-N: Angus Peart
-E: gussy (at) openpilot (dot) org
-D: Co-founder, Principal hardware architect.
-D: Hardware design of OpenPilot, AHRS, GPS and other hardware
-D: Core developer embedded code
-
-N: Eric Price
-E: corvus (dot) corax (at) cybertrench (dot) com
-D: IL2 HITL GCS Plugin, Posix OpenPilot, Advanced stabilisation module
-M: SITL Posix
-
-N: Richard Querin
-E: rfquerin (plus) openpilot (at) gmail (dot) com
-D: Graphic Design, OpenPilot Logo
-
-N: Laurent Ribon
-E: ribon (dot) l (at) club-internet (dot) fr
-D: The GLC_lib as used in the ModelView Plugin
-D: See: http://www.glc-lib.net/
-
-N: Julien Rouviere
-E: julien (dot) rouviere (plus) openpilot (at) gmail (dot) com
-D: GCS Core Developer
-D: GCS Framework and Plugins for the GCS
-
-N: Zik Saleeba
-E: zik (at) zikzak (dot) net
-D: Initial schematic based on Zik's Flying Fox schematic
-
-N: Professor Dale Schinstock
-E: dales (at) ksu (dot) edu
-D: Lead AHRS Developer
-D: Creator of the OpenPilot INS / EKF
-
-N: Oleg Semyonov
-E: os-openpilot-org (at) os-propo (dot) info
-D: Core tester & Project organisation
-M: Common part of multi-platform packaging system
-M: Windows NSIS Installer
-M: Russian Documentation Lead
-
-N: Stacey Sheldon
-E: stac (at) solidgoldbomb (dot) org
-D: Core Embedded Developer
-D: SPI protocol for AHRS, I2C rewrite and much core work
-
-N: Troy Schultz
-E: troy (dot) schultz (at) rogers (dot) com
-D: INS design review and optimisation
-M: Hardware Architecture Team
-
-N: Dr. Erhard Siegl
-E: Erhard (dot) Siegl (at) zogazoga (dot) at
-D: Configuration engine for the GCS
-
-N: Pete Stapley
-E: pete (at) stapleylabs (dot) com
-D: PPM inputs
-
-N: Rowan Taubitz
-E: rowan (at) zantek (dot) com (dot) au
-D: Hardware debugging and testing, creation of 2-layer Floss-JTAG Rev B
-D: Creation of Next-Gen FOSS-JTAG board
-
-N: Andrew Thoms
-E: electronics (at) andrewspizza (dot) net
-D: IP Telemtry plugin for the GCS
-D: Helicopter support code and mixing for CCPM
-
-N: Vassilis Varveropoulos
-E: vassilis (at) openpilot (dot) org
-D: Co-founder, Principal embedded software architect.
-D: Module architecture and UAVTalk/UAVObjects implementation.
-M: Architecture co-lead
-
-N: Alex Vrubel
-E: alex (dot) vrubel (plus) openpilot (at) gmail (dot) com
-D: Russian translation of the GCS
+Connor Abbott
+David Ankers
+Pedro Assuncao
+Fredrik Arvidsson
+Werner Backes
+Jose Barros
+Pete Boehl
+David Carlson
+James Cotton
+Steve Doll
+Piotr Esden-Tempski
+Peter Farnworth
+Ed Faulkner
+Darren Furniss
+Frederic Goddeeris
+Daniel Godin
+Bani Greyling
+Nuno Guedes
+Peter Gunnarsson
+Dean Hall
+Joe Hlebasko
+Andy Honecker
+Ryan Hunt
+Mark James
+Sami Korhonen
+Thorsten Klose
+Hallvard Kristiansen
+Edouard Lafargue
+Mike Labranche
+Fredrik Larsson
+Pablo Lema
+David Llama
+Matt Lipski
+Les Newell
+Ken Northup
+Greg Matthews
+Guy McCaldin
+Gary Mortimer
+Cathy Moss
+Angus Peart
+Dmytro Poplavskiy
+Eric Price
+Richard Querin
+Randy Ram
+Laurent Ribon
+Julien Rouviere
+Jackson Russell
+Zik Saleeba
+Professor Dale Schinstock
+Professor Kenn Sebesta
+Oleg Semyonov
+Stacey Sheldon
+Troy Schultz
+Dr. Erhard Siegl
+Mike Smith
+Alex Sowa
+Pete Stapley
+Rowan Taubitz
+Andrew Thoms
+Jasper van Loenen
+Vassilis Varveropoulos
+Kevin Vertucio
+Alex Vrubel
+Brian Webb
+Justin Welander
+Mat Wellington
+Kendal Wells