Merge branch 'rel-14.10' into next

WHATSNEW.txt

@@ -12,7 +12,6 @@ Some key addition in this release:
 - Redesigned PFD artwork and addition of multifunctional slide out panels;
 - Support for additional Flexi-IO serial port for Revolution;
 - External (ws281x compatible) status LED support;
-- Several OPLink reliability improvements;
 - Considerable flight performance improvements  
 
 The full list of features, improvements and bugfixes in this release is accessible here:
@@ -128,7 +127,6 @@ NOTE: If you were using OPLink at power levels lower than 100mW, please redo a r
     * [OP-1510] - Don't force operating at 100mW
     * [OP-1513] - Filter every temperature measurement used for temperature calibration
     * [OP-1517] - Setup Wizard  - sets SBus and GPS to main port
-    * [OP-1522] - Improve Robustness of OPLink radio
     * [OP-1526] - Reverse all motors not working?
     * [OP-1532] - OPLINKMINI and Revo do not communicate correctly
     * [OP-1536] - The Revo ComBridge outputs garbage at the end of transmissions

ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml

@@ -16,11 +16,11 @@ Item {
     property variant flightmodeColors : ["gray", "green", "green", "green", "green", "green", "green", "red", 
                                          "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan"]
 
-                      // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Rattitude,RelayRate,RelayAttitude,
+                      // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,RelayRate,RelayAttitude,
                       // AltitudeHold,AltitudeVario,CruiseControl + Auto mode (VTOL/Wing pathfollower)
                       // grey : 'disabled' modes
 
-    property variant thrustmodeColors : ["green", "grey", "grey", "grey", "grey", "grey", "grey", "grey", "grey",  
+    property variant thrustmodeColors : ["green", "grey", "grey", "grey", "grey", "grey", "grey", "grey", "grey", "grey",  
                                          "green", "green", "green", "cyan"]
 
                       // SystemSettings.AirframeType 3 - 17 : VtolPathFollower, check ThrustControl
@@ -224,12 +224,12 @@ Item {
             anchors.fill: parent
             color: FlightStatus.FlightMode < 1 ? "grey" : warnings.thrustmodeColors[thrust_mode.toString()]
 
-                      // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Rattitude,RelayRate,RelayAttitude,
+                      // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,RelayRate,RelayAttitude,
                       // AltitudeHold,AltitudeVario,CruiseControl
                       // grey : 'disabled' modes
             Text {
                 anchors.centerIn: parent
-                text: ["MANUAL"," "," ", " ", " ", " ", " ", " ", " ",
+                text: ["MANUAL"," "," ", " ", " ", " ", " ", " ", " ", " ",
                        "ALT HOLD", "ALT VARIO", "CRUISECTRL", "AUTO"][thrust_mode.toString()]
                 font {
                     family: "Arial"

ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp

@@ -65,20 +65,18 @@ void GpsPage::setupSelection(Selection *selection)
 
     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"
+                          "and Microcontroller.\n\n"
                           "Note: for the OpenPilot v8 GPS please select the U-Blox option."),
                        "OPGPS-v9",
                        SetupWizard::GPS_PLATINUM);
 
     selection->addItem(tr("U-Blox Based"),
-                       tr("Select this option for the OpenPilot V8 GPS or generic U-Blox chipset GPSs connected"
+                       tr("Select this option for the OpenPilot V8 GPS or generic U-Blox chipset based GPS."),
-                          "to the Main Port of your controller."),
                        "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"
+                       tr("Select this option for a generic NMEA based GPS."),
-                          "controller."),
                        "generic-nmea",
                        SetupWizard::GPS_NMEA);
 }

package/winx86/openpilotgcs.nsi

@@ -1,7 +1,7 @@
 #
 # Project: OpenPilot
 # NSIS configuration file for OpenPilot GCS
-# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2013.
+# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2014.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@
   VIAddVersionKey "Comments" "${INSTALLER_NAME}. ${BUILD_DESCRIPTION}"
   VIAddVersionKey "CompanyName" "The OpenPilot Team, http://www.openpilot.org"
   VIAddVersionKey "LegalTrademarks" "${PRODUCT_NAME} is a trademark of The OpenPilot Team"
-  VIAddVersionKey "LegalCopyright" "© 2010-2013 The OpenPilot Team"
+  VIAddVersionKey "LegalCopyright" "© 2010-2014 The OpenPilot Team"
   VIAddVersionKey "FileDescription" "${INSTALLER_NAME}"
 
 ;--------------------------------
@@ -93,7 +93,7 @@
 ;--------------------------------
 ; Branding
 
-  BrandingText "© 2010-2013 The OpenPilot Team, http://www.openpilot.org"
+  BrandingText "© 2010-2014 The OpenPilot Team, http://www.openpilot.org"
 
   !define MUI_ICON "${NSIS_DATA_TREE}\resources\openpilot.ico"
   !define MUI_HEADERIMAGE