From e540ddb9770d6291eadc1628dcc15b2a329c48c2 Mon Sep 17 00:00:00 2001
From: Bryant <bwmairs@ucsc.edu>
Date: Wed, 5 Feb 2014 11:53:18 -0800
Subject: [PATCH] RT-LAB support now indicated by QGC_RTLAB_ENABLED macro.

---
 QGCExternalLibs.pri               |  5 +++--
 src/QGCCore.cc                    |  4 ++--
 src/QGCCore.h                     |  2 +-
 src/ui/CommConfigurationWindow.cc | 12 ++++++------
 src/ui/CommConfigurationWindow.h  |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index b5fb920c6..411e70f3a 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -459,11 +459,12 @@ contains(DEFINES, DISABLE_3DMOUSE) {
 #
 contains(DEFINES, DISABLE_RTLAB) {
 	message("Skipping support for RT-LAB (manual override)")
+	DEFINES -= DISABLE_RTLAB
 } else:WindowsBuild {
 	exists(src/lib/opalrt/OpalApi.h) : exists(C:/OPAL-RT/RT-LAB7.2.4/Common/bin) {
-		message("Including support for Opal-RT")
+		message("Including support for RT-LAB")
 
-		DEFINES += OPAL_RT
+		DEFINES += QGC_RTLAB_ENABLED
 
 		INCLUDEPATH +=
 			src/lib/opalrt
diff --git a/src/QGCCore.cc b/src/QGCCore.cc
index 04fe7e7b8..ac09084c6 100644
--- a/src/QGCCore.cc
+++ b/src/QGCCore.cc
@@ -48,7 +48,7 @@ This file is part of the QGROUNDCONTROL project
 #include "QGCWelcomeMainWindow.h"
 #include "GAudioOutput.h"
 
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
 #include "OpalLink.h"
 #endif
 #include "UDPLink.h"
@@ -180,7 +180,7 @@ QGCCore::QGCCore(bool firstStart, int &argc, char* argv[]) : QApplication(argc,
         LinkManager::instance()->add(slink);
     }
 
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
     // Add OpalRT Link, but do not connect
     OpalLink* opalLink = new OpalLink();
     MainWindow::instance()->addLink(opalLink);
diff --git a/src/QGCCore.h b/src/QGCCore.h
index 1512f71ca..742752fb9 100644
--- a/src/QGCCore.h
+++ b/src/QGCCore.h
@@ -40,7 +40,7 @@ This file is part of the PIXHAWK project
 #include "UASManager.h"
 #include "LinkManager.h"
 /*#include "ViconTarsusProtocol.h" */
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
 
 #include "OpalLink.h"
 
diff --git a/src/ui/CommConfigurationWindow.cc b/src/ui/CommConfigurationWindow.cc
index af39c4b48..7b3d41101 100644
--- a/src/ui/CommConfigurationWindow.cc
+++ b/src/ui/CommConfigurationWindow.cc
@@ -46,7 +46,7 @@ This file is part of the QGROUNDCONTROL project
 #include "XbeeLink.h"
 #include "XbeeConfigurationWindow.h"
 #endif // QGC_XBEE_ENABLED
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
 #include "OpalLink.h"
 #include "OpalLinkConfigurationWindow.h"
 #endif
@@ -90,7 +90,7 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
         ui.linkType->addItem(tr("Simulation"), QGC_LINK_SIMULATION);
     }
 
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
     ui.linkType->addItem(tr("Opal-RT Link"), QGC_LINK_OPAL);
 #endif
 #ifdef QGC_XBEE_ENABLED
@@ -164,7 +164,7 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
         ui.linkType->setEnabled(false); //Don't allow the user to change to a non-simulation
         ui.linkGroupBox->setTitle(tr("MAVLink Simulation Link"));
     }
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
     OpalLink* opal = dynamic_cast<OpalLink*>(link);
     if (opal != 0) {
         QWidget* conf = new OpalLinkConfigurationWindow(opal, this);
@@ -188,7 +188,7 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
 	}
 #endif // QGC_XBEE_ENABLED
     if (serial == 0 && udp == 0 && sim == 0 && tcp == 0
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
             && opal == 0
 #endif
 #ifdef QGC_XBEE_ENABLED
@@ -274,7 +274,7 @@ void CommConfigurationWindow::setLinkType(qgc_link_t linktype)
             break;
             }
 
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
         case QGC_LINK_OPAL:
 			{
 				OpalLink* opal = new OpalLink();
@@ -282,7 +282,7 @@ void CommConfigurationWindow::setLinkType(qgc_link_t linktype)
 				MainWindow::instance()->addLink(tmpLink);
 				break;
 			}
-#endif // OPAL_RT
+#endif // QGC_RTLAB_ENABLED
 		default:
 			{
 			}
diff --git a/src/ui/CommConfigurationWindow.h b/src/ui/CommConfigurationWindow.h
index 7b59c7dbb..d506d0a71 100644
--- a/src/ui/CommConfigurationWindow.h
+++ b/src/ui/CommConfigurationWindow.h
@@ -48,7 +48,7 @@ enum qgc_link_t {
 #ifdef QGC_XBEE_ENABLED
     QGC_LINK_XBEE,
 #endif
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
     QGC_LINK_OPAL
 #endif
 };
@@ -58,7 +58,7 @@ enum qgc_protocol_t {
 };
 
 
-#ifdef OPAL_RT
+#ifdef QGC_RTLAB_ENABLED
 #include "OpalLink.h"
 #endif
 
-- 
2.22.0