diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp
index bd7af6a0c..5e7c90f62 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp
@@ -29,7 +29,7 @@
#include "setupwizard.h"
AirSpeedPage::AirSpeedPage(SetupWizard *wizard, QWidget *parent) :
- SelectionPage(wizard, QString(":/setupwizard/resources/airspeed-shapes.svg"), parent)
+ SelectionPage(wizard, QString(":/setupwizard/resources/sensor-shapes.svg"), parent)
{}
AirSpeedPage::~AirSpeedPage()
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp
index a7f3499f0..6d53cbda6 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp
@@ -29,7 +29,7 @@
#include "setupwizard.h"
GpsPage::GpsPage(SetupWizard *wizard, QWidget *parent) :
- SelectionPage(wizard, QString(":/setupwizard/resources/gps-shapes.svg"), parent)
+ SelectionPage(wizard, QString(":/setupwizard/resources/sensor-shapes.svg"), parent)
{}
GpsPage::~GpsPage()
@@ -47,30 +47,31 @@ void GpsPage::setupSelection(Selection *selection)
selection->setText(tr("Please select the type of GPS you wish to use. As well as OpenPilot hardware, "
"3rd party GPSs are supported also, although please note that performance could "
"be less than optimal as not all GPSs are created equal.\n\n"
+ "Note: NMEA only GPSs perform poorly on VTOL aircraft and are not recommended for Helis and MultiRotors.\n\n"
"Please select your GPS type data below:"));
selection->addItem(tr("Disabled"),
tr("GPS Features are not to be enabled"),
- "disabled",
+ "no-gps",
SetupWizard::GPS_DISABLED);
selection->addItem(tr("OpenPilot Platinum"),
tr("Select this option to use the OpenPilot Platinum GPS with integrated Magnetometer "
"and Microcontroller connected to the Main Port of your controller.\n\n"
"Note: for the OpenPilot v8 GPS please select the U-Blox option."),
- "platinum",
+ "OPGPS-v9",
SetupWizard::GPS_PLAT);
selection->addItem(tr("U-Blox Based"),
tr("Select this option for the OpenPilot V8 GPS or generic U-Blox chipset GPSs connected"
"to the Main Port of your controller."),
- "ublox",
+ "OPGPS-v8-ublox",
SetupWizard::GPS_UBX);
selection->addItem(tr("NMEA Based"),
tr("Select this option for a generic NMEA based GPS connected to the Main Port of your"
"controller."),
- "nmea",
+ "generic-nmea",
SetupWizard::GPS_NMEA);
}
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui
index 3e2fe7f7d..716956709 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/summarypage.ui
@@ -74,13 +74,12 @@ p, li { white-space: pre-wrap; }
- :/setupwizard/resources/bttn-illustration-up.png
- :/setupwizard/resources/bttn-illustration-down.png:/setupwizard/resources/bttn-illustration-up.png
+ :/setupwizard/resources/bttn-illustration-color-up.png:/setupwizard/resources/bttn-illustration-color-up.png
- 100
- 100
+ 150
+ 150
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/gps-shapes.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/gps-shapes.svg
deleted file mode 100644
index 350e30e98..000000000
--- a/ground/openpilotgcs/src/plugins/setupwizard/resources/gps-shapes.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/sensor-shapes.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/sensor-shapes.svg
index 463ea9862..3ca39d3b3 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/resources/sensor-shapes.svg
+++ b/ground/openpilotgcs/src/plugins/setupwizard/resources/sensor-shapes.svg
@@ -1238,14 +1238,6 @@
stdDeviation="1.7473229"
id="feGaussianBlur5847" />
-
-
-
@@ -3324,7 +3316,7 @@
+
+ transform="matrix(0.52050376,0,0,0.52050376,117.81395,605.77767)"
+ id="g13585"
+ style="opacity:0.46992481">
-
-
-
-
-
-
-
-
-
-
- NO GPS
-
+ id="path13587"
+ d="m 71.978864,612.10223 265.670576,0 c 40.4642,0 73.04008,31.15598 73.04008,69.85644 l 0,273.09908 c 0,38.70046 -32.57588,69.85645 -73.04008,69.85645 l -265.670576,0 c -40.464203,0 -73.0400773,-31.15599 -73.0400773,-69.85645 l 0,-273.09908 c 0,-38.70046 32.5758743,-69.85644 73.0400773,-69.85644 z"
+ style="fill:#feecec;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ transform="translate(-4.5344602,0.00674438)" />
+ sodipodi:nodetypes="ccccccc" />
+
+
-
+
+
+
+
+ NO GPS
+
+
+