Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into dsmx_stuff

ground/openpilotgcs/openpilotgcs.pri

@@ -19,6 +19,19 @@ defineReplace(addNewline) {
     return($$escape_expand(\\n\\t))
 }
 
+defineReplace(qtLibraryName) {
+   unset(LIBRARY_NAME)
+   LIBRARY_NAME = $$1
+   CONFIG(debug, debug|release) {
+      !debug_and_release|build_pass {
+          mac:RET = $$member(LIBRARY_NAME, 0)_debug
+              else:win32:RET = $$member(LIBRARY_NAME, 0)d
+      }
+   }
+   isEmpty(RET):RET = $$LIBRARY_NAME
+   return($$RET)
+}
+
 # For use in custom compilers which just copy files
 win32:i_flag = i
 defineReplace(stripSrcDir) {

ground/openpilotgcs/src/app/app.pro

@@ -11,16 +11,15 @@ SOURCES += main.cpp
 include(../rpath.pri)
 include(../libs/utils/utils.pri)
 
-win32 {
+LIBS *= -l$$qtLibraryName(ExtensionSystem) -l$$qtLibraryName(Aggregation)
-    CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd  -lQExtSerialPortd
-    else:LIBS *= -lExtensionSystem -lAggregation -lQExtSerialPort
 
+win32 {
+#    CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd  -lQExtSerialPortd
+#    else:LIBS *= -lExtensionSystem -lAggregation -lQExtSerialPort
     RC_FILE = openpilotgcs.rc
     target.path = /bin
     INSTALLS += target
 } else:macx {
-    CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
-    else:LIBS *= -lExtensionSystem -lAggregation
     LIBS += -framework CoreFoundation
     ICON = openpilotgcs.icns
     QMAKE_INFO_PLIST = Info.plist
@@ -28,8 +27,6 @@ win32 {
     FILETYPES.path = Contents/Resources
     QMAKE_BUNDLE_DATA += FILETYPES
 } else {
-    LIBS *= -lExtensionSystem -lAggregation
-
     target.path  = /bin
     INSTALLS    += target
 }

ground/openpilotgcs/src/libs/aggregation/aggregation.pri

@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(Aggregation)
+LIBS *= -l$$qtLibraryName(Aggregation)

ground/openpilotgcs/src/libs/extensionsystem/extensionsystem.pri

@@ -1,3 +1,3 @@
 include(extensionsystem_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(ExtensionSystem)
+LIBS *= -l$$qtLibraryName(ExtensionSystem)

ground/openpilotgcs/src/libs/glc_lib/glc_lib.pri

@@ -1,2 +1,2 @@
 QT += opengl
-LIBS += -l$$qtLibraryTarget(GLC_lib)
+LIBS *= -l$$qtLibraryName(GLC_lib)

ground/openpilotgcs/src/libs/libqxt/libqxt.pri

@@ -1,4 +1,4 @@
-LIBS += -l$$qtLibraryTarget(QxtCore)
+LIBS *= -l$$qtLibraryName(QxtCore)
 
 INCLUDEPATH += \
     $$GCS_SOURCE_TREE/src/libs/libqxt/src/core

ground/openpilotgcs/src/libs/opmapcontrol/opmapcontrol.pri

@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(opmapwidget)
+LIBS *= -l$$qtLibraryName(opmapwidget)

ground/openpilotgcs/src/libs/qextserialport/qextserialport.pri

@@ -1,2 +1,2 @@
-LIBS += -l$$qtLibraryTarget(QExtSerialPort)
+LIBS *= -l$$qtLibraryName(QExtSerialPort)
 

ground/openpilotgcs/src/libs/qscispinbox/qscispinbox.pri

@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(QScienceSpinBox)
+LIBS *= -l$$qtLibraryName(QScienceSpinBox)

ground/openpilotgcs/src/libs/qtconcurrent/qtconcurrent.pri

@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(QtConcurrent)
+LIBS *= -l$$qtLibraryName(QtConcurrent)

ground/openpilotgcs/src/libs/qwt/qwt.pri

@@ -1,2 +1,2 @@
-LIBS += -l$$qtLibraryTarget(Qwt)
+LIBS *= -l$$qtLibraryName(Qwt)
 

ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pri

@@ -1 +1 @@
-LIBS += -l$$qtLibraryTarget(sdlgamepad)
+LIBS *= -l$$qtLibraryName(sdlgamepad)

ground/openpilotgcs/src/libs/utils/utils.pri

@@ -1,9 +1 @@
-macx {
+LIBS *= -l$$qtLibraryName(Utils)
-    CONFIG(debug, debug|release):LIBS *= -lUtils_debug
-    else:LIBS *= -lUtils
-} else:win32 {
-    CONFIG(debug, debug|release):LIBS *= -lUtilsd
-    else:LIBS *= -lUtils
-} else {
-    LIBS += -l$$qtLibraryTarget(Utils)
-}

ground/openpilotgcs/src/openpilotgcslibrary.pri

@@ -8,7 +8,7 @@ DESTDIR = $$GCS_LIBRARY_PATH
 
 include(rpath.pri)
 
-TARGET = $$qtLibraryTarget($$TARGET)
+TARGET = $$qtLibraryName($$TARGET)
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols
 

ground/openpilotgcs/src/openpilotgcsplugin.pri

@@ -23,7 +23,7 @@ copy2build.name = COPY ${QMAKE_FILE_IN}
 copy2build.CONFIG += no_link
 QMAKE_EXTRA_COMPILERS += copy2build
 
-TARGET = $$qtLibraryTarget($$TARGET)
+TARGET = $$qtLibraryName($$TARGET)
 
 macx {
         QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/

ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pri

@@ -1,2 +1,2 @@
 include(coreplugin_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(Core)
+LIBS *= -l$$qtLibraryName(Core)

ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp

@@ -478,13 +478,13 @@ void DialGadgetWidget::setDialFont(QString fontProps)
 // this enables smooth rotation in rotateNeedles below
 void DialGadgetWidget::setNeedle1(double value) {
     if (rotateN1) {
-        needle1Target = 360*(value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
+        needle1Target = 360*(value*n1Factor)/(n1MaxValue-n1MinValue);
     }
     if (horizN1) {
-        needle1Target = (value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
+        needle1Target = (value*n1Factor)/(n1MaxValue-n1MinValue);
     }
     if (vertN1) {
-        needle1Target = (value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
+        needle1Target = (value*n1Factor)/(n1MaxValue-n1MinValue);
     }
     if (!dialTimer.isActive())
         dialTimer.start();
@@ -497,13 +497,13 @@ void DialGadgetWidget::setNeedle1(double value) {
 
 void DialGadgetWidget::setNeedle2(double value) {
     if (rotateN2) {
-        needle2Target = 360*(value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
+        needle2Target = 360*(value*n2Factor)/(n2MaxValue-n2MinValue);
     }
     if (horizN2) {
-        needle2Target = (value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
+        needle2Target = (value*n2Factor)/(n2MaxValue-n2MinValue);
     }
     if (vertN2) {
-        needle2Target = (value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
+        needle2Target = (value*n2Factor)/(n2MaxValue-n2MinValue);
     }
     if (!dialTimer.isActive())
         dialTimer.start();
@@ -517,13 +517,13 @@ void DialGadgetWidget::setNeedle2(double value) {
 
 void DialGadgetWidget::setNeedle3(double value) {
     if (rotateN3) {
-        needle3Target = 360*(value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
+        needle3Target = 360*(value*n3Factor)/(n3MaxValue-n3MinValue);
     }
     if (horizN3) {
-        needle3Target = (value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
+        needle3Target = (value*n3Factor)/(n3MaxValue-n3MinValue);
     }
     if (vertN3) {
-        needle3Target = (value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
+        needle3Target = (value*n3Factor)/(n3MaxValue-n3MinValue);
     }
     if (!dialTimer.isActive())
         dialTimer.start();

ground/openpilotgcs/src/plugins/ipconnection/ipconnection.pri

@@ -1,3 +1,3 @@
 include(ipconnection_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(IPconnection)
+LIBS *= -l$$qtLibraryName(IPconnection)

ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp

@@ -76,11 +76,10 @@ QIODevice* LoggingConnection::openDevice(const QString &deviceName)
     if (logFile.isOpen()){
         logFile.close();
     }
-    QFileDialog * fd = new QFileDialog();
+    QString fileName = QFileDialog::getOpenFileName(NULL, tr("Open file"), QString(""), tr("OpenPilot Log (*.opl)"));
-    fd->setAcceptMode(QFileDialog::AcceptOpen);
+    if (!fileName.isNull()) {
-    fd->setNameFilter("OpenPilot Log (*.opl)");
+        startReplay(fileName);
-    connect(fd, SIGNAL(fileSelected(QString)), this, SLOT(startReplay(QString)));
+    }
-    fd->exec();
     return &logFile;
 }
 

ground/openpilotgcs/src/plugins/rawhid/rawhid.pri

@@ -1,3 +1,3 @@
 include(rawhid_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(RawHID)
+LIBS *= -l$$qtLibraryName(RawHID)

ground/openpilotgcs/src/plugins/scope/scope.pri

@@ -1,3 +1,3 @@
-include(scope_dependencies.pri)
+include(scope_dependencies.pri)
-
+
-LIBS *= -l$$qtLibraryTarget(ScopeGadget)
+LIBS *= -l$$qtLibraryName(ScopeGadget)

ground/openpilotgcs/src/plugins/serialconnection/serial.pri

@@ -1,3 +1,3 @@
 include(serial_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(Serial)
+LIBS *= -l$$qtLibraryName(Serial)

ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pri

@@ -1,6 +1,6 @@
-include(uavobjects_dependencies.pri)
+include(uavobjects_dependencies.pri)
-
+
-# Add the include path to the built-in uavobject include files.
+# Add the include path to the built-in uavobject include files.
-INCLUDEPATH += $$PWD
+INCLUDEPATH += $$PWD
-
+
-LIBS *= -l$$qtLibraryTarget(UAVObjects)
+LIBS *= -l$$qtLibraryName(UAVObjects)

ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutil.pri

@@ -1,6 +1,6 @@
-include(uavobjectutil_dependencies.pri)
+include(uavobjectutil_dependencies.pri)
-
+
-# Add the include path to the built-in uavobject include files.
+# Add the include path to the built-in uavobject include files.
-INCLUDEPATH += $$PWD
+INCLUDEPATH += $$PWD
-
+
-LIBS *= -l$$qtLibraryTarget(UAVObjectUtil)
+LIBS *= -l$$qtLibraryName(UAVObjectUtil)

ground/openpilotgcs/src/plugins/uavtalk/uavtalk.pri

@@ -1,3 +1,3 @@
-include(uavtalk_dependencies.pri)
+include(uavtalk_dependencies.pri)
-
+
-LIBS *= -l$$qtLibraryTarget(UAVTalk)
+LIBS *= -l$$qtLibraryName(UAVTalk)

ground/openpilotgcs/src/plugins/welcome/welcome.pri

@@ -1,3 +1,3 @@
 include(welcome_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(Welcome)
+LIBS *= -l$$qtLibraryName(Welcome)