From 920300899e091a14a0d5aa8ed3a40e1053eba314 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 23 Aug 2018 14:17:48 +0900 Subject: [PATCH] Copter: rename gcs_check_input to gcs_update this makes the names consistent with Rover and Plane --- ArduCopter/ArduCopter.cpp | 4 ++-- ArduCopter/Copter.h | 2 +- ArduCopter/GCS_Mavlink.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ArduCopter/ArduCopter.cpp b/ArduCopter/ArduCopter.cpp index fceedfb0e3..f6acd17dc7 100644 --- a/ArduCopter/ArduCopter.cpp +++ b/ArduCopter/ArduCopter.cpp @@ -136,7 +136,7 @@ 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(gcs_check_input, 400, 180), + SCHED_TASK(gcs_update, 400, 180), SCHED_TASK(gcs_send_heartbeat, 1, 110), SCHED_TASK(gcs_send_deferred, 50, 550), SCHED_TASK(gcs_data_stream_send, 50, 550), @@ -564,7 +564,7 @@ void Copter::read_AHRS(void) //----------------------------------------------- #if HIL_MODE != HIL_MODE_DISABLED // update hil before ahrs update - gcs_check_input(); + gcs_update(); #endif // we tell AHRS to skip INS update as we have already done it in fast_loop() diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h index 64269ef56c..2558bfa9fd 100644 --- a/ArduCopter/Copter.h +++ b/ArduCopter/Copter.h @@ -756,7 +756,7 @@ private: void send_rpm(mavlink_channel_t chan); void send_pid_tuning(mavlink_channel_t chan); void gcs_data_stream_send(void); - void gcs_check_input(void); + void gcs_update(void); // heli.cpp void heli_init(); diff --git a/ArduCopter/GCS_Mavlink.cpp b/ArduCopter/GCS_Mavlink.cpp index 6e4f56ce9d..b8c94d4f93 100644 --- a/ArduCopter/GCS_Mavlink.cpp +++ b/ArduCopter/GCS_Mavlink.cpp @@ -1503,7 +1503,7 @@ void Copter::mavlink_delay_cb() } if (tnow - last_50hz > 20) { last_50hz = tnow; - gcs_check_input(); + gcs_update(); gcs_data_stream_send(); gcs_send_deferred(); notify.update(); @@ -1527,7 +1527,7 @@ void Copter::gcs_data_stream_send(void) /* * look for incoming commands on the GCS links */ -void Copter::gcs_check_input(void) +void Copter::gcs_update(void) { gcs().update(); }