Browse Source

Don't start Vehicles for things which aren't Vehicles

QGC4.4
Don Gagne 8 years ago committed by Lorenz Meier
parent
commit
f38008a136
  1. 15
      src/Vehicle/MultiVehicleManager.cc

15
src/Vehicle/MultiVehicleManager.cc

@ -70,11 +70,22 @@ void MultiVehicleManager::setToolbox(QGCToolbox *toolbox) @@ -70,11 +70,22 @@ void MultiVehicleManager::setToolbox(QGCToolbox *toolbox)
void MultiVehicleManager::_vehicleHeartbeatInfo(LinkInterface* link, int vehicleId, int vehicleMavlinkVersion, int vehicleFirmwareType, int vehicleType)
{
if (_ignoreVehicleIds.contains(vehicleId) || getVehicleById(vehicleId)
|| vehicleId == 0) {
if (_ignoreVehicleIds.contains(vehicleId) || getVehicleById(vehicleId) || vehicleId == 0) {
return;
}
switch (vehicleType) {
case MAV_TYPE_GCS:
case MAV_TYPE_ONBOARD_CONTROLLER:
case MAV_TYPE_GIMBAL:
case MAV_TYPE_ADSB:
// These are not vehicles, so don't create a vehicle for them
return;
default:
// All other MAV_TYPEs create vehicles
break;
}
qCDebug(MultiVehicleManagerLog()) << "Adding new vehicle link:vehicleId:vehicleMavlinkVersion:vehicleFirmwareType:vehicleType "
<< link->getName()
<< vehicleId

Loading…
Cancel
Save