From d079c1a33e547b418530252507f7653d4b82742e Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Wed, 20 Jan 2016 22:10:08 -0800 Subject: [PATCH] Backed out bad merge change in commander.cpp Signed-off-by: Mark Charlebois --- src/modules/commander/commander.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 7661b6daee..ca546d2149 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1610,11 +1610,6 @@ int commander_thread_main(int argc, char *argv[]) _usb_telemetry_active = true; } - /* set (and don't reset) telemetry via USB as active once a MAVLink connection is up */ - if (telemetry.type == telemetry_status_s::TELEMETRY_STATUS_RADIO_TYPE_USB) { - _usb_telemetry_active = true; - } - if (telemetry.heartbeat_time > 0) { telemetry_last_heartbeat[i] = telemetry.heartbeat_time; }