|
|
|
@ -125,7 +125,7 @@ void QGCFlightGearLink::run()
@@ -125,7 +125,7 @@ void QGCFlightGearLink::run()
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
#ifdef DEBUG_FLIGHTGEAR_CONNECT |
|
|
|
|
qDebug() << "Starting FlightGear" << _fgProcessWorkingDirPath << _fgProcessName << _fgArgList; |
|
|
|
|
qDebug() << "\nStarting FlightGear" << _fgProcessWorkingDirPath << _fgProcessName << _fgArgList << "\n"; |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
_fgProcess->start(_fgProcessName, _fgArgList); |
|
|
|
@ -741,7 +741,7 @@ bool QGCFlightGearLink::connectSimulation()
@@ -741,7 +741,7 @@ bool QGCFlightGearLink::connectSimulation()
|
|
|
|
|
|
|
|
|
|
// Add the user specified arguments to our argument list
|
|
|
|
|
#ifdef DEBUG_FLIGHTGEAR_CONNECT |
|
|
|
|
qDebug() << "Split arguments" << uiArgList; |
|
|
|
|
qDebug() << "\nSplit arguments" << uiArgList << "\n"; |
|
|
|
|
#endif |
|
|
|
|
_fgArgList += uiArgList; |
|
|
|
|
|
|
|
|
@ -820,7 +820,7 @@ bool QGCFlightGearLink::connectSimulation()
@@ -820,7 +820,7 @@ bool QGCFlightGearLink::connectSimulation()
|
|
|
|
|
|
|
|
|
|
// Setup protocol we will be using to communicate with FlightGear
|
|
|
|
|
QString fgProtocol(mav->getSystemType() == MAV_TYPE_QUADROTOR ? "qgroundcontrol-quadrotor" : "qgroundcontrol-fixed-wing"); |
|
|
|
|
QString fgProtocolArg("--generic=_udpCommSocket,%1,300,127.0.0.1,%2,udp,%3"); |
|
|
|
|
QString fgProtocolArg("--generic=socket,%1,300,127.0.0.1,%2,udp,%3"); |
|
|
|
|
_fgArgList << fgProtocolArg.arg("out").arg(port).arg(fgProtocol); |
|
|
|
|
_fgArgList << fgProtocolArg.arg("in").arg(currentPort).arg(fgProtocol); |
|
|
|
|
|
|
|
|
|