From 8b72be79a10d7985f2a676353f4e82e3d9fbbc6f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 21 Jul 2017 09:31:49 -0700 Subject: [PATCH] Fix timeout logic --- src/Vehicle/Vehicle.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index cbc821104..450629425 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -2631,7 +2631,7 @@ bool Vehicle::autoDisarm(void) void Vehicle::_handleADSBVehicle(const mavlink_message_t& message) { mavlink_adsb_vehicle_t adsbVehicle; - static const int maxTimeSinceLastSeen = 10; + static const int maxTimeSinceLastSeen = 15; mavlink_msg_adsb_vehicle_decode(&message, &adsbVehicle); if (adsbVehicle.flags | ADSB_FLAGS_VALID_COORDS) { @@ -2642,11 +2642,9 @@ void Vehicle::_handleADSBVehicle(const mavlink_message_t& message) _adsbICAOMap.remove(adsbVehicle.ICAO_address); vehicle->deleteLater(); } else { - if (adsbVehicle.tslc <= maxTimeSinceLastSeen) { - _adsbICAOMap[adsbVehicle.ICAO_address]->update(adsbVehicle); - } + _adsbICAOMap[adsbVehicle.ICAO_address]->update(adsbVehicle); } - } else { + } else if (adsbVehicle.tslc <= maxTimeSinceLastSeen) { ADSBVehicle* vehicle = new ADSBVehicle(adsbVehicle, this); _adsbICAOMap[adsbVehicle.ICAO_address] = vehicle; _adsbVehicles.append(vehicle); -- 2.22.0