Copter: adjust for new update entry points into GCS

ArduCopter/ArduCopter.cpp

@@ -135,10 +135,9 @@ const AP_Scheduler::Task Copter::scheduler_tasks[] = {
     SCHED_TASK(gpsglitch_check,       10,     50),
     SCHED_TASK(landinggear_update,    10,     75),
     SCHED_TASK(lost_vehicle_check,    10,     50),
-    SCHED_TASK_CLASS(GCS,                 (GCS*)&copter._gcs,           update,                400,  180),
+    SCHED_TASK_CLASS(GCS,                  (GCS*)&copter._gcs,          update_receive, 400, 180),
     SCHED_TASK(gcs_send_heartbeat,     1,    110),
-    SCHED_TASK_CLASS(GCS,                 (GCS*)&copter._gcs,           retry_deferred,        400,  550),
-    SCHED_TASK_CLASS(GCS,                 (GCS*)&copter._gcs,           data_stream_send,      400, 550),
+    SCHED_TASK_CLASS(GCS,                  (GCS*)&copter._gcs,          update_send,    400, 550),
 #if MOUNT == ENABLED
     SCHED_TASK_CLASS(AP_Mount,             &copter.camera_mount,        update,          50,  75),
 #endif

ArduCopter/GCS_Mavlink.cpp

@@ -1437,9 +1437,8 @@ void Copter::mavlink_delay_cb()
     }
     if (tnow - last_50hz > 20) {
         last_50hz = tnow;
-        gcs().update();
-        gcs().data_stream_send();
-        gcs().retry_deferred();
+        gcs().update_receive();
+        gcs().update_send();
         notify.update();
     }
     if (tnow - last_5s > 5000) {