Browse Source

Removed auto-connection of OpalLink

QGC4.4
pixhawk 15 years ago
parent
commit
6961315f36
  1. 6
      qgroundcontrol.pro
  2. 1
      src/Core.cc
  3. 4
      src/ui/UASList.ui
  4. 4
      src/ui/UASView.ui

6
qgroundcontrol.pro

@ -225,9 +225,3 @@ win32 { @@ -225,9 +225,3 @@ win32 {
HEADERS += src/comm/OpalLink.h
DEFINES += OPAL_RT
}
macx {
SOURCES += src/comm/OpalLink.cc
HEADERS += src/comm/OpalLink.h
DEFINES += OPAL_RT
}

1
src/Core.cc

@ -139,7 +139,6 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv) @@ -139,7 +139,6 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
// Add OpalRT Link, but do not connect
OpalLink* opalLink = new OpalLink();
mainWindow->addLink(opalLink);
opalLink->connect();
#warning OPAL LINK NOW AUTO CONNECTING IN CORE.CC
#endif
// MAVLinkSimulationLink* simulationLink = new MAVLinkSimulationLink(MG::DIR::getSupportFilesDirectory() + "/demo-log.txt");

4
src/ui/UASList.ui

@ -6,13 +6,13 @@ @@ -6,13 +6,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<width>500</width>
<height>300</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>500</width>
<width>0</width>
<height>0</height>
</size>
</property>

4
src/ui/UASView.ui

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>362</width>
<width>370</width>
<height>120</height>
</rect>
</property>
@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
</property>
<property name="minimumSize">
<size>
<width>0</width>
<width>370</width>
<height>0</height>
</size>
</property>

Loading…
Cancel
Save