From 8a1fc6a4069006c0caf45ee2788be1f1fb3c0225 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sun, 9 Jul 2017 18:31:50 +1000 Subject: [PATCH] Copter: remove global static send_statustext_chan --- ArduCopter/GCS_Mavlink.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ArduCopter/GCS_Mavlink.cpp b/ArduCopter/GCS_Mavlink.cpp index 35194875ae..a562bf3f87 100644 --- a/ArduCopter/GCS_Mavlink.cpp +++ b/ArduCopter/GCS_Mavlink.cpp @@ -861,7 +861,7 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg) #if defined(PX4_GIT_VERSION) && defined(NUTTX_GIT_VERSION) send_text(MAV_SEVERITY_INFO, "PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION); #endif - GCS_MAVLINK::send_statustext_chan(MAV_SEVERITY_INFO, chan, "Frame: %s", copter.get_frame_string()); + send_text(MAV_SEVERITY_INFO, "Frame: %s", copter.get_frame_string()); handle_param_request_list(msg); break; } @@ -1402,7 +1402,7 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg) send_text(MAV_SEVERITY_INFO, "PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION); #endif - GCS_MAVLINK::send_statustext_chan(MAV_SEVERITY_INFO, chan, "Frame: %s", copter.get_frame_string()); + send_text(MAV_SEVERITY_INFO, "Frame: %s", copter.get_frame_string()); // send system ID if we can char sysid[40]; @@ -1799,7 +1799,7 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg) // send or receive fence points with GCS case MAVLINK_MSG_ID_FENCE_POINT: // MAV ID: 160 case MAVLINK_MSG_ID_FENCE_FETCH_POINT: - copter.fence.handle_msg(chan, msg); + copter.fence.handle_msg(*this, msg); break; #endif // AC_FENCE == ENABLED